fxruby-commits Mailing List for FXRuby (Page 9)
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
fxruby-commits — All commits to FXRuby's CVS repository
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
(39) |
Apr
(69) |
May
(117) |
Jun
(22) |
Jul
(57) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: Lyle J. <ly...@us...> - 2002-04-30 19:08:03
|
Update of /cvsroot/fxruby/FXRuby
In directory usw-pr-cvs1:/tmp/cvs-serv25348
Modified Files:
Tag: release10
setversions.rb ANNOUNCE
Log Message:
Updated the FXRuby home page URL to http://www.fxruby.org in the
setversions.rb script.
Index: setversions.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/setversions.rb,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** setversions.rb 18 Jan 2002 00:01:58 -0000 1.15
--- setversions.rb 30 Apr 2002 19:05:49 -0000 1.15.2.1
***************
*** 16,20 ****
"@@FOX_VERSION@@" => fox_version,
"@@FXRUBY_VERSION@@" => fxruby_version,
! "@@FXRUBY_HOME_URL@@" => "http://fxruby.sourceforge.net",
"@@FXRUBY_SRC_URL@@" => "http://prdownloads.sourceforge.net/fxruby/FXRuby-" + fxruby_version + ".tar.gz",
"@@FXRUBY_WIN32_URL@@" => "http://prdownloads.sourceforge.net/fxruby/FXRuby-" + fxruby_version + "-win32.exe",
--- 16,20 ----
"@@FOX_VERSION@@" => fox_version,
"@@FXRUBY_VERSION@@" => fxruby_version,
! "@@FXRUBY_HOME_URL@@" => "http://www.fxruby.org",
"@@FXRUBY_SRC_URL@@" => "http://prdownloads.sourceforge.net/fxruby/FXRuby-" + fxruby_version + ".tar.gz",
"@@FXRUBY_WIN32_URL@@" => "http://prdownloads.sourceforge.net/fxruby/FXRuby-" + fxruby_version + "-win32.exe",
Index: ANNOUNCE
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ANNOUNCE,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -C2 -d -r1.26 -r1.26.2.1
*** ANNOUNCE 13 Mar 2002 18:18:20 -0000 1.26
--- ANNOUNCE 30 Apr 2002 19:05:50 -0000 1.26.2.1
***************
*** 5,17 ****
The FXRuby home page is here:
! http://fxruby.sourceforge.net
and the source tarball can be downloaded here:
! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.3.tar.gz
A binary installer for Windows, compatible with the mswin32-based versions of Ruby 1.6.x for Windows, is also available for download here:
! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.3-win32.exe
Note that this release of FXRuby depends on FOX version 1.0.0 (or later), which
--- 5,17 ----
The FXRuby home page is here:
! http://www.fxruby.org
and the source tarball can be downloaded here:
! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.10.tar.gz
A binary installer for Windows, compatible with the mswin32-based versions of Ruby 1.6.x for Windows, is also available for download here:
! http://prdownloads.sourceforge.net/fxruby/FXRuby-1.0.10-win32.exe
Note that this release of FXRuby depends on FOX version 1.0.0 (or later), which
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 19:03:18
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv24207/swig-interfaces
Modified Files:
Tag: release10
FXApp.i
Log Message:
Removed the FXApp#enableThreads and FXApp#disableThreads instance methods
and replaced with a single method, FXApp#threadsEnabled=, which accepts
true or false. This makes the API more consistent with the recently added
FXApp#threadsEnabled? instance method.
Index: FXApp.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXApp.i,v
retrieving revision 1.38.2.2
retrieving revision 1.38.2.3
diff -C2 -d -r1.38.2.2 -r1.38.2.3
*** FXApp.i 30 Apr 2002 02:12:46 -0000 1.38.2.2
--- FXApp.i 30 Apr 2002 19:02:41 -0000 1.38.2.3
***************
*** 521,524 ****
--- 521,525 ----
%exception FXRbApp::FXRbApp "$action FXRbRegisterRubyObj(self, result);";
+ %rename("threadsEnabled=") FXRbApp::setThreadsEnabled();
%rename("threadsEnabled?") FXRbApp::threadsEnabled() const;
***************
*** 535,543 ****
FXRbApp(const FXchar *name="Application",const FXchar *vendor="FoxDefault");
! // Enable support for multithreaded applications
! void enableThreads();
!
! // Disable support for multithreaded applications
! void disableThreads();
// Are threads enabled?
--- 536,541 ----
FXRbApp(const FXchar *name="Application",const FXchar *vendor="FoxDefault");
! // Enable (or disable) support for multithreaded applications
! void setThreadsEnabled(FXbool enabled);
// Are threads enabled?
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 19:03:08
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv24207/ext/fox
Modified Files:
Tag: release10
FXRbApp.cpp core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp
image_wrap.cpp layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp
ui_wrap.cpp
Log Message:
Removed the FXApp#enableThreads and FXApp#disableThreads instance methods
and replaced with a single method, FXApp#threadsEnabled=, which accepts
true or false. This makes the API more consistent with the recently added
FXApp#threadsEnabled? instance method.
Index: FXRbApp.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRbApp.cpp,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** FXRbApp.cpp 30 Apr 2002 02:12:33 -0000 1.9.2.1
--- FXRbApp.cpp 30 Apr 2002 19:02:41 -0000 1.9.2.2
***************
*** 68,84 ****
! // Enable threads
! void FXRbApp::enableThreads(){
! if(!m_bThreadsEnabled){
! m_bThreadsEnabled=TRUE;
! threadsChore=addChore(this,ID_CHORE_THREADS);
! FXASSERT(threadsChore!=0);
}
! }
!
!
! // Disable threads
! void FXRbApp::disableThreads(){
! if(m_bThreadsEnabled){
m_bThreadsEnabled=FALSE;
if(threadsChore!=0){
--- 68,81 ----
! // Enable (or disable) threads
! void FXRbApp::setThreadsEnabled(FXbool enabled){
! if(enabled){
! if(!m_bThreadsEnabled){
! m_bThreadsEnabled=TRUE;
! threadsChore=addChore(this,ID_CHORE_THREADS);
! FXASSERT(threadsChore!=0);
! }
}
! else{
m_bThreadsEnabled=FALSE;
if(threadsChore!=0){
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.5
retrieving revision 1.62.2.6
diff -C2 -d -r1.62.2.5 -r1.62.2.6
*** core_wrap.cpp 30 Apr 2002 02:12:33 -0000 1.62.2.5
--- core_wrap.cpp 30 Apr 2002 19:02:41 -0000 1.62.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
***************
*** 6450,6473 ****
static VALUE
! _wrap_FXApp_enableThreads(int argc, VALUE *argv, VALUE self) {
! FXRbApp *arg1 ;
!
! if ((argc < 0) || (argc > 0))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
! arg1 = (FXRbApp *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbApp);
! (arg1)->enableThreads();
!
! return Qnil;
! }
!
!
! static VALUE
! _wrap_FXApp_disableThreads(int argc, VALUE *argv, VALUE self) {
FXRbApp *arg1 ;
! if ((argc < 0) || (argc > 0))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
arg1 = (FXRbApp *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbApp);
! (arg1)->disableThreads();
return Qnil;
--- 6450,6467 ----
static VALUE
! _wrap_FXApp_setThreadsEnabled(int argc, VALUE *argv, VALUE self) {
FXRbApp *arg1 ;
+ FXbool arg2 ;
! if ((argc < 1) || (argc > 1))
! rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
arg1 = (FXRbApp *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbApp);
! {
! if (argv[0] == Qtrue || argv[0] == Qfalse)
! arg2 = (argv[0] == Qtrue) ? TRUE : FALSE;
! else
! rb_raise(rb_eTypeError, "wrong argument type (expected true or false)");
! }
! (arg1)->setThreadsEnabled(arg2);
return Qnil;
***************
*** 18684,18689 ****
rb_define_const(cFXApp.klass,"ID_LAST", INT2NUM(FXRbApp::ID_LAST));
rb_define_method(cFXApp.klass, "onChoreThreads", VALUEFUNC(_wrap_FXApp_onChoreThreads), -1);
! rb_define_method(cFXApp.klass, "enableThreads", VALUEFUNC(_wrap_FXApp_enableThreads), -1);
! rb_define_method(cFXApp.klass, "disableThreads", VALUEFUNC(_wrap_FXApp_disableThreads), -1);
rb_define_method(cFXApp.klass, "threadsEnabled?", VALUEFUNC(_wrap_FXApp_threadsEnabledq___), -1);
rb_define_method(cFXApp.klass, "setSleepTime", VALUEFUNC(_wrap_FXApp_setSleepTime), -1);
--- 18678,18682 ----
rb_define_const(cFXApp.klass,"ID_LAST", INT2NUM(FXRbApp::ID_LAST));
rb_define_method(cFXApp.klass, "onChoreThreads", VALUEFUNC(_wrap_FXApp_onChoreThreads), -1);
! rb_define_method(cFXApp.klass, "setThreadsEnabled", VALUEFUNC(_wrap_FXApp_setThreadsEnabled), -1);
rb_define_method(cFXApp.klass, "threadsEnabled?", VALUEFUNC(_wrap_FXApp_threadsEnabledq___), -1);
rb_define_method(cFXApp.klass, "setSleepTime", VALUEFUNC(_wrap_FXApp_setSleepTime), -1);
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34.2.5
retrieving revision 1.34.2.6
diff -C2 -d -r1.34.2.5 -r1.34.2.6
*** dialogs_wrap.cpp 30 Apr 2002 02:12:39 -0000 1.34.2.5
--- dialogs_wrap.cpp 30 Apr 2002 19:02:52 -0000 1.34.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37.2.5
retrieving revision 1.37.2.6
diff -C2 -d -r1.37.2.5 -r1.37.2.6
*** icons_wrap.cpp 30 Apr 2002 02:12:39 -0000 1.37.2.5
--- icons_wrap.cpp 30 Apr 2002 19:02:54 -0000 1.37.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39.2.5
retrieving revision 1.39.2.6
diff -C2 -d -r1.39.2.5 -r1.39.2.6
*** image_wrap.cpp 30 Apr 2002 02:12:40 -0000 1.39.2.5
--- image_wrap.cpp 30 Apr 2002 19:02:54 -0000 1.39.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: layout_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -C2 -d -r1.8.2.5 -r1.8.2.6
*** layout_wrap.cpp 30 Apr 2002 02:12:40 -0000 1.8.2.5
--- layout_wrap.cpp 30 Apr 2002 19:02:55 -0000 1.8.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: mdi_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v
retrieving revision 1.36.2.5
retrieving revision 1.36.2.6
diff -C2 -d -r1.36.2.5 -r1.36.2.6
*** mdi_wrap.cpp 30 Apr 2002 02:12:41 -0000 1.36.2.5
--- mdi_wrap.cpp 30 Apr 2002 19:02:55 -0000 1.36.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41.2.6
retrieving revision 1.41.2.7
diff -C2 -d -r1.41.2.6 -r1.41.2.7
*** opengl_wrap.cpp 30 Apr 2002 02:12:41 -0000 1.41.2.6
--- opengl_wrap.cpp 30 Apr 2002 19:02:55 -0000 1.41.2.7
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -C2 -d -r1.9.2.5 -r1.9.2.6
*** ui_wrap.cpp 30 Apr 2002 02:12:42 -0000 1.9.2.5
--- ui_wrap.cpp 30 Apr 2002 19:02:56 -0000 1.9.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 19:03:03
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv24207/ext/fox/include
Modified Files:
Tag: release10
FXRbApp.h
Log Message:
Removed the FXApp#enableThreads and FXApp#disableThreads instance methods
and replaced with a single method, FXApp#threadsEnabled=, which accepts
true or false. This makes the API more consistent with the recently added
FXApp#threadsEnabled? instance method.
Index: FXRbApp.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbApp.h,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** FXRbApp.h 30 Apr 2002 02:12:46 -0000 1.3.2.1
--- FXRbApp.h 30 Apr 2002 19:02:59 -0000 1.3.2.2
***************
*** 107,118 ****
FXRbApp(const FXchar* name,const FXchar* vendor);
! // Enable support for multithreaded applications
! void enableThreads();
!
! // Disable support for multithreaded applications
! void disableThreads();
// Are threads enabled?
! FXbool threadEnabled() const { return m_bThreadsEnabled; }
// Set sleep time (in milliseconds)
--- 107,115 ----
FXRbApp(const FXchar* name,const FXchar* vendor);
! // Enable (or disable) support for multithreaded applications
! void setThreadsEnabled(FXbool enabled);
// Are threads enabled?
! FXbool threadsEnabled() const { return m_bThreadsEnabled; }
// Set sleep time (in milliseconds)
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 17:23:26
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv27512
Modified Files:
Tag: release10
fxver.h
Log Message:
Copied latest version of fxver.h (from the FOX 1.0.10 distribution).
Index: fxver.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/fxver.h,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C2 -d -r1.24.2.1 -r1.24.2.2
*** fxver.h 24 Apr 2002 03:23:16 -0000 1.24.2.1
--- fxver.h 30 Apr 2002 17:23:23 -0000 1.24.2.2
***************
*** 6,10 ****
#define FOX_MAJOR 1
#define FOX_MINOR 0
! #define FOX_LEVEL 8
--- 6,10 ----
#define FOX_MAJOR 1
#define FOX_MINOR 0
! #define FOX_LEVEL 10
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 02:34:18
|
Update of /cvsroot/fxruby/FXRuby/doc
In directory usw-pr-cvs1:/tmp/cvs-serv20565/doc
Modified Files:
Tag: release10
changes.xml
Log Message:
Added the FXApp#threadsEnabled? instance method, to see if they are.
Index: changes.xml
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/changes.xml,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** changes.xml 2 Apr 2002 04:11:50 -0000 1.9
--- changes.xml 30 Apr 2002 02:12:33 -0000 1.9.2.1
***************
*** 6,9 ****
--- 6,10 ----
<listitem><para>Corrected the code for <methodname>FXTreeList#clearItems</methodname> so that after the C++ objects (the tree items) are destroyed, any Ruby instances holding references to those C++ objects are notified of their demise. This one was inadvertently overlooked when other, similar, fixes were made in the previous release. Thanks to Gilles Filippini for catching this.</para></listitem>
<listitem><para>The API for Ruby's <methodname>rb_rescue2()</methodname> function changed in Ruby 1.6.7, but I missed this since I had only compiled against the Ruby 1.6.6 and Ruby 1.7 header files. The API change led to a compile error for FXRuby.cpp; this has been fixed. Thanks to Bil Kleb for catching this one.</para></listitem>
+ <listitem><para>Added a new instance method, <methodname>FXApp#threadsEnabled?</methodname>, which returns <constant>true</constant></para> if support for multithreaded applications has been enabled.</listitem>
</itemizedlist>
</simplesect>
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 02:34:18
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv20565/ext/fox/include
Modified Files:
Tag: release10
FXRbApp.h
Log Message:
Added the FXApp#threadsEnabled? instance method, to see if they are.
Index: FXRbApp.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbApp.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** FXRbApp.h 7 Feb 2002 16:53:50 -0000 1.3
--- FXRbApp.h 30 Apr 2002 02:12:46 -0000 1.3.2.1
***************
*** 89,93 ****
FXDECLARE(FXRbApp)
protected:
! FXbool threadsEnabled;
FXuint sleepTime;
FXChore* threadsChore;
--- 89,93 ----
FXDECLARE(FXRbApp)
protected:
! FXbool m_bThreadsEnabled;
FXuint sleepTime;
FXChore* threadsChore;
***************
*** 112,115 ****
--- 112,118 ----
// Disable support for multithreaded applications
void disableThreads();
+
+ // Are threads enabled?
+ FXbool threadEnabled() const { return m_bThreadsEnabled; }
// Set sleep time (in milliseconds)
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 02:34:17
|
Update of /cvsroot/fxruby/FXRuby/rdoc-sources
In directory usw-pr-cvs1:/tmp/cvs-serv20565/rdoc-sources
Modified Files:
Tag: release10
FXApp.rb
Log Message:
Added the FXApp#threadsEnabled? instance method, to see if they are.
Index: FXApp.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/rdoc-sources/FXApp.rb,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** FXApp.rb 27 Mar 2002 18:03:04 -0000 1.5
--- FXApp.rb 30 Apr 2002 02:12:46 -0000 1.5.2.1
***************
*** 424,427 ****
--- 424,430 ----
# Disable support for multithreaded applications
def disableThreads(); end
+
+ # Check to see if multithreaded applications are supported
+ def threadsEnabled?(); end
# Set the amount of time to sleep
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 02:34:17
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv20565/swig-interfaces
Modified Files:
Tag: release10
FXApp.i
Log Message:
Added the FXApp#threadsEnabled? instance method, to see if they are.
Index: FXApp.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXApp.i,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -C2 -d -r1.38.2.1 -r1.38.2.2
*** FXApp.i 24 Apr 2002 02:55:21 -0000 1.38.2.1
--- FXApp.i 30 Apr 2002 02:12:46 -0000 1.38.2.2
***************
*** 521,524 ****
--- 521,526 ----
%exception FXRbApp::FXRbApp "$action FXRbRegisterRubyObj(self, result);";
+ %rename("threadsEnabled?") FXRbApp::threadsEnabled() const;
+
class FXRbApp : public FXApp {
public:
***************
*** 538,541 ****
--- 540,546 ----
// Disable support for multithreaded applications
void disableThreads();
+
+ // Are threads enabled?
+ FXbool threadsEnabled() const;
// Set the amount of time to sleep
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 02:34:17
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv20565/ext/fox
Modified Files:
Tag: release10
FXRbApp.cpp core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp
image_wrap.cpp layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp
scintilla_wrap.cpp ui_wrap.cpp
Log Message:
Added the FXApp#threadsEnabled? instance method, to see if they are.
Index: FXRbApp.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRbApp.cpp,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** FXRbApp.cpp 28 Feb 2002 01:01:45 -0000 1.9
--- FXRbApp.cpp 30 Apr 2002 02:12:33 -0000 1.9.2.1
***************
*** 60,65 ****
// Constructor
! FXRbApp::FXRbApp(const FXchar* appname,const FXchar* vendor) : FXApp(appname,vendor),threadsEnabled(TRUE),sleepTime(100),threadsChore(0){
! if(threadsEnabled){
FXASSERT(threadsChore==0);
threadsChore=addChore(this,ID_CHORE_THREADS);
--- 60,65 ----
// Constructor
! FXRbApp::FXRbApp(const FXchar* appname,const FXchar* vendor) : FXApp(appname,vendor),m_bThreadsEnabled(TRUE),sleepTime(100),threadsChore(0){
! if(m_bThreadsEnabled){
FXASSERT(threadsChore==0);
threadsChore=addChore(this,ID_CHORE_THREADS);
***************
*** 70,75 ****
// Enable threads
void FXRbApp::enableThreads(){
! if(!threadsEnabled){
! threadsEnabled=TRUE;
threadsChore=addChore(this,ID_CHORE_THREADS);
FXASSERT(threadsChore!=0);
--- 70,75 ----
// Enable threads
void FXRbApp::enableThreads(){
! if(!m_bThreadsEnabled){
! m_bThreadsEnabled=TRUE;
threadsChore=addChore(this,ID_CHORE_THREADS);
FXASSERT(threadsChore!=0);
***************
*** 80,85 ****
// Disable threads
void FXRbApp::disableThreads(){
! if(threadsEnabled){
! threadsEnabled=FALSE;
if(threadsChore!=0){
removeChore(threadsChore);
--- 80,85 ----
// Disable threads
void FXRbApp::disableThreads(){
! if(m_bThreadsEnabled){
! m_bThreadsEnabled=FALSE;
if(threadsChore!=0){
removeChore(threadsChore);
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.4
retrieving revision 1.62.2.5
diff -C2 -d -r1.62.2.4 -r1.62.2.5
*** core_wrap.cpp 29 Apr 2002 22:23:41 -0000 1.62.2.4
--- core_wrap.cpp 30 Apr 2002 02:12:33 -0000 1.62.2.5
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
***************
*** 6476,6479 ****
--- 6476,6495 ----
static VALUE
+ _wrap_FXApp_threadsEnabledq___(int argc, VALUE *argv, VALUE self) {
+ FXRbApp *arg1 ;
+ FXbool result;
+ VALUE vresult = Qnil;
+
+ if ((argc < 0) || (argc > 0))
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
+ arg1 = (FXRbApp *) SWIG_ConvertPtr(self, SWIGTYPE_p_FXRbApp);
+ result = (FXbool )((FXRbApp const *)arg1)->threadsEnabled();
+
+ vresult = result ? Qtrue : Qfalse;
+ return vresult;
+ }
+
+
+ static VALUE
_wrap_FXApp_setSleepTime(int argc, VALUE *argv, VALUE self) {
FXRbApp *arg1 ;
***************
*** 18670,18673 ****
--- 18686,18690 ----
rb_define_method(cFXApp.klass, "enableThreads", VALUEFUNC(_wrap_FXApp_enableThreads), -1);
rb_define_method(cFXApp.klass, "disableThreads", VALUEFUNC(_wrap_FXApp_disableThreads), -1);
+ rb_define_method(cFXApp.klass, "threadsEnabled?", VALUEFUNC(_wrap_FXApp_threadsEnabledq___), -1);
rb_define_method(cFXApp.klass, "setSleepTime", VALUEFUNC(_wrap_FXApp_setSleepTime), -1);
rb_define_method(cFXApp.klass, "getSleepTime", VALUEFUNC(_wrap_FXApp_getSleepTime), -1);
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34.2.4
retrieving revision 1.34.2.5
diff -C2 -d -r1.34.2.4 -r1.34.2.5
*** dialogs_wrap.cpp 29 Apr 2002 22:23:42 -0000 1.34.2.4
--- dialogs_wrap.cpp 30 Apr 2002 02:12:39 -0000 1.34.2.5
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -C2 -d -r1.37.2.4 -r1.37.2.5
*** icons_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.37.2.4
--- icons_wrap.cpp 30 Apr 2002 02:12:39 -0000 1.37.2.5
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39.2.4
retrieving revision 1.39.2.5
diff -C2 -d -r1.39.2.4 -r1.39.2.5
*** image_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.39.2.4
--- image_wrap.cpp 30 Apr 2002 02:12:40 -0000 1.39.2.5
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
Index: layout_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -d -r1.8.2.4 -r1.8.2.5
*** layout_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.8.2.4
--- layout_wrap.cpp 30 Apr 2002 02:12:40 -0000 1.8.2.5
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
Index: mdi_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v
retrieving revision 1.36.2.4
retrieving revision 1.36.2.5
diff -C2 -d -r1.36.2.4 -r1.36.2.5
*** mdi_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.36.2.4
--- mdi_wrap.cpp 30 Apr 2002 02:12:41 -0000 1.36.2.5
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41.2.5
retrieving revision 1.41.2.6
diff -C2 -d -r1.41.2.5 -r1.41.2.6
*** opengl_wrap.cpp 29 Apr 2002 22:23:44 -0000 1.41.2.5
--- opengl_wrap.cpp 30 Apr 2002 02:12:41 -0000 1.41.2.6
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
Index: scintilla_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -d -r1.16.2.1 -r1.16.2.2
*** scintilla_wrap.cpp 24 Apr 2002 03:30:57 -0000 1.16.2.1
--- scintilla_wrap.cpp 30 Apr 2002 02:12:42 -0000 1.16.2.2
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
***************
*** 4269,4275 ****
--- 4269,4284 ----
return (void *)((FXStream *) ((FXFileStream *) x));
}
+ static void *_p_FXRbFileStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbFileStream *) x));
+ }
static void *_p_FXMemoryStreamTo_p_FXStream(void *x) {
return (void *)((FXStream *) ((FXMemoryStream *) x));
}
+ static void *_p_FXRbMemoryStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbMemoryStream *) x));
+ }
+ static void *_p_FXRbStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbStream *) x));
+ }
static swig_type_info _swigt__p_FXId[] = {{"_p_FXId", 0, "FXId *"},{"_p_FXRbId", _p_FXRbIdTo_p_FXId},{"_p_FXColorBar", _p_FXColorBarTo_p_FXId},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXId},{"_p_FXTreeList", _p_FXTreeListTo_p_FXId},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXId},{"_p_FXTabBar", _p_FXTabBarTo_p_FXId},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXId},{"_p_FXTextField", _p_FXTextFieldTo_p_FXId},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXId},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXId},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXId},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXId},{"_p_FXDirList", _p_FXDirListTo_p_FXId},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXId},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXId},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXId},{"_p_FXList", _p_FXListTo_p_FXId},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXId},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXId},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXId},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXId},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXId},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXId},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXId},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXId},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXId},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXId},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXId},{"_p_FXPicker", _p_FXPickerTo_p_FXId},{"_p_FXPopup", _p_FXPopupTo_p_FXId},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXId},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXId},{"_p_FXTooltip", _p_FXTooltipTo_p_FXId},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXId},{"_p_FXDrawable", _p_FXDrawableTo_p_FXId},{"_p_FXRbShell", _p_FXRbShellTo_p_FXId},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXId},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXId},{"_p_FXFont", _p_FXFontTo_p_FXId},{"_p_FXHeader", _p_FXHeaderTo_p_FXId},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXId},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXId},{"_p_FXPacker", _p_FXPackerTo_p_FXId},{"_p_FXTabBook", _p_FXTabBookTo_p_FXId},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXId},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXId},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXId},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXId},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXId},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXId},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXId},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXId},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXId},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXId},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXId},{"_p_FXRbList", _p_FXRbListTo_p_FXId},{"_p_FXTable", _p_FXTableTo_p_FXId},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXId},{"_p_FXComposite", _p_FXCompositeTo_p_FXId},{"_p_FXScintilla", _p_FXScintillaTo_p_FXId},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXId},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXId},{"_p_FXSlider", _p_FXSliderTo_p_FXId},{"_p_FXRbFont", _p_FXRbFontTo_p_FXId},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXId},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXId},{"_p_FXId"},{"_p_FXListBox", _p_FXListBoxTo_p_FXId},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXId},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXId},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXId},{"_p_FXCanvas", _p_FXCanvasTo_p_FXId},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXId},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXId},{"_p_FXMenubar", _p_FXMenubarTo_p_FXId},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXId},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXId},{"_p_FXDial", _p_FXDialTo_p_FXId},{"_p_FXButton", _p_FXButtonTo_p_FXId},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXId},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXId},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXId},{"_p_FXRbVisual", _p_FXRbVisualTo_p_FXId},{"_p_FXVisual", _p_FXVisualTo_p_FXId},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXId},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXId},{"_p_FXTabItem", _p_FXTabItemTo_p_FXId},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXId},{"_p_FXFrame", _p_FXFrameTo_p_FXId},{"_p_FXText", _p_FXTextTo_p_FXId},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXId},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXId},{"_p_FXToolbar", _p_FXToolbarTo_p_FXId},{"_p_FXRbGIFCursor", _p_FXRbGIFCursorTo_p_FXId},{"_p_FXGIFCursor", _p_FXGIFCursorTo_p_FXId},{"_p_FXRbCURCursor", _p_FXRbCURCursorTo_p_FXId},{"_p_FXCURCursor", _p_FXCURCursorTo_p_FXId},{"_p_FXRbCursor", _p_FXRbCursorTo_p_FXId},{"_p_FXCursor", _p_FXCursorTo_p_FXId},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXId},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXId},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXId},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXId},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXId},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXId},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXId},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXId},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXId},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXId},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXId},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXId},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXId},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXId},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXId},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXId},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXId},{"_p_FXWindow", _p_FXWindowTo_p_FXId},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXId},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXId},{"_p_FXRbDial", _p_FXRbDialTo_p_FXId},{"_p_FXLabel", _p_FXLabelTo_p_FXId},{"_p_FXShell", _p_FXShellTo_p_FXId},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXId},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXId},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXId},{"_p_FXOption", _p_FXOptionTo_p_FXId},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXId},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXId},{"_p_FXColorWell", _p_FXColorWellTo_p_FXId},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXId},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXId},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXId},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXId},{"_p_FXIconList", _p_FXIconListTo_p_FXId},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXId},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXId},{"_p_FXRbTable", _p_FXRbTableTo_p_FXId},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXId},{"_p_FXImageView", _p_FXImageViewTo_p_FXId},{"_p_FXRbText", _p_FXRbTextTo_p_FXId},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXId},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXId},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXId},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXId},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXId},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXId},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXId},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXId},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXId},{"_p_FXFileList", _p_FXFileListTo_p_FXId},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXId},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXId},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXId},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXId},{0}};
static swig_type_info _swigt__p_SCNotification[] = {{"_p_SCNotification", 0, "SCNotification *"},{"_p_SCNotification"},{0}};
***************
*** 4282,4286 ****
static swig_type_info _swigt__p_FXScintilla[] = {{"_p_FXScintilla", 0, "FXScintilla *"},{"_p_FXScintilla"},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXScintilla},{0}};
static swig_type_info _swigt__p_FXRbScintilla[] = {{"_p_FXRbScintilla", 0, "FXRbScintilla *"},{"_p_FXRbScintilla"},{0}};
! static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *"},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream},{"_p_FXStream"},{0}};
static swig_type_info *swig_types_initial[] = {
--- 4291,4295 ----
static swig_type_info _swigt__p_FXScintilla[] = {{"_p_FXScintilla", 0, "FXScintilla *"},{"_p_FXScintilla"},{"_p_FXRbScintilla", _p_FXRbScintillaTo_p_FXScintilla},{0}};
static swig_type_info _swigt__p_FXRbScintilla[] = {{"_p_FXRbScintilla", 0, "FXRbScintilla *"},{"_p_FXRbScintilla"},{0}};
! static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *"},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream},{"_p_FXRbFileStream", _p_FXRbFileStreamTo_p_FXStream},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream},{"_p_FXRbMemoryStream", _p_FXRbMemoryStreamTo_p_FXStream},{"_p_FXStream"},{"_p_FXRbStream", _p_FXRbStreamTo_p_FXStream},{0}};
static swig_type_info *swig_types_initial[] = {
Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -d -r1.9.2.4 -r1.9.2.5
*** ui_wrap.cpp 29 Apr 2002 22:23:45 -0000 1.9.2.4
--- ui_wrap.cpp 30 Apr 2002 02:12:42 -0000 1.9.2.5
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-2056
*
* This file is not intended to be easily readable and contains a number of
|
|
From: Lyle J. <ly...@us...> - 2002-04-30 01:54:51
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv17560
Modified Files:
Tag: release10
FXRuby.h
Log Message:
Fixed the bug in overloaded to_ruby() functions:
VALUE to_ruby(FXObject*);
VALUE to_ruby(const FXObject*);
for the case where the input pointer is NULL. Should return Qnil
in those cases. See SF Bug #550417.
Index: FXRuby.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRuby.h,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -d -r1.21 -r1.21.2.1
*** FXRuby.h 3 Apr 2002 21:40:57 -0000 1.21
--- FXRuby.h 30 Apr 2002 01:54:47 -0000 1.21.2.1
***************
*** 176,188 ****
inline VALUE to_ruby(FXObject* obj){
! char type[64];
! sprintf(type,"%s *",obj->getClassName());
! return FXRbGetRubyObj(obj,type);
}
inline VALUE to_ruby(const FXObject* obj){
! char type[64];
! sprintf(type,"%s *",obj->getClassName());
! return FXRbGetRubyObj(obj,type);
}
--- 176,196 ----
inline VALUE to_ruby(FXObject* obj){
! if(obj){
! FXString type=FXStringFormat("%s *",obj->getClassName());
! return FXRbGetRubyObj(obj,type.text());
! }
! else{
! return Qnil;
! }
}
inline VALUE to_ruby(const FXObject* obj){
! if(obj){
! FXString type=FXStringFormat("%s *",obj->getClassName());
! return FXRbGetRubyObj(obj,type.text());
! }
! else{
! return Qnil;
! }
}
|
|
From: Lyle J. <ly...@us...> - 2002-04-29 22:34:42
|
Update of /cvsroot/fxruby/FXRuby
In directory usw-pr-cvs1:/tmp/cvs-serv9007
Modified Files:
Tag: release10
ChangeLog
Log Message:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** ChangeLog 21 Mar 2002 23:13:31 -0000 1.24
--- ChangeLog 29 Apr 2002 22:34:38 -0000 1.24.2.1
***************
*** 1,2 ****
--- 1,383 ----
+ 2002-04-29 17:23 lyle
+
+ * ext/fox/core_wrap.cpp, swig-interfaces/typemaps.i,
+ ext/fox/dialogs_wrap.cpp, ext/fox/icons_wrap.cpp,
+ ext/fox/image_wrap.cpp, ext/fox/layout_wrap.cpp,
+ ext/fox/mdi_wrap.cpp, ext/fox/opengl_wrap.cpp, ext/fox/ui_wrap.cpp:
+ Fix for SF Bug #550349. For functions that have input arguments of
+ type "const FXString&" but also specify a default argument value
+ which is a literal string, e.g.
[...3464 lines suppressed...]
FXRadioButton.i, FXRecentFiles.i, FXRegion.i, FXRegistry.i,
FXRootWindow.i, FXScrollArea.i, FXScrollWindow.i, FXScrollbar.i,
FXSeparator.i, FXSpinner.i, FXTab.i, FXTextField.i,
FXToggleButton.i, FXToolbar.i, FXTooltip.i, FXTreeList.i, FXURL.i,
! FXVerticalFrame.i, FXXPMIcon.i, FXXPMImage.i: [no log message]
2000-12-19 19:28 lyle
***************
*** 4529,4533 ****
swig-interfaces/FXStream.i, swig-interfaces/FXTopWindow.i,
swig-interfaces/FXVisual.i, swig-interfaces/FXWindow.i,
! swig-interfaces/Makefile, swig-interfaces/fox.i,
! swig-interfaces/fxdefs.i: Initial revision
--- 4562,4566 ----
swig-interfaces/FXStream.i, swig-interfaces/FXTopWindow.i,
swig-interfaces/FXVisual.i, swig-interfaces/FXWindow.i,
! swig-interfaces/Makefile, swig-interfaces/fxdefs.i: Initial
! revision
|
|
From: Lyle J. <ly...@us...> - 2002-04-29 22:24:14
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv5321/swig-interfaces
Modified Files:
Tag: release10
typemaps.i
Log Message:
Fix for SF Bug #550349. For functions that have input arguments of
type "const FXString&" but also specify a default argument value which
is a literal string, e.g.
void somefunc(const FXString& title = "Hello");
the previous typemap I had was not working properly. The new one should.
Index: typemaps.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/typemaps.i,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -C2 -d -r1.35.2.2 -r1.35.2.3
*** typemaps.i 25 Apr 2002 22:29:03 -0000 1.35.2.2
--- typemaps.i 29 Apr 2002 22:23:41 -0000 1.35.2.3
***************
*** 39,52 ****
/* Convert Ruby string to const FXString& */
! %typemap(ruby, in) const FXString& {
if ($input != Qnil) {
Check_Type($input, T_STRING);
! $1 = new FXString(STR2CSTR($input));
} else {
! $1 = new FXString;
}
}
-
- %typemap(ruby, freearg) const FXString& "delete $1;";
/* Convert Ruby true and false to FXbool inputs */
--- 39,51 ----
/* Convert Ruby string to const FXString& */
! %typemap(ruby, in) const FXString& (SwigValueWrapper<FXString> p) {
if ($input != Qnil) {
Check_Type($input, T_STRING);
! p = FXString(STR2CSTR($input));
} else {
! p = FXString::null;
}
+ $1 = &p;
}
/* Convert Ruby true and false to FXbool inputs */
|
|
From: Lyle J. <ly...@us...> - 2002-04-29 22:23:53
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv5321/ext/fox
Modified Files:
Tag: release10
core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp
layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp ui_wrap.cpp
Log Message:
Fix for SF Bug #550349. For functions that have input arguments of
type "const FXString&" but also specify a default argument value which
is a literal string, e.g.
void somefunc(const FXString& title = "Hello");
the previous typemap I had was not working properly. The new one should.
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.3
retrieving revision 1.62.2.4
diff -C2 -d -r1.62.2.3 -r1.62.2.4
*** core_wrap.cpp 25 Apr 2002 16:48:26 -0000 1.62.2.3
--- core_wrap.cpp 29 Apr 2002 22:23:41 -0000 1.62.2.4
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
***************
*** 1631,1634 ****
--- 1631,1635 ----
int arg3 ;
FXbool result;
+ SwigValueWrapper<FXString > p2 ;
VALUE vresult = Qnil;
***************
*** 1639,1646 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
arg3 = (int ) NUM2INT(argv[1]);
--- 1640,1648 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
arg3 = (int ) NUM2INT(argv[1]);
***************
*** 1648,1652 ****
vresult = result ? Qtrue : Qfalse;
- delete arg2;
return vresult;
}
--- 1650,1653 ----
***************
*** 3095,3098 ****
--- 3096,3100 ----
FXbool arg3 ;
FXbool result;
+ SwigValueWrapper<FXString > p2 ;
VALUE vresult = Qnil;
***************
*** 3103,3110 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
{
--- 3105,3113 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
{
***************
*** 3117,3121 ****
vresult = result ? Qtrue : Qfalse;
- delete arg2;
return vresult;
}
--- 3120,3123 ----
***************
*** 3127,3130 ****
--- 3129,3133 ----
FXString *arg2 ;
FXbool result;
+ SwigValueWrapper<FXString > p2 ;
VALUE vresult = Qnil;
***************
*** 3135,3147 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
result = (FXbool )(arg1)->unparseFile((FXString const &)*arg2);
vresult = result ? Qtrue : Qfalse;
- delete arg2;
return vresult;
}
--- 3138,3150 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
result = (FXbool )(arg1)->unparseFile((FXString const &)*arg2);
vresult = result ? Qtrue : Qfalse;
return vresult;
}
***************
*** 3529,3532 ****
--- 3532,3538 ----
static VALUE
_wrap_new_FXRegistry(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p1 ;
+ SwigValueWrapper<FXString > p2 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRegistry);
rb_obj_call_init(vresult, argc, argv);
***************
*** 3542,3545 ****
--- 3548,3553 ----
FXString *arg2 = (FXString *) &arg2_defvalue ;
FXRegistry *result;
+ SwigValueWrapper<FXString > p1 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 0) || (argc > 2))
***************
*** 3549,3556 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg1 = new FXString(STR2CSTR(argv[0]));
}else {
! arg1 = new FXString;
}
}
}
--- 3557,3565 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p1 = FXString(STR2CSTR(argv[0]));
}else {
! p1 = FXString::null;
}
+ arg1 = &p1;
}
}
***************
*** 3559,3566 ****
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[1]));
}else {
! arg2 = new FXString;
}
}
}
--- 3568,3576 ----
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! p2 = FXString(STR2CSTR(argv[1]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
}
***************
*** 3568,3573 ****
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
- delete arg1;
- delete arg2;
return self;
}
--- 3578,3581 ----
***************
*** 4067,4070 ****
--- 4075,4079 ----
FXRecentFiles *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 4074,4085 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setGroupName((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 4083,4094 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setGroupName((FXString const &)*arg2);
return Qnil;
}
***************
*** 4168,4171 ****
--- 4177,4181 ----
FXRecentFiles *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 4175,4186 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->appendFile((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 4185,4196 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->appendFile((FXString const &)*arg2);
return Qnil;
}
***************
*** 4191,4194 ****
--- 4201,4205 ----
FXRecentFiles *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 4198,4209 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->removeFile((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 4209,4220 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->removeFile((FXString const &)*arg2);
return Qnil;
}
***************
*** 5528,5531 ****
--- 5539,5543 ----
FXString *arg2 ;
FXDragType result;
+ SwigValueWrapper<FXString > p2 ;
VALUE vresult = Qnil;
***************
*** 5536,5548 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
result = (FXDragType )((FXApp const *)arg1)->registerDragType((FXString const &)*arg2);
vresult = UINT2NUM(result);
- delete arg2;
return vresult;
}
--- 5548,5560 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
result = (FXDragType )((FXApp const *)arg1)->registerDragType((FXString const &)*arg2);
vresult = UINT2NUM(result);
return vresult;
}
***************
*** 7964,7967 ****
--- 7976,7980 ----
FXuint arg6 = 0 ;
FXbool result;
+ SwigValueWrapper<FXString > p1 ;
VALUE vresult = Qnil;
***************
*** 7971,7978 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg1 = new FXString(STR2CSTR(argv[0]));
}else {
! arg1 = new FXString;
}
}
if (argc > 1) {
--- 7984,7992 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p1 = FXString(STR2CSTR(argv[0]));
}else {
! p1 = FXString::null;
}
+ arg1 = &p1;
}
if (argc > 1) {
***************
*** 7994,7998 ****
vresult = result ? Qtrue : Qfalse;
- delete arg1;
return vresult;
}
--- 8008,8011 ----
***************
*** 16129,16132 ****
--- 16142,16147 ----
static VALUE
_wrap_new_FX_IconDict(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p2 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXIconDict);
rb_obj_call_init(vresult, argc, argv);
***************
*** 16141,16144 ****
--- 16156,16160 ----
FXString *arg2 = (FXString *) &arg2_defvalue ;
FXIconDict *result;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 2))
***************
*** 16149,16156 ****
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[1]));
}else {
! arg2 = new FXString;
}
}
}
--- 16165,16173 ----
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! p2 = FXString(STR2CSTR(argv[1]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
}
***************
*** 16158,16162 ****
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
- delete arg2;
return self;
}
--- 16175,16178 ----
***************
*** 16183,16186 ****
--- 16199,16203 ----
FXIconDict *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 16190,16201 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setIconPath((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 16207,16218 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setIconPath((FXString const &)*arg2);
return Qnil;
}
***************
*** 16279,16282 ****
--- 16296,16301 ----
static VALUE
_wrap_new_FXIconDict(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p2 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbIconDict);
rb_obj_call_init(vresult, argc, argv);
***************
*** 16291,16294 ****
--- 16310,16314 ----
FXString *arg2 = (FXString *) &arg2_defvalue ;
FXRbIconDict *result;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 2))
***************
*** 16299,16306 ****
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[1]));
}else {
! arg2 = new FXString;
}
}
}
--- 16319,16327 ----
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! p2 = FXString(STR2CSTR(argv[1]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
}
***************
*** 16308,16312 ****
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
- delete arg2;
return self;
}
--- 16329,16332 ----
***************
*** 16455,16458 ****
--- 16475,16479 ----
FXFileDict *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 16462,16473 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setIconPath((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 16483,16494 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setIconPath((FXString const &)*arg2);
return Qnil;
}
***************
*** 17360,17363 ****
--- 17381,17385 ----
FXDocument *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 17367,17378 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setTitle((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 17389,17400 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setTitle((FXString const &)*arg2);
return Qnil;
}
***************
*** 17399,17402 ****
--- 17421,17425 ----
FXDocument *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 17406,17417 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setFilename((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 17429,17440 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setFilename((FXString const &)*arg2);
return Qnil;
}
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34.2.3
retrieving revision 1.34.2.4
diff -C2 -d -r1.34.2.3 -r1.34.2.4
*** dialogs_wrap.cpp 25 Apr 2002 16:48:30 -0000 1.34.2.3
--- dialogs_wrap.cpp 29 Apr 2002 22:23:42 -0000 1.34.2.4
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
[...1698 lines suppressed...]
***************
*** 9730,9733 ****
--- 9823,9829 ----
static VALUE
_wrap_new_FX_MessageBox(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p2 ;
+ SwigValueWrapper<FXString > p3 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMessageBox);
rb_obj_call_init(vresult, argc, argv);
***************
*** 9939,9942 ****
--- 10035,10041 ----
static VALUE
_wrap_new_FXMessageBox(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p2 ;
+ SwigValueWrapper<FXString > p3 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbMessageBox);
rb_obj_call_init(vresult, argc, argv);
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37.2.3
retrieving revision 1.37.2.4
diff -C2 -d -r1.37.2.3 -r1.37.2.4
*** icons_wrap.cpp 25 Apr 2002 16:48:31 -0000 1.37.2.3
--- icons_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.37.2.4
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39.2.3
retrieving revision 1.39.2.4
diff -C2 -d -r1.39.2.3 -r1.39.2.4
*** image_wrap.cpp 25 Apr 2002 16:48:31 -0000 1.39.2.3
--- image_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.39.2.4
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
Index: layout_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C2 -d -r1.8.2.3 -r1.8.2.4
*** layout_wrap.cpp 25 Apr 2002 16:48:31 -0000 1.8.2.3
--- layout_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.8.2.4
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
***************
*** 2535,2538 ****
--- 2535,2540 ----
static VALUE
_wrap_new_FX_GroupBox(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p2 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXGroupBox);
rb_obj_call_init(vresult, argc, argv);
***************
*** 2557,2560 ****
--- 2559,2563 ----
FXint arg13 = 4 ;
FXGroupBox *result;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 2) || (argc > 13))
***************
*** 2564,2571 ****
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[1]));
}else {
! arg2 = new FXString;
}
}
if (argc > 2) {
--- 2567,2575 ----
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! p2 = FXString(STR2CSTR(argv[1]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
if (argc > 2) {
***************
*** 2605,2609 ****
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
- delete arg2;
return self;
}
--- 2609,2612 ----
***************
*** 2614,2617 ****
--- 2617,2621 ----
FXGroupBox *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 2621,2632 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setText((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 2625,2636 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setText((FXString const &)*arg2);
return Qnil;
}
***************
*** 2745,2748 ****
--- 2749,2754 ----
static VALUE
_wrap_new_FXGroupBox(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p2 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbGroupBox);
rb_obj_call_init(vresult, argc, argv);
***************
*** 2767,2770 ****
--- 2773,2777 ----
FXint arg13 = 4 ;
FXRbGroupBox *result;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 2) || (argc > 13))
***************
*** 2774,2781 ****
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[1]));
}else {
! arg2 = new FXString;
}
}
if (argc > 2) {
--- 2781,2789 ----
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! p2 = FXString(STR2CSTR(argv[1]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
if (argc > 2) {
***************
*** 2815,2819 ****
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
- delete arg2;
return self;
}
--- 2823,2826 ----
***************
*** 4176,4179 ****
--- 4183,4188 ----
static VALUE
_wrap_new_FX_ShutterItem(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p2 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXShutterItem);
rb_obj_call_init(vresult, argc, argv);
***************
*** 4199,4202 ****
--- 4208,4212 ----
FXint arg14 = 4 ;
FXShutterItem *result;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 2) || (argc > 14))
***************
*** 4206,4213 ****
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[1]));
}else {
! arg2 = new FXString;
}
}
if (argc > 2) {
--- 4216,4224 ----
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! p2 = FXString(STR2CSTR(argv[1]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
if (argc > 2) {
***************
*** 4250,4254 ****
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
- delete arg2;
return self;
}
--- 4261,4264 ----
***************
*** 4291,4294 ****
--- 4301,4305 ----
FXShutterItem *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 4298,4309 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setHelpText((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 4309,4320 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setHelpText((FXString const &)*arg2);
return Qnil;
}
***************
*** 4330,4333 ****
--- 4341,4345 ----
FXShutterItem *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 4337,4348 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setTipText((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 4349,4360 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setTipText((FXString const &)*arg2);
return Qnil;
}
***************
*** 4372,4375 ****
--- 4384,4389 ----
static VALUE
_wrap_new_FXShutterItem(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p2 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbShutterItem);
rb_obj_call_init(vresult, argc, argv);
***************
*** 4395,4398 ****
--- 4409,4413 ----
FXint arg14 = 4 ;
FXRbShutterItem *result;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 2) || (argc > 14))
***************
*** 4402,4409 ****
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[1]));
}else {
! arg2 = new FXString;
}
}
if (argc > 2) {
--- 4417,4425 ----
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! p2 = FXString(STR2CSTR(argv[1]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
if (argc > 2) {
***************
*** 4446,4450 ****
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
- delete arg2;
return self;
}
--- 4462,4465 ----
Index: mdi_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v
retrieving revision 1.36.2.3
retrieving revision 1.36.2.4
diff -C2 -d -r1.36.2.3 -r1.36.2.4
*** mdi_wrap.cpp 25 Apr 2002 16:48:31 -0000 1.36.2.3
--- mdi_wrap.cpp 29 Apr 2002 22:23:43 -0000 1.36.2.4
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
***************
*** 6247,6250 ****
--- 6247,6252 ----
static VALUE
_wrap_new_FX_MDIChild(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p2 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXMDIChild);
rb_obj_call_init(vresult, argc, argv);
***************
*** 6265,6268 ****
--- 6267,6271 ----
FXint arg9 = 0 ;
FXMDIChild *result;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 2) || (argc > 9))
***************
*** 6272,6279 ****
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[1]));
}else {
! arg2 = new FXString;
}
}
if (argc > 2) {
--- 6275,6283 ----
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! p2 = FXString(STR2CSTR(argv[1]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
if (argc > 2) {
***************
*** 6301,6305 ****
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
- delete arg2;
return self;
}
--- 6305,6308 ----
***************
*** 6606,6609 ****
--- 6609,6613 ----
FXMDIChild *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 6613,6624 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setTitle((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 6617,6628 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setTitle((FXString const &)*arg2);
return Qnil;
}
***************
*** 7025,7028 ****
--- 7029,7034 ----
static VALUE
_wrap_new_FXMDIChild(int argc, VALUE *argv, VALUE self) {
+ SwigValueWrapper<FXString > p2 ;
+
VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_FXRbMDIChild);
rb_obj_call_init(vresult, argc, argv);
***************
*** 7043,7046 ****
--- 7049,7053 ----
FXint arg9 = 0 ;
FXRbMDIChild *result;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 2) || (argc > 9))
***************
*** 7050,7057 ****
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[1]));
}else {
! arg2 = new FXString;
}
}
if (argc > 2) {
--- 7057,7065 ----
if (argv[1] != Qnil) {
Check_Type(argv[1], T_STRING);
! p2 = FXString(STR2CSTR(argv[1]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
if (argc > 2) {
***************
*** 7079,7083 ****
FXRbRegisterRubyObj(self, result);
DATA_PTR(self) = result;
- delete arg2;
return self;
}
--- 7087,7090 ----
Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41.2.4
retrieving revision 1.41.2.5
diff -C2 -d -r1.41.2.4 -r1.41.2.5
*** opengl_wrap.cpp 25 Apr 2002 22:29:46 -0000 1.41.2.4
--- opengl_wrap.cpp 29 Apr 2002 22:23:44 -0000 1.41.2.5
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
* This file is not intended to be easily readable and contains a number of
***************
*** 8678,8681 ****
--- 8678,8682 ----
FXGLViewer *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 8685,8696 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setHelpText((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 8686,8697 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setHelpText((FXString const &)*arg2);
return Qnil;
}
***************
*** 8717,8720 ****
--- 8718,8722 ----
FXGLViewer *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 8724,8735 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setTipText((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 8726,8737 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setTipText((FXString const &)*arg2);
return Qnil;
}
***************
*** 10959,10962 ****
--- 10961,10965 ----
FXGLShape *arg1 ;
FXString *arg2 ;
+ SwigValueWrapper<FXString > p2 ;
if ((argc < 1) || (argc > 1))
***************
*** 10966,10977 ****
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! arg2 = new FXString(STR2CSTR(argv[0]));
}else {
! arg2 = new FXString;
}
}
(arg1)->setTipText((FXString const &)*arg2);
- delete arg2;
return Qnil;
}
--- 10969,10980 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
(arg1)->setTipText((FXString const &)*arg2);
return Qnil;
}
Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -d -r1.9.2.3 -r1.9.2.4
*** ui_wrap.cpp 25 Apr 2002 16:48:32 -0000 1.9.2.3
--- ui_wrap.cpp 29 Apr 2002 22:23:45 -0000 1.9.2.4
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020429-1612
*
[...6226 lines suppressed...]
}
if (argc > 1) {
--- 91748,91756 ----
if (argv[0] != Qnil) {
Check_Type(argv[0], T_STRING);
! p2 = FXString(STR2CSTR(argv[0]));
}else {
! p2 = FXString::null;
}
+ arg2 = &p2;
}
if (argc > 1) {
***************
*** 91519,91523 ****
vresult = result ? Qtrue : Qfalse;
- delete arg2;
return vresult;
}
--- 91772,91775 ----
|
|
From: Lyle J. <ly...@us...> - 2002-04-25 21:08:54
|
Update of /cvsroot/fxruby/FXRuby/tests
In directory usw-pr-cvs1:/tmp/cvs-serv14322
Added Files:
Tag: release10
TC_FXFileStream.rb
Log Message:
Added a test case (TC_FXFileStream.rb) for the FXFileStream class.
--- NEW FILE: TC_FXFileStream.rb ---
require 'test/unit'
require 'fox'
include Fox
class TC_FXFileStream < Test::Unit::TestCase
def set_up
@filestream = FXFileStream.new
end
def test_container
assert_nil(@filestream.container)
end
def test_openNonExisting
assert_equal(FXStreamDead, @filestream.direction)
status = @filestream.open("goobers", FXStreamLoad)
assert(!status)
assert_equal(FXStreamDead, @filestream.direction)
end
def test_openExisting
assert_equal(FXStreamDead, @filestream.direction)
status = @filestream.open("README", FXStreamLoad)
assert(status)
assert_equal(FXStreamLoad, @filestream.direction)
status = @filestream.close
assert(status)
assert_equal(FXStreamDead, @filestream.direction)
end
def test_openNew
assert_equal(FXStreamDead, @filestream.direction)
status = @filestream.open("goobers", FXStreamSave)
assert(status)
assert_equal(FXStreamSave, @filestream.direction)
status = @filestream.close
assert(status)
assert_equal(FXStreamDead, @filestream.direction)
File.delete("goobers")
end
def test_status
assert_equal(FXStreamOK, @filestream.status)
@filestream.open("README", FXStreamLoad)
assert_equal(FXStreamOK, @filestream.status)
@filestream.close
assert_equal(FXStreamOK, @filestream.status)
end
def test_position
@filestream.open("README", FXStreamLoad)
assert_equal(0, @filestream.position)
@filestream.position = 500
assert_equal(500, @filestream.position)
@filestream.close
end
end
|
|
From: Lyle J. <ly...@us...> - 2002-04-25 21:08:02
|
Update of /cvsroot/fxruby/FXRuby/lib/fox
In directory usw-pr-cvs1:/tmp/cvs-serv13727
Modified Files:
Tag: release10
aliases.rb
Log Message:
Added aliases FXStream#error= (for FXStream#setError), FXStream#position=
(for FXStream#setPosition) and FXStream#position (for FXStream#getPosition).
Index: aliases.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/lib/fox/aliases.rb,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** aliases.rb 3 Apr 2002 21:40:57 -0000 1.24
--- aliases.rb 25 Apr 2002 21:07:58 -0000 1.24.2.1
***************
*** 1062,1066 ****
alias textHighlightColor= setTextHighlightColor
end
! class FXStream
alias swapBytes= setSwapBytes
alias swapBytes getSwapBytes
--- 1062,1069 ----
alias textHighlightColor= setTextHighlightColor
end
! class FX_Stream
! alias error= setError
! alias position= setPosition
! alias position getPosition
alias swapBytes= setSwapBytes
alias swapBytes getSwapBytes
|
|
From: Lyle J. <ly...@us...> - 2002-04-25 16:48:39
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv32716/ext/fox
Modified Files:
Tag: release10
core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp
impl.cpp layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp
ui_wrap.cpp
Log Message:
Fixes related to SF Bug #535955. FXStream, FXFileStream and FXMemoryStream
were not implemented properly w.r.t. virtual functions and GC.
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.2
retrieving revision 1.62.2.3
diff -C2 -d -r1.62.2.2 -r1.62.2.3
*** core_wrap.cpp 24 Apr 2002 15:48:29 -0000 1.62.2.2
--- core_wrap.cpp 25 Apr 2002 16:48:26 -0000 1.62.2.3
***************
*** 307,312 ****
#define SWIGTYPE_p_FXRbDCPrint swig_types[7]
#define SWIGTYPE_p_FXArc swig_types[8]
! #define SWIGTYPE_p_FXRbDict swig_types[9]
! #define SWIGTYPE_p_FXuchar swig_types[10]
#define SWIGTYPE_p_p_FXuchar swig_types[11]
#define SWIGTYPE_p_FXint swig_types[12]
--- 307,312 ----
#define SWIGTYPE_p_FXRbDCPrint swig_types[7]
#define SWIGTYPE_p_FXArc swig_types[8]
! #define SWIGTYPE_p_FXuchar swig_types[9]
[...962 lines suppressed...]
! SWIG_TypeClientData(SWIGTYPE_p_FXMemoryStream, (void *) &cFX_MemoryStream);
! rb_define_singleton_method(cFX_MemoryStream.klass, "new", VALUEFUNC(_wrap_new_FX_MemoryStream), -1);
! rb_define_method(cFX_MemoryStream.klass, "initialize", VALUEFUNC(_wrap_FX_MemoryStream_initialize), -1);
! rb_define_method(cFX_MemoryStream.klass, "open", VALUEFUNC(_wrap_FX_MemoryStream_open), -1);
! rb_define_method(cFX_MemoryStream.klass, "getSpace", VALUEFUNC(_wrap_FX_MemoryStream_getSpace), -1);
! rb_define_method(cFX_MemoryStream.klass, "setSpace", VALUEFUNC(_wrap_FX_MemoryStream_setSpace), -1);
! rb_define_method(cFX_MemoryStream.klass, "takeBuffer", VALUEFUNC(_wrap_FX_MemoryStream_takeBuffer), -1);
! rb_define_method(cFX_MemoryStream.klass, "giveBuffer", VALUEFUNC(_wrap_FX_MemoryStream_giveBuffer), -1);
! cFX_MemoryStream.mark = (void (*)(void *)) FXRbMemoryStream::markfunc;
! cFX_MemoryStream.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
!
! cFXMemoryStream.klass = rb_define_class_under(mFox, "FXMemoryStream", cFX_MemoryStream.klass);
! SWIG_TypeClientData(SWIGTYPE_p_FXRbMemoryStream, (void *) &cFXMemoryStream);
rb_define_singleton_method(cFXMemoryStream.klass, "new", VALUEFUNC(_wrap_new_FXMemoryStream), -1);
rb_define_method(cFXMemoryStream.klass, "initialize", VALUEFUNC(_wrap_FXMemoryStream_initialize), -1);
rb_define_method(cFXMemoryStream.klass, "setPosition", VALUEFUNC(_wrap_FXMemoryStream_setPosition), -1);
! cFXMemoryStream.mark = (void (*)(void *)) FXRbMemoryStream::markfunc;
! cFXMemoryStream.destroy = (void (*)(void *)) free_FXRbMemoryStream;
cFXSize.klass = rb_define_class_under(mFox, "FXSize", rb_cObject);
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34.2.2
retrieving revision 1.34.2.3
diff -C2 -d -r1.34.2.2 -r1.34.2.3
*** dialogs_wrap.cpp 24 Apr 2002 15:48:35 -0000 1.34.2.2
--- dialogs_wrap.cpp 25 Apr 2002 16:48:30 -0000 1.34.2.3
***************
*** 12704,12710 ****
--- 12704,12719 ----
return (void *)((FXStream *) ((FXFileStream *) x));
}
+ static void *_p_FXRbFileStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbFileStream *) x));
+ }
static void *_p_FXMemoryStreamTo_p_FXStream(void *x) {
return (void *)((FXStream *) ((FXMemoryStream *) x));
}
+ static void *_p_FXRbMemoryStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbMemoryStream *) x));
+ }
+ static void *_p_FXRbStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbStream *) x));
+ }
static void *_p_FXMenuCaptionTo_p_FXId(void *x) {
return (void *)((FXId *) ((FXMenuCaption *) x));
***************
*** 13266,13270 ****
static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *"},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXDrawable},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXDrawable},{"_p_FXRbShell", _p_FXRbShellTo_p_FXDrawable},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXDrawable},{"_p_FXDirList", _p_FXDirListTo_p_FXDrawable},{"_p_FXRbDial", _p_FXRbDialTo_p_FXDrawable},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXDrawable},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXDrawable},{"_p_FXMenubar", _p_FXMenubarTo_p_FXDrawable},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXDrawable},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXDrawable},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXDrawable},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXDrawable},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXDrawable},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXDrawable},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXDrawable},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXDrawable},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXDrawable},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXDrawable},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXDrawable},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXDrawable},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXDrawable},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXDrawable},{"_p_FXDialogBox", _p_FXDialogBoxTo_p_FXDrawable},{"_p_FXRbDialogBox", _p_FXRbDialogBoxTo_p_FXDrawable},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXDrawable},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable},{"_p_FXList", _p_FXListTo_p_FXDrawable},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXDrawable},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXDrawable},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXDrawable},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXDrawable},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXDrawable},{"_p_FXFileList", _p_FXFileListTo_p_FXDrawable},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXDrawable},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXDrawable},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXDrawable},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXDrawable},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXDrawable},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXDrawable},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXDrawable},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXDrawable},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXDrawable},{"_p_FXText", _p_FXTextTo_p_FXDrawable},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXDrawable},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXDrawable},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXDrawable},{"_p_FXIconList", _p_FXIconListTo_p_FXDrawable},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXDrawable},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXDrawable},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXDrawable},{"_p_FXDial", _p_FXDialTo_p_FXDrawable},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXDrawable},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXDrawable},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXDrawable},{"_p_FXListBox", _p_FXListBoxTo_p_FXDrawable},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXDrawable},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXDrawable},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXDrawable},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXDrawable},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXDrawable},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable},{"_p_FXTabBook", _p_FXTabBookTo_p_FXDrawable},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXDrawable},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXDrawable},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXDrawable},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXDrawable},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXDrawable},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXDrawable},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXDrawable},{"_p_FXLabel", _p_FXLabelTo_p_FXDrawable},{"_p_FXRbDirDialog", _p_FXRbDirDialogTo_p_FXDrawable},{"_p_FXDirDialog", _p_FXDirDialogTo_p_FXDrawable},{"_p_FXRbInputDialog", _p_FXRbInputDialogTo_p_FXDrawable},{"_p_FXPrintDialog", _p_FXPrintDialogTo_p_FXDrawable},{"_p_FXRbPrintDialog", _p_FXRbPrintDialogTo_p_FXDrawable},{"_p_FXColorDialog", _p_FXColorDialogTo_p_FXDrawable},{"_p_FXRbColorDialog", _p_FXRbColorDialogTo_p_FXDrawable},{"_p_FXFontDialog", _p_FXFontDialogTo_p_FXDrawable},{"_p_FXRbFontDialog", _p_FXRbFontDialogTo_p_FXDrawable},{"_p_FXSearchDialog", _p_FXSearchDialogTo_p_FXDrawable},{"_p_FXRbSearchDialog", _p_FXRbSearchDialogTo_p_FXDrawable},{"_p_FXInputDialog", _p_FXInputDialogTo_p_FXDrawable},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXDrawable},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXDrawable},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXDrawable},{"_p_FXTreeList", _p_FXTreeListTo_p_FXDrawable},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXDrawable},{"_p_FXTooltip", _p_FXTooltipTo_p_FXDrawable},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXDrawable},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXDrawable},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXDrawable},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXDrawable},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXDrawable},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXDrawable},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXDrawable},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXDrawable},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXDrawable},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXDrawable},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXDrawable},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXDrawable},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXDrawable},{"_p_FXRbReplaceDialog", _p_FXRbReplaceDialogTo_p_FXDrawable},{"_p_FXReplaceDialog", _p_FXReplaceDialogTo_p_FXDrawable},{"_p_FXRbFileDialog", _p_FXRbFileDialogTo_p_FXDrawable},{"_p_FXFileDialog", _p_FXFileDialogTo_p_FXDrawable},{"_p_FXProgressDialog", _p_FXProgressDialogTo_p_FXDrawable},{"_p_FXRbProgressDialog", _p_FXRbProgressDialogTo_p_FXDrawable},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXDrawable},{"_p_FXOption", _p_FXOptionTo_p_FXDrawable},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXDrawable},{"_p_FXRbMessageBox", _p_FXRbMessageBoxTo_p_FXDrawable},{"_p_FXMessageBox", _p_FXMessageBoxTo_p_FXDrawable},{"_p_FXTable", _p_FXTableTo_p_FXDrawable},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXDrawable},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable},{"_p_FXTabBar", _p_FXTabBarTo_p_FXDrawable},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXDrawable},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXDrawable},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXDrawable},{"_p_FXDrawable"},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXDrawable},{"_p_FXImageView", _p_FXImageViewTo_p_FXDrawable},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXDrawable},{"_p_FXRbList", _p_FXRbListTo_p_FXDrawable},{"_p_FXCanvas", _p_FXCanvasTo_p_FXDrawable},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXDrawable},{"_p_FXRbTable", _p_FXRbTableTo_p_FXDrawable},{"_p_FXShell", _p_FXShellTo_p_FXDrawable},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXDrawable},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXDrawable},{"_p_FXRbText", _p_FXRbTextTo_p_FXDrawable},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXDrawable},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXDrawable},{"_p_F
XColorWheel", _p_FXColorWheelTo_p_FXDrawable},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXDrawable},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXDrawable},{"_p_FXToolbar", _p_FXToolbarTo_p_FXDrawable},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXDrawable},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable},{0}};
static swig_type_info _swigt__p_FXFontDesc[] = {{"_p_FXFontDesc", 0, "FXFontDesc *"},{"_p_FXFontDesc"},{0}};
! static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *"},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream},{"_p_FXStream"},{0}};
static swig_type_info _swigt__p_FXApp[] = {{"_p_FXApp", 0, "FXApp *"},{"_p_FXApp"},{"_p_FXRbApp", _p_FXRbAppTo_p_FXApp},{0}};
static swig_type_info _swigt__p_FXRbPrintDialog[] = {{"_p_FXRbPrintDialog", 0, "FXRbPrintDialog *"},{"_p_FXRbPrintDialog"},{0}};
--- 13275,13279 ----
static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *"},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXDrawable},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXDrawable},{"_p_FXRbShell", _p_FXRbShellTo_p_FXDrawable},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXDrawable},{"_p_FXDirList", _p_FXDirListTo_p_FXDrawable},{"_p_FXRbDial", _p_FXRbDialTo_p_FXDrawable},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXDrawable},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXDrawable},{"_p_FXMenubar", _p_FXMenubarTo_p_FXDrawable},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXDrawable},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXDrawable},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXDrawable},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXDrawable},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXDrawable},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXDrawable},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXDrawable},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXDrawable},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXDrawable},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXDrawable},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXDrawable},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXDrawable},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXDrawable},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXDrawable},{"_p_FXDialogBox", _p_FXDialogBoxTo_p_FXDrawable},{"_p_FXRbDialogBox", _p_FXRbDialogBoxTo_p_FXDrawable},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXDrawable},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable},{"_p_FXList", _p_FXListTo_p_FXDrawable},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXDrawable},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXDrawable},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXDrawable},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXDrawable},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXDrawable},{"_p_FXFileList", _p_FXFileListTo_p_FXDrawable},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXDrawable},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXDrawable},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXDrawable},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXDrawable},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXDrawable},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXDrawable},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXDrawable},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXDrawable},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXDrawable},{"_p_FXText", _p_FXTextTo_p_FXDrawable},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXDrawable},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXDrawable},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXDrawable},{"_p_FXIconList", _p_FXIconListTo_p_FXDrawable},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXDrawable},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXDrawable},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXDrawable},{"_p_FXDial", _p_FXDialTo_p_FXDrawable},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXDrawable},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXDrawable},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXDrawable},{"_p_FXListBox", _p_FXListBoxTo_p_FXDrawable},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXDrawable},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXDrawable},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXDrawable},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXDrawable},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXDrawable},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable},{"_p_FXTabBook", _p_FXTabBookTo_p_FXDrawable},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXDrawable},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXDrawable},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXDrawable},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXDrawable},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXDrawable},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXDrawable},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXDrawable},{"_p_FXLabel", _p_FXLabelTo_p_FXDrawable},{"_p_FXRbDirDialog", _p_FXRbDirDialogTo_p_FXDrawable},{"_p_FXDirDialog", _p_FXDirDialogTo_p_FXDrawable},{"_p_FXRbInputDialog", _p_FXRbInputDialogTo_p_FXDrawable},{"_p_FXPrintDialog", _p_FXPrintDialogTo_p_FXDrawable},{"_p_FXRbPrintDialog", _p_FXRbPrintDialogTo_p_FXDrawable},{"_p_FXColorDialog", _p_FXColorDialogTo_p_FXDrawable},{"_p_FXRbColorDialog", _p_FXRbColorDialogTo_p_FXDrawable},{"_p_FXFontDialog", _p_FXFontDialogTo_p_FXDrawable},{"_p_FXRbFontDialog", _p_FXRbFontDialogTo_p_FXDrawable},{"_p_FXSearchDialog", _p_FXSearchDialogTo_p_FXDrawable},{"_p_FXRbSearchDialog", _p_FXRbSearchDialogTo_p_FXDrawable},{"_p_FXInputDialog", _p_FXInputDialogTo_p_FXDrawable},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXDrawable},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXDrawable},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXDrawable},{"_p_FXTreeList", _p_FXTreeListTo_p_FXDrawable},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXDrawable},{"_p_FXTooltip", _p_FXTooltipTo_p_FXDrawable},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXDrawable},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXDrawable},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXDrawable},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXDrawable},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXDrawable},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXDrawable},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXDrawable},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXDrawable},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXDrawable},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXDrawable},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXDrawable},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXDrawable},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXDrawable},{"_p_FXRbReplaceDialog", _p_FXRbReplaceDialogTo_p_FXDrawable},{"_p_FXReplaceDialog", _p_FXReplaceDialogTo_p_FXDrawable},{"_p_FXRbFileDialog", _p_FXRbFileDialogTo_p_FXDrawable},{"_p_FXFileDialog", _p_FXFileDialogTo_p_FXDrawable},{"_p_FXProgressDialog", _p_FXProgressDialogTo_p_FXDrawable},{"_p_FXRbProgressDialog", _p_FXRbProgressDialogTo_p_FXDrawable},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXDrawable},{"_p_FXOption", _p_FXOptionTo_p_FXDrawable},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXDrawable},{"_p_FXRbMessageBox", _p_FXRbMessageBoxTo_p_FXDrawable},{"_p_FXMessageBox", _p_FXMessageBoxTo_p_FXDrawable},{"_p_FXTable", _p_FXTableTo_p_FXDrawable},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXDrawable},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable},{"_p_FXTabBar", _p_FXTabBarTo_p_FXDrawable},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXDrawable},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXDrawable},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXDrawable},{"_p_FXDrawable"},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXDrawable},{"_p_FXImageView", _p_FXImageViewTo_p_FXDrawable},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXDrawable},{"_p_FXRbList", _p_FXRbListTo_p_FXDrawable},{"_p_FXCanvas", _p_FXCanvasTo_p_FXDrawable},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXDrawable},{"_p_FXRbTable", _p_FXRbTableTo_p_FXDrawable},{"_p_FXShell", _p_FXShellTo_p_FXDrawable},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXDrawable},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXDrawable},{"_p_FXRbText", _p_FXRbTextTo_p_FXDrawable},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXDrawable},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXDrawable},{"_p_F
XColorWheel", _p_FXColorWheelTo_p_FXDrawable},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXDrawable},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXDrawable},{"_p_FXToolbar", _p_FXToolbarTo_p_FXDrawable},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXDrawable},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable},{0}};
static swig_type_info _swigt__p_FXFontDesc[] = {{"_p_FXFontDesc", 0, "FXFontDesc *"},{"_p_FXFontDesc"},{0}};
! static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *"},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream},{"_p_FXRbFileStream", _p_FXRbFileStreamTo_p_FXStream},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream},{"_p_FXRbMemoryStream", _p_FXRbMemoryStreamTo_p_FXStream},{"_p_FXStream"},{"_p_FXRbStream", _p_FXRbStreamTo_p_FXStream},{0}};
static swig_type_info _swigt__p_FXApp[] = {{"_p_FXApp", 0, "FXApp *"},{"_p_FXApp"},{"_p_FXRbApp", _p_FXRbAppTo_p_FXApp},{0}};
static swig_type_info _swigt__p_FXRbPrintDialog[] = {{"_p_FXRbPrintDialog", 0, "FXRbPrintDialog *"},{"_p_FXRbPrintDialog"},{0}};
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -C2 -d -r1.37.2.2 -r1.37.2.3
*** icons_wrap.cpp 24 Apr 2002 15:48:36 -0000 1.37.2.2
--- icons_wrap.cpp 25 Apr 2002 16:48:31 -0000 1.37.2.3
***************
*** 6722,6728 ****
--- 6722,6737 ----
return (void *)((FXStream *) ((FXFileStream *) x));
}
+ static void *_p_FXRbFileStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbFileStream *) x));
+ }
static void *_p_FXMemoryStreamTo_p_FXStream(void *x) {
return (void *)((FXStream *) ((FXMemoryStream *) x));
}
+ static void *_p_FXRbMemoryStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbMemoryStream *) x));
+ }
+ static void *_p_FXRbStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbStream *) x));
+ }
static void *_p_FXRbAppTo_p_FXApp(void *x) {
return (void *)((FXApp *) ((FXRbApp *) x));
***************
*** 6945,6949 ****
static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *"},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXDrawable},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXDrawable},{"_p_FXRbShell", _p_FXRbShellTo_p_FXDrawable},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXDrawable},{"_p_FXDirList", _p_FXDirListTo_p_FXDrawable},{"_p_FXRbDial", _p_FXRbDialTo_p_FXDrawable},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXDrawable},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXDrawable},{"_p_FXMenubar", _p_FXMenubarTo_p_FXDrawable},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXDrawable},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXDrawable},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXDrawable},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXDrawable},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXDrawable},{"_p_FXTIFIcon", _p_FXTIFIconTo_p_FXDrawable},{"_p_FXRbTIFIcon", _p_FXRbTIFIconTo_p_FXDrawable},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable},{"_p_FXImage", _p_FXImageTo_p_FXDrawable},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXDrawable},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXDrawable},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXDrawable},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable},{"_p_FXRbPNGImage", _p_FXRbPNGImageTo_p_FXDrawable},{"_p_FXPNGImage", _p_FXPNGImageTo_p_FXDrawable},{"_p_FXRbJPGImage", _p_FXRbJPGImageTo_p_FXDrawable},{"_p_FXJPGImage", _p_FXJPGImageTo_p_FXDrawable},{"_p_FXRbPNGIcon", _p_FXRbPNGIconTo_p_FXDrawable},{"_p_FXPNGIcon", _p_FXPNGIconTo_p_FXDrawable},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXDrawable},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXDrawable},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXDrawable},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXDrawable},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXDrawable},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXDrawable},{"_p_FXRGBImage", _p_FXRGBImageTo_p_FXDrawable},{"_p_FXRbImage", _p_FXRbImageTo_p_FXDrawable},{"_p_FXRbRGBImage", _p_FXRbRGBImageTo_p_FXDrawable},{"_p_FXGIFIcon", _p_FXGIFIconTo_p_FXDrawable},{"_p_FXRbGIFIcon", _p_FXRbGIFIconTo_p_FXDrawable},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXDrawable},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable},{"_p_FXRbPCXImage", _p_FXRbPCXImageTo_p_FXDrawable},{"_p_FXPCXImage", _p_FXPCXImageTo_p_FXDrawable},{"_p_FXRbIcon", _p_FXRbIconTo_p_FXDrawable},{"_p_FXList", _p_FXListTo_p_FXDrawable},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXDrawable},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXDrawable},{"_p_FXPCXIcon", _p_FXPCXIconTo_p_FXDrawable},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXDrawable},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXDrawable},{"_p_FXRbRGBIcon", _p_FXRbRGBIconTo_p_FXDrawable},{"_p_FXRGBIcon", _p_FXRGBIconTo_p_FXDrawable},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXDrawable},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXDrawable},{"_p_FXFileList", _p_FXFileListTo_p_FXDrawable},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXDrawable},{"_p_FXRbTGAIcon", _p_FXRbTGAIconTo_p_FXDrawable},{"_p_FXTGAIcon", _p_FXTGAIconTo_p_FXDrawable},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXDrawable},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXDrawable},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXDrawable},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXDrawable},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXDrawable},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXDrawable},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXDrawable},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXDrawable},{"_p_FXText", _p_FXTextTo_p_FXDrawable},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXDrawable},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXDrawable},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXDrawable},{"_p_FXIconList", _p_FXIconListTo_p_FXDrawable},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXDrawable},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXDrawable},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXDrawable},{"_p_FXDial", _p_FXDialTo_p_FXDrawable},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXDrawable},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXDrawable},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXDrawable},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXDrawable},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXDrawable},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXDrawable},{"_p_FXListBox", _p_FXListBoxTo_p_FXDrawable},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable},{"_p_FXBMPIcon", _p_FXBMPIconTo_p_FXDrawable},{"_p_FXRbBMPIcon", _p_FXRbBMPIconTo_p_FXDrawable},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXDrawable},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable},{"_p_FXRbICOImage", _p_FXRbICOImageTo_p_FXDrawable},{"_p_FXICOImage", _p_FXICOImageTo_p_FXDrawable},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXDrawable},{"_p_FXXPMImage", _p_FXXPMImageTo_p_FXDrawable},{"_p_FXRbXPMImage", _p_FXRbXPMImageTo_p_FXDrawable},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXDrawable},{"_p_FXTabBook", _p_FXTabBookTo_p_FXDrawable},{"_p_FXRbICOIcon", _p_FXRbICOIconTo_p_FXDrawable},{"_p_FXICOIcon", _p_FXICOIconTo_p_FXDrawable},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXDrawable},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXDrawable},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXDrawable},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXDrawable},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXDrawable},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXDrawable},{"_p_FXLabel", _p_FXLabelTo_p_FXDrawable},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXDrawable},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXDrawable},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXDrawable},{"_p_FXTreeList", _p_FXTreeListTo_p_FXDrawable},{"_p_FXTooltip", _p_FXTooltipTo_p_FXDrawable},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXDrawable},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXDrawable},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXDrawable},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXDrawable},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXDrawable},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXDrawable},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXDrawable},{"_p_FXIcon", _p_FXIconTo_p_FXDrawable},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXDrawable},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXDrawable},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXDrawable},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXDrawable},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXDrawable},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXDrawable},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXDrawable},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXDrawable},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable},{"_p_FXOption", _p_FXOptionTo_p_FXDrawable},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXDrawable},{"_p_FXTable", _p_FXTableTo_p_FXDrawable},{"_p_FXTGAImage", _p_FXTGAImageTo_p_FXDrawable},{"_p_FXRbTGAImage", _p_FXRbTGAImageTo_p_FXDrawable},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXDrawable},{"_p_FXXPMIcon", _p_FXXPMIconTo_p_FXDrawable},{"_p_FXRbXPMIcon", _p_FXRbXPMIconTo_p_FXDrawable},{"_p_FXTabBar", _p_FXTabBarTo_p_FXDrawable},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXDrawable},{"_p_FXDrawable"},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXDrawable},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXDrawable},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXDrawable},{"_p_FXRbTIFImage", _p_FXRbTIFImageTo_p_FXDrawable},{"_p_FXTIFImage", _p_FXTIFImag
eTo_p_FXDrawable},{"_p_FXGIFImage", _p_FXGIFImageTo_p_FXDrawable},{"_p_FXRbGIFImage", _p_FXRbGIFImageTo_p_FXDrawable},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXDrawable},{"_p_FXImageView", _p_FXImageViewTo_p_FXDrawable},{"_p_FXRbList", _p_FXRbListTo_p_FXDrawable},{"_p_FXCanvas", _p_FXCanvasTo_p_FXDrawable},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXDrawable},{"_p_FXRbTable", _p_FXRbTableTo_p_FXDrawable},{"_p_FXShell", _p_FXShellTo_p_FXDrawable},{"_p_FXRbJPGIcon", _p_FXRbJPGIconTo_p_FXDrawable},{"_p_FXJPGIcon", _p_FXJPGIconTo_p_FXDrawable},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXDrawable},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXDrawable},{"_p_FXRbBitmap", _p_FXRbBitmapTo_p_FXDrawable},{"_p_FXBitmap", _p_FXBitmapTo_p_FXDrawable},{"_p_FXRbBMPImage", _p_FXRbBMPImageTo_p_FXDrawable},{"_p_FXBMPImage", _p_FXBMPImageTo_p_FXDrawable},{"_p_FXRbText", _p_FXRbTextTo_p_FXDrawable},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXDrawable},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXDrawable},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXDrawable},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable},{"_p_FXToolbar", _p_FXToolbarTo_p_FXDrawable},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXDrawable},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXDrawable},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable},{0}};
static swig_type_info _swigt__p_FXPCXIcon[] = {{"_p_FXPCXIcon", 0, "FXPCXIcon *"},{"_p_FXPCXIcon"},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXPCXIcon},{0}};
! static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *"},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream},{"_p_FXStream"},{0}};
static swig_type_info _swigt__p_FXRbPCXIcon[] = {{"_p_FXRbPCXIcon", 0, "FXRbPCXIcon *"},{"_p_FXRbPCXIcon"},{0}};
static swig_type_info _swigt__p_FXIcon[] = {{"_p_FXIcon", 0, "FXIcon *"},{"_p_FXRbGIFIcon", _p_FXRbGIFIconTo_p_FXIcon},{"_p_FXGIFIcon", _p_FXGIFIconTo_p_FXIcon},{"_p_FXRbJPGIcon", _p_FXRbJPGIconTo_p_FXIcon},{"_p_FXJPGIcon", _p_FXJPGIconTo_p_FXIcon},{"_p_FXRbBMPIcon", _p_FXRbBMPIconTo_p_FXIcon},{"_p_FXBMPIcon", _p_FXBMPIconTo_p_FXIcon},{"_p_FXRGBIcon", _p_FXRGBIconTo_p_FXIcon},{"_p_FXRbRGBIcon", _p_FXRbRGBIconTo_p_FXIcon},{"_p_FXTIFIcon", _p_FXTIFIconTo_p_FXIcon},{"_p_FXRbTIFIcon", _p_FXRbTIFIconTo_p_FXIcon},{"_p_FXTGAIcon", _p_FXTGAIconTo_p_FXIcon},{"_p_FXRbTGAIcon", _p_FXRbTGAIconTo_p_FXIcon},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXIcon},{"_p_FXPCXIcon", _p_FXPCXIconTo_p_FXIcon},{"_p_FXIcon"},{"_p_FXRbIcon", _p_FXRbIconTo_p_FXIcon},{"_p_FXXPMIcon", _p_FXXPMIconTo_p_FXIcon},{"_p_FXRbXPMIcon", _p_FXRbXPMIconTo_p_FXIcon},{"_p_FXRbPNGIcon", _p_FXRbPNGIconTo_p_FXIcon},{"_p_FXPNGIcon", _p_FXPNGIconTo_p_FXIcon},{"_p_FXRbICOIcon", _p_FXRbICOIconTo_p_FXIcon},{"_p_FXICOIcon", _p_FXICOIconTo_p_FXIcon},{0}};
--- 6954,6958 ----
static swig_type_info _swigt__p_FXDrawable[] = {{"_p_FXDrawable", 0, "FXDrawable *"},{"_p_FXMenuCaption", _p_FXMenuCaptionTo_p_FXDrawable},{"_p_FXRbMenuCaption", _p_FXRbMenuCaptionTo_p_FXDrawable},{"_p_FXRbShell", _p_FXRbShellTo_p_FXDrawable},{"_p_FXRbDirList", _p_FXRbDirListTo_p_FXDrawable},{"_p_FXDirList", _p_FXDirListTo_p_FXDrawable},{"_p_FXRbDial", _p_FXRbDialTo_p_FXDrawable},{"_p_FXMenuTitle", _p_FXMenuTitleTo_p_FXDrawable},{"_p_FXRbMenuTitle", _p_FXRbMenuTitleTo_p_FXDrawable},{"_p_FXMenubar", _p_FXMenubarTo_p_FXDrawable},{"_p_FXRbMenubar", _p_FXRbMenubarTo_p_FXDrawable},{"_p_FXRbToolbarTab", _p_FXRbToolbarTabTo_p_FXDrawable},{"_p_FXToolbarTab", _p_FXToolbarTabTo_p_FXDrawable},{"_p_FXRbScrollbar", _p_FXRbScrollbarTo_p_FXDrawable},{"_p_FXScrollbar", _p_FXScrollbarTo_p_FXDrawable},{"_p_FXTIFIcon", _p_FXTIFIconTo_p_FXDrawable},{"_p_FXRbTIFIcon", _p_FXRbTIFIconTo_p_FXDrawable},{"_p_FXPopup", _p_FXPopupTo_p_FXDrawable},{"_p_FXImage", _p_FXImageTo_p_FXDrawable},{"_p_FXRbMenuCommand", _p_FXRbMenuCommandTo_p_FXDrawable},{"_p_FXMenuCommand", _p_FXMenuCommandTo_p_FXDrawable},{"_p_FXRbComposite", _p_FXRbCompositeTo_p_FXDrawable},{"_p_FXComposite", _p_FXCompositeTo_p_FXDrawable},{"_p_FXRbPNGImage", _p_FXRbPNGImageTo_p_FXDrawable},{"_p_FXPNGImage", _p_FXPNGImageTo_p_FXDrawable},{"_p_FXRbJPGImage", _p_FXRbJPGImageTo_p_FXDrawable},{"_p_FXJPGImage", _p_FXJPGImageTo_p_FXDrawable},{"_p_FXRbPNGIcon", _p_FXRbPNGIconTo_p_FXDrawable},{"_p_FXPNGIcon", _p_FXPNGIconTo_p_FXDrawable},{"_p_FXComboBox", _p_FXComboBoxTo_p_FXDrawable},{"_p_FXRbComboBox", _p_FXRbComboBoxTo_p_FXDrawable},{"_p_FXToolbarGrip", _p_FXToolbarGripTo_p_FXDrawable},{"_p_FXRbToolbarGrip", _p_FXRbToolbarGripTo_p_FXDrawable},{"_p_FXRbHeader", _p_FXRbHeaderTo_p_FXDrawable},{"_p_FXHeader", _p_FXHeaderTo_p_FXDrawable},{"_p_FXRbPopup", _p_FXRbPopupTo_p_FXDrawable},{"_p_FXRGBImage", _p_FXRGBImageTo_p_FXDrawable},{"_p_FXRbImage", _p_FXRbImageTo_p_FXDrawable},{"_p_FXRbRGBImage", _p_FXRbRGBImageTo_p_FXDrawable},{"_p_FXGIFIcon", _p_FXGIFIconTo_p_FXDrawable},{"_p_FXRbGIFIcon", _p_FXRbGIFIconTo_p_FXDrawable},{"_p_FXRbTabItem", _p_FXRbTabItemTo_p_FXDrawable},{"_p_FXTabItem", _p_FXTabItemTo_p_FXDrawable},{"_p_FXRbPCXImage", _p_FXRbPCXImageTo_p_FXDrawable},{"_p_FXPCXImage", _p_FXPCXImageTo_p_FXDrawable},{"_p_FXRbIcon", _p_FXRbIconTo_p_FXDrawable},{"_p_FXList", _p_FXListTo_p_FXDrawable},{"_p_FXColorWell", _p_FXColorWellTo_p_FXDrawable},{"_p_FXRbColorWell", _p_FXRbColorWellTo_p_FXDrawable},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXDrawable},{"_p_FXPCXIcon", _p_FXPCXIconTo_p_FXDrawable},{"_p_FXScrollCorner", _p_FXScrollCornerTo_p_FXDrawable},{"_p_FXRbScrollCorner", _p_FXRbScrollCornerTo_p_FXDrawable},{"_p_FXRbRGBIcon", _p_FXRbRGBIconTo_p_FXDrawable},{"_p_FXRGBIcon", _p_FXRGBIconTo_p_FXDrawable},{"_p_FXOptionMenu", _p_FXOptionMenuTo_p_FXDrawable},{"_p_FXRbOptionMenu", _p_FXRbOptionMenuTo_p_FXDrawable},{"_p_FXFileList", _p_FXFileListTo_p_FXDrawable},{"_p_FXRbFileList", _p_FXRbFileListTo_p_FXDrawable},{"_p_FXRbTGAIcon", _p_FXRbTGAIconTo_p_FXDrawable},{"_p_FXTGAIcon", _p_FXTGAIconTo_p_FXDrawable},{"_p_FXDirSelector", _p_FXDirSelectorTo_p_FXDrawable},{"_p_FXRbDirSelector", _p_FXRbDirSelectorTo_p_FXDrawable},{"_p_FXFileSelector", _p_FXFileSelectorTo_p_FXDrawable},{"_p_FXRbFileSelector", _p_FXRbFileSelectorTo_p_FXDrawable},{"_p_FXColorSelector", _p_FXColorSelectorTo_p_FXDrawable},{"_p_FXRbColorSelector", _p_FXRbColorSelectorTo_p_FXDrawable},{"_p_FXFontSelector", _p_FXFontSelectorTo_p_FXDrawable},{"_p_FXRbFontSelector", _p_FXRbFontSelectorTo_p_FXDrawable},{"_p_FXText", _p_FXTextTo_p_FXDrawable},{"_p_FXDirBox", _p_FXDirBoxTo_p_FXDrawable},{"_p_FXRbDirBox", _p_FXRbDirBoxTo_p_FXDrawable},{"_p_FXRbIconList", _p_FXRbIconListTo_p_FXDrawable},{"_p_FXIconList", _p_FXIconListTo_p_FXDrawable},{"_p_FXRbPicker", _p_FXRbPickerTo_p_FXDrawable},{"_p_FXPicker", _p_FXPickerTo_p_FXDrawable},{"_p_FXRbDragCorner", _p_FXRbDragCornerTo_p_FXDrawable},{"_p_FXDragCorner", _p_FXDragCornerTo_p_FXDrawable},{"_p_FXDial", _p_FXDialTo_p_FXDrawable},{"_p_FXRbToolbarShell", _p_FXRbToolbarShellTo_p_FXDrawable},{"_p_FXToolbarShell", _p_FXToolbarShellTo_p_FXDrawable},{"_p_FXRbButton", _p_FXRbButtonTo_p_FXDrawable},{"_p_FXButton", _p_FXButtonTo_p_FXDrawable},{"_p_FXRbTreeListBox", _p_FXRbTreeListBoxTo_p_FXDrawable},{"_p_FXTreeListBox", _p_FXTreeListBoxTo_p_FXDrawable},{"_p_FXRbListBox", _p_FXRbListBoxTo_p_FXDrawable},{"_p_FXListBox", _p_FXListBoxTo_p_FXDrawable},{"_p_FXFrame", _p_FXFrameTo_p_FXDrawable},{"_p_FXBMPIcon", _p_FXBMPIconTo_p_FXDrawable},{"_p_FXRbBMPIcon", _p_FXRbBMPIconTo_p_FXDrawable},{"_p_FXRbScrollArea", _p_FXRbScrollAreaTo_p_FXDrawable},{"_p_FXScrollArea", _p_FXScrollAreaTo_p_FXDrawable},{"_p_FXRbICOImage", _p_FXRbICOImageTo_p_FXDrawable},{"_p_FXICOImage", _p_FXICOImageTo_p_FXDrawable},{"_p_FXPacker", _p_FXPackerTo_p_FXDrawable},{"_p_FXRbPacker", _p_FXRbPackerTo_p_FXDrawable},{"_p_FXXPMImage", _p_FXXPMImageTo_p_FXDrawable},{"_p_FXRbXPMImage", _p_FXRbXPMImageTo_p_FXDrawable},{"_p_FXRbTabBook", _p_FXRbTabBookTo_p_FXDrawable},{"_p_FXTabBook", _p_FXTabBookTo_p_FXDrawable},{"_p_FXRbICOIcon", _p_FXRbICOIconTo_p_FXDrawable},{"_p_FXICOIcon", _p_FXICOIconTo_p_FXDrawable},{"_p_FXRbFrame", _p_FXRbFrameTo_p_FXDrawable},{"_p_FXMenuButton", _p_FXMenuButtonTo_p_FXDrawable},{"_p_FXRbArrowButton", _p_FXRbArrowButtonTo_p_FXDrawable},{"_p_FXArrowButton", _p_FXArrowButtonTo_p_FXDrawable},{"_p_FXRbRadioButton", _p_FXRbRadioButtonTo_p_FXDrawable},{"_p_FXRadioButton", _p_FXRadioButtonTo_p_FXDrawable},{"_p_FXRbCheckButton", _p_FXRbCheckButtonTo_p_FXDrawable},{"_p_FXCheckButton", _p_FXCheckButtonTo_p_FXDrawable},{"_p_FXRbToggleButton", _p_FXRbToggleButtonTo_p_FXDrawable},{"_p_FXToggleButton", _p_FXToggleButtonTo_p_FXDrawable},{"_p_FXRbMenuButton", _p_FXRbMenuButtonTo_p_FXDrawable},{"_p_FXLabel", _p_FXLabelTo_p_FXDrawable},{"_p_FXSpinner", _p_FXSpinnerTo_p_FXDrawable},{"_p_FXRbSpinner", _p_FXRbSpinnerTo_p_FXDrawable},{"_p_FXRbTreeList", _p_FXRbTreeListTo_p_FXDrawable},{"_p_FXTreeList", _p_FXTreeListTo_p_FXDrawable},{"_p_FXTooltip", _p_FXTooltipTo_p_FXDrawable},{"_p_FXRbTooltip", _p_FXRbTooltipTo_p_FXDrawable},{"_p_FXRbTextField", _p_FXRbTextFieldTo_p_FXDrawable},{"_p_FXTextField", _p_FXTextFieldTo_p_FXDrawable},{"_p_FXRbScrollWindow", _p_FXRbScrollWindowTo_p_FXDrawable},{"_p_FXScrollWindow", _p_FXScrollWindowTo_p_FXDrawable},{"_p_FXWindow", _p_FXWindowTo_p_FXDrawable},{"_p_FXRbWindow", _p_FXRbWindowTo_p_FXDrawable},{"_p_FXRootWindow", _p_FXRootWindowTo_p_FXDrawable},{"_p_FXRbRootWindow", _p_FXRbRootWindowTo_p_FXDrawable},{"_p_FXTopWindow", _p_FXTopWindowTo_p_FXDrawable},{"_p_FXRbTopWindow", _p_FXRbTopWindowTo_p_FXDrawable},{"_p_FXMainWindow", _p_FXMainWindowTo_p_FXDrawable},{"_p_FXRbMainWindow", _p_FXRbMainWindowTo_p_FXDrawable},{"_p_FXIcon", _p_FXIconTo_p_FXDrawable},{"_p_FXMenuPane", _p_FXMenuPaneTo_p_FXDrawable},{"_p_FXRbMenuPane", _p_FXRbMenuPaneTo_p_FXDrawable},{"_p_FXHorizontalSeparator", _p_FXHorizontalSeparatorTo_p_FXDrawable},{"_p_FXRbHorizontalSeparator", _p_FXRbHorizontalSeparatorTo_p_FXDrawable},{"_p_FXVerticalSeparator", _p_FXVerticalSeparatorTo_p_FXDrawable},{"_p_FXRbVerticalSeparator", _p_FXRbVerticalSeparatorTo_p_FXDrawable},{"_p_FXMenuSeparator", _p_FXMenuSeparatorTo_p_FXDrawable},{"_p_FXRbMenuSeparator", _p_FXRbMenuSeparatorTo_p_FXDrawable},{"_p_FXRbLabel", _p_FXRbLabelTo_p_FXDrawable},{"_p_FXRbColorBar", _p_FXRbColorBarTo_p_FXDrawable},{"_p_FXColorBar", _p_FXColorBarTo_p_FXDrawable},{"_p_FXOption", _p_FXOptionTo_p_FXDrawable},{"_p_FXRbOption", _p_FXRbOptionTo_p_FXDrawable},{"_p_FXTable", _p_FXTableTo_p_FXDrawable},{"_p_FXTGAImage", _p_FXTGAImageTo_p_FXDrawable},{"_p_FXRbTGAImage", _p_FXRbTGAImageTo_p_FXDrawable},{"_p_FXSlider", _p_FXSliderTo_p_FXDrawable},{"_p_FXRbSlider", _p_FXRbSliderTo_p_FXDrawable},{"_p_FXXPMIcon", _p_FXXPMIconTo_p_FXDrawable},{"_p_FXRbXPMIcon", _p_FXRbXPMIconTo_p_FXDrawable},{"_p_FXTabBar", _p_FXTabBarTo_p_FXDrawable},{"_p_FXRbTabBar", _p_FXRbTabBarTo_p_FXDrawable},{"_p_FXDrawable"},{"_p_FXStatusline", _p_FXStatuslineTo_p_FXDrawable},{"_p_FXRbStatusline", _p_FXRbStatuslineTo_p_FXDrawable},{"_p_FXRbDrawable", _p_FXRbDrawableTo_p_FXDrawable},{"_p_FXRbTIFImage", _p_FXRbTIFImageTo_p_FXDrawable},{"_p_FXTIFImage", _p_FXTIFImag
eTo_p_FXDrawable},{"_p_FXGIFImage", _p_FXGIFImageTo_p_FXDrawable},{"_p_FXRbGIFImage", _p_FXRbGIFImageTo_p_FXDrawable},{"_p_FXRbImageView", _p_FXRbImageViewTo_p_FXDrawable},{"_p_FXImageView", _p_FXImageViewTo_p_FXDrawable},{"_p_FXRbList", _p_FXRbListTo_p_FXDrawable},{"_p_FXCanvas", _p_FXCanvasTo_p_FXDrawable},{"_p_FXRbCanvas", _p_FXRbCanvasTo_p_FXDrawable},{"_p_FXRbTable", _p_FXRbTableTo_p_FXDrawable},{"_p_FXShell", _p_FXShellTo_p_FXDrawable},{"_p_FXRbJPGIcon", _p_FXRbJPGIconTo_p_FXDrawable},{"_p_FXJPGIcon", _p_FXJPGIconTo_p_FXDrawable},{"_p_FXRbDriveBox", _p_FXRbDriveBoxTo_p_FXDrawable},{"_p_FXDriveBox", _p_FXDriveBoxTo_p_FXDrawable},{"_p_FXRbBitmap", _p_FXRbBitmapTo_p_FXDrawable},{"_p_FXBitmap", _p_FXBitmapTo_p_FXDrawable},{"_p_FXRbBMPImage", _p_FXRbBMPImageTo_p_FXDrawable},{"_p_FXBMPImage", _p_FXBMPImageTo_p_FXDrawable},{"_p_FXRbText", _p_FXRbTextTo_p_FXDrawable},{"_p_FXMenuCascade", _p_FXMenuCascadeTo_p_FXDrawable},{"_p_FXRbMenuCascade", _p_FXRbMenuCascadeTo_p_FXDrawable},{"_p_FXRbColorWheel", _p_FXRbColorWheelTo_p_FXDrawable},{"_p_FXColorWheel", _p_FXColorWheelTo_p_FXDrawable},{"_p_FXToolbar", _p_FXToolbarTo_p_FXDrawable},{"_p_FXRbToolbar", _p_FXRbToolbarTo_p_FXDrawable},{"_p_FXRbProgressBar", _p_FXRbProgressBarTo_p_FXDrawable},{"_p_FXProgressBar", _p_FXProgressBarTo_p_FXDrawable},{0}};
static swig_type_info _swigt__p_FXPCXIcon[] = {{"_p_FXPCXIcon", 0, "FXPCXIcon *"},{"_p_FXPCXIcon"},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXPCXIcon},{0}};
! static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *"},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream},{"_p_FXRbFileStream", _p_FXRbFileStreamTo_p_FXStream},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream},{"_p_FXRbMemoryStream", _p_FXRbMemoryStreamTo_p_FXStream},{"_p_FXStream"},{"_p_FXRbStream", _p_FXRbStreamTo_p_FXStream},{0}};
static swig_type_info _swigt__p_FXRbPCXIcon[] = {{"_p_FXRbPCXIcon", 0, "FXRbPCXIcon *"},{"_p_FXRbPCXIcon"},{0}};
static swig_type_info _swigt__p_FXIcon[] = {{"_p_FXIcon", 0, "FXIcon *"},{"_p_FXRbGIFIcon", _p_FXRbGIFIconTo_p_FXIcon},{"_p_FXGIFIcon", _p_FXGIFIconTo_p_FXIcon},{"_p_FXRbJPGIcon", _p_FXRbJPGIconTo_p_FXIcon},{"_p_FXJPGIcon", _p_FXJPGIconTo_p_FXIcon},{"_p_FXRbBMPIcon", _p_FXRbBMPIconTo_p_FXIcon},{"_p_FXBMPIcon", _p_FXBMPIconTo_p_FXIcon},{"_p_FXRGBIcon", _p_FXRGBIconTo_p_FXIcon},{"_p_FXRbRGBIcon", _p_FXRbRGBIconTo_p_FXIcon},{"_p_FXTIFIcon", _p_FXTIFIconTo_p_FXIcon},{"_p_FXRbTIFIcon", _p_FXRbTIFIconTo_p_FXIcon},{"_p_FXTGAIcon", _p_FXTGAIconTo_p_FXIcon},{"_p_FXRbTGAIcon", _p_FXRbTGAIconTo_p_FXIcon},{"_p_FXRbPCXIcon", _p_FXRbPCXIconTo_p_FXIcon},{"_p_FXPCXIcon", _p_FXPCXIconTo_p_FXIcon},{"_p_FXIcon"},{"_p_FXRbIcon", _p_FXRbIconTo_p_FXIcon},{"_p_FXXPMIcon", _p_FXXPMIconTo_p_FXIcon},{"_p_FXRbXPMIcon", _p_FXRbXPMIconTo_p_FXIcon},{"_p_FXRbPNGIcon", _p_FXRbPNGIconTo_p_FXIcon},{"_p_FXPNGIcon", _p_FXPNGIconTo_p_FXIcon},{"_p_FXRbICOIcon", _p_FXRbICOIconTo_p_FXIcon},{"_p_FXICOIcon", _p_FXICOIconTo_p_FXIcon},{0}};
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -C2 -d -r1.39.2.2 -r1.39.2.3
*** image_wrap.cpp 24 Apr 2002 15:48:36 -0000 1.39.2.2
--- image_wrap.cpp 25 Apr 2002 16:48:31 -0000 1.39.2.3
***************
*** 7065,7071 ****
--- 7065,7080 ----
return (void *)((FXStream *) ((FXFileStream *) x));
}
+ static void *_p_FXRbFileStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbFileStream *) x));
+ }
static void *_p_FXMemoryStreamTo_p_FXStream(void *x) {
return (void *)((FXStream *) ((FXMemoryStream *) x));
}
+ static void *_p_FXRbMemoryStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbMemoryStream *) x));
+ }
+ static void *_p_FXRbStreamTo_p_FXStream(void *x) {
+ return (void *)((FXStream *) ((FXRbStream *) x));
+ }
static void *_p_FXRbICOImageTo_p_FXICOImage(void *x) {
return (void *)((FXICOImage *) ((FXRbICOImage *) x));
***************
*** 7165,7169 ****
static swig_type_info _swigt__p_FXTIFImage[] = {{"_p_FXTIFImage", 0, "FXTIFImage *"},{"_p_FXTIFImage"},{"_p_FXRbTIFImage", _p_FXRbTIFImageTo_p_FXTIFImage},{0}};
static swig_type_info _swigt__p_FXGIFImage[] = {{"_p_FXGIFImage", 0, "FXGIFImage *"},{"_p_FXGIFImage"},{"_p_FXRbGIFImage", _p_FXRbGIFImageTo_p_FXGIFImage},{0}};
! static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *"},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream},{"_p_FXStream"},{0}};
static swig_type_info _swigt__p_FXRbGIFImage[] = {{"_p_FXRbGIFImage", 0, "FXRbGIFImage *"},{"_p_FXRbGIFImage"},{0}};
static swig_type_info _swigt__p_FXRbTIFImage[] = {{"_p_FXRbTIFImage", 0, "FXRbTIFImage *"},{"_p_FXRbTIFImage"},{0}};
--- 7174,7178 ----
static swig_type_info _swigt__p_FXTIFImage[] = {{"_p_FXTIFImage", 0, "FXTIFImage *"},{"_p_FXTIFImage"},{"_p_FXRbTIFImage", _p_FXRbTIFImageTo_p_FXTIFImage},{0}};
static swig_type_info _swigt__p_FXGIFImage[] = {{"_p_FXGIFImage", 0, "FXGIFImage *"},{"_p_FXGIFImage"},{"_p_FXRbGIFImage", _p_FXRbGIFImageTo_p_FXGIFImage},{0}};
! static swig_type_info _swigt__p_FXStream[] = {{"_p_FXStream", 0, "FXStream *"},{"_p_FXFileStream", _p_FXFileStreamTo_p_FXStream},{"_p_FXRbFileStream", _p_FXRbFileStreamTo_p_FXStream},{"_p_FXMemoryStream", _p_FXMemoryStreamTo_p_FXStream},{"_p_FXRbMemoryStream", _p_FXRbMemoryStreamTo_p_FXStream},{"_p_FXStream"},{"_p_FXRbStream", _p_FXRbStreamTo_p_FXStream},{0}};
static swig_type_info _swigt__p_FXRbGIFImage[] = {{"_p_FXRbGIFImage", 0, "FXRbGIFImage *"},{"_p_FXRbGIFImage"},{0}};
static swig_type_info _swigt__p_FXRbTIFImage[] = {{"_p_FXRbTIFImage", 0, "FXRbTIFImage *"},{"_p_FXRbTIFImage"},{0}};
Index: impl.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/impl.cpp,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** impl.cpp 2 Mar 2002 01:39:49 -0000 1.12
--- impl.cpp 25 Apr 2002 16:48:31 -0000 1.12.2.1
***************
*** 19,28 ****
IMPLEMENT_FXWINDOW_STUBS(FXRbArrowButton, FXArrowButton)
- /* Start stub implementations for class FXRbBitmap */
- IMPLEMENT_FXOBJECT_STUBS(FXRbBitmap, FXBitmap)
- IMPLEMENT_FXID_STUBS(FXRbBitmap, FXBitmap)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbBitmap, FXBitmap)
- IMPLEMENT_FXBITMAP_STUBS(FXRbBitmap, FXBitmap)
-
/* Start stub implementations for class FXRbBMPIcon */
IMPLEMENT_FXOBJECT_STUBS(FXRbBMPIcon, FXBMPIcon)
--- 19,22 ----
***************
*** 37,40 ****
--- 31,40 ----
IMPLEMENT_FXIMAGE_STUBS(FXRbBMPImage, FXBMPImage)
+ /* Start stub implementations for class FXRbBitmap */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbBitmap, FXBitmap)
+ IMPLEMENT_FXID_STUBS(FXRbBitmap, FXBitmap)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbBitmap, FXBitmap)
+ IMPLEMENT_FXBITMAP_STUBS(FXRbBitmap, FXBitmap)
+
/* Start stub implementations for class FXRbButton */
IMPLEMENT_FXOBJECT_STUBS(FXRbButton, FXButton)
***************
*** 43,46 ****
--- 43,51 ----
IMPLEMENT_FXWINDOW_STUBS(FXRbButton, FXButton)
+ /* Start stub implementations for class FXRbCURCursor */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbCURCursor, FXCURCursor)
+ IMPLEMENT_FXID_STUBS(FXRbCURCursor, FXCURCursor)
+ IMPLEMENT_FXCURSOR_STUBS(FXRbCURCursor, FXCURCursor)
+
/* Start stub implementations for class FXRbCanvas */
IMPLEMENT_FXOBJECT_STUBS(FXRbCanvas, FXCanvas)
***************
*** 99,107 ****
IMPLEMENT_FXWINDOW_STUBS(FXRbComposite, FXComposite)
- /* Start stub implementations for class FXRbCURCursor */
- IMPLEMENT_FXOBJECT_STUBS(FXRbCURCursor, FXCURCursor)
- IMPLEMENT_FXID_STUBS(FXRbCURCursor, FXCURCursor)
- IMPLEMENT_FXCURSOR_STUBS(FXRbCURCursor, FXCURCursor)
-
/* Start stub implementations for class FXRbCursor */
IMPLEMENT_FXOBJECT_STUBS(FXRbCursor, FXCursor)
--- 104,107 ----
***************
*** 109,115 ****
IMPLEMENT_FXCURSOR_STUBS(FXRbCursor, FXCursor)
- /* Start stub implementations for class FXRbDataTarget */
- IMPLEMENT_FXOBJECT_STUBS(FXRbDataTarget, FXDataTarget)
-
/* Start stub implementations for class FXRbDC */
IMPLEMENT_FXDC_STUBS(FXRbDC, FXDC)
--- 109,112 ----
***************
*** 121,124 ****
--- 118,124 ----
IMPLEMENT_FXDC_STUBS(FXRbDCWindow, FXDCWindow)
+ /* Start stub implementations for class FXRbDataTarget */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbDataTarget, FXDataTarget)
+
/* Start stub implementations for class FXRbDebugTarget */
IMPLEMENT_FXOBJECT_STUBS(FXRbDebugTarget, FXDebugTarget)
***************
*** 416,432 ****
IMPLEMENT_FXWINDOW_STUBS(FXRbListBox, FXListBox)
- /* Start stub implementations for class FXRbMainWindow */
- IMPLEMENT_FXOBJECT_STUBS(FXRbMainWindow, FXMainWindow)
- IMPLEMENT_FXID_STUBS(FXRbMainWindow, FXMainWindow)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbMainWindow, FXMainWindow)
- IMPLEMENT_FXWINDOW_STUBS(FXRbMainWindow, FXMainWindow)
- IMPLEMENT_FXTOPWINDOW_STUBS(FXRbMainWindow, FXMainWindow)
-
- /* Start stub implementations for class FXRbMatrix */
- IMPLEMENT_FXOBJECT_STUBS(FXRbMatrix, FXMatrix)
- IMPLEMENT_FXID_STUBS(FXRbMatrix, FXMatrix)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbMatrix, FXMatrix)
- IMPLEMENT_FXWINDOW_STUBS(FXRbMatrix, FXMatrix)
-
/* Start stub implementations for class FXRbMDIDeleteButton */
IMPLEMENT_FXOBJECT_STUBS(FXRbMDIDeleteButton, FXMDIDeleteButton)
--- 416,419 ----
***************
*** 480,489 ****
IMPLEMENT_FXSCROLLAREA_STUBS(FXRbMDIClient, FXMDIClient)
! /* Start stub implementations for class FXRbMenubar */
! IMPLEMENT_FXOBJECT_STUBS(FXRbMenubar, FXMenubar)
! IMPLEMENT_FXID_STUBS(FXRbMenubar, FXMenubar)
! IMPLEMENT_FXDRAWABLE_STUBS(FXRbMenubar, FXMenubar)
! IMPLEMENT_FXWINDOW_STUBS(FXRbMenubar, FXMenubar)
! IMPLEMENT_FXTOOLBAR_STUBS(FXRbMenubar, FXMenubar)
/* Start stub implementations for class FXRbMenuButton */
--- 467,482 ----
IMPLEMENT_FXSCROLLAREA_STUBS(FXRbMDIClient, FXMDIClient)
! /* Start stub implementations for class FXRbMainWindow */
! IMPLEMENT_FXOBJECT_STUBS(FXRbMainWindow, FXMainWindow)
! IMPLEMENT_FXID_STUBS(FXRbMainWindow, FXMainWindow)
! IMPLEMENT_FXDRAWABLE_STUBS(FXRbMainWindow, FXMainWindow)
! IMPLEMENT_FXWINDOW_STUBS(FXRbMainWindow, FXMainWindow)
! IMPLEMENT_FXTOPWINDOW_STUBS(FXRbMainWindow, FXMainWindow)
!
! /* Start stub implementations for class FXRbMatrix */
! IMPLEMENT_FXOBJECT_STUBS(FXRbMatrix, FXMatrix)
! IMPLEMENT_FXID_STUBS(FXRbMatrix, FXMatrix)
! IMPLEMENT_FXDRAWABLE_STUBS(FXRbMatrix, FXMatrix)
! IMPLEMENT_FXWINDOW_STUBS(FXRbMatrix, FXMatrix)
/* Start stub implementations for class FXRbMenuButton */
***************
*** 530,533 ****
--- 523,533 ----
IMPLEMENT_FXWINDOW_STUBS(FXRbMenuTitle, FXMenuTitle)
+ /* Start stub implementations for class FXRbMenubar */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbMenubar, FXMenubar)
+ IMPLEMENT_FXID_STUBS(FXRbMenubar, FXMenubar)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbMenubar, FXMenubar)
+ IMPLEMENT_FXWINDOW_STUBS(FXRbMenubar, FXMenubar)
+ IMPLEMENT_FXTOOLBAR_STUBS(FXRbMenubar, FXMenubar)
+
/* Start stub implementations for class FXRbMessageBox */
IMPLEMENT_FXOBJECT_STUBS(FXRbMessageBox, FXMessageBox)
***************
*** 553,562 ****
IMPLEMENT_FXWINDOW_STUBS(FXRbOptionMenu, FXOptionMenu)
- /* Start stub implementations for class FXRbPacker */
- IMPLEMENT_FXOBJECT_STUBS(FXRbPacker, FXPacker)
- IMPLEMENT_FXID_STUBS(FXRbPacker, FXPacker)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbPacker, FXPacker)
- IMPLEMENT_FXWINDOW_STUBS(FXRbPacker, FXPacker)
-
/* Start stub implementations for class FXRbPCXIcon */
IMPLEMENT_FXOBJECT_STUBS(FXRbPCXIcon, FXPCXIcon)
--- 553,556 ----
***************
*** 571,580 ****
IMPLEMENT_FXIMAGE_STUBS(FXRbPCXImage, FXPCXImage)
- /* Start stub implementations for class FXRbPicker */
- IMPLEMENT_FXOBJECT_STUBS(FXRbPicker, FXPicker)
- IMPLEMENT_FXID_STUBS(FXRbPicker, FXPicker)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbPicker, FXPicker)
- IMPLEMENT_FXWINDOW_STUBS(FXRbPicker, FXPicker)
-
/* Start stub implementations for class FXRbPNGIcon */
IMPLEMENT_FXOBJECT_STUBS(FXRbPNGIcon, FXPNGIcon)
--- 565,568 ----
***************
*** 589,592 ****
--- 577,592 ----
IMPLEMENT_FXIMAGE_STUBS(FXRbPNGImage, FXPNGImage)
+ /* Start stub implementations for class FXRbPacker */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbPacker, FXPacker)
+ IMPLEMENT_FXID_STUBS(FXRbPacker, FXPacker)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbPacker, FXPacker)
+ IMPLEMENT_FXWINDOW_STUBS(FXRbPacker, FXPacker)
+
+ /* Start stub implementations for class FXRbPicker */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbPicker, FXPicker)
+ IMPLEMENT_FXID_STUBS(FXRbPicker, FXPicker)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbPicker, FXPicker)
+ IMPLEMENT_FXWINDOW_STUBS(FXRbPicker, FXPicker)
+
/* Start stub implementations for class FXRbPopup */
IMPLEMENT_FXOBJECT_STUBS(FXRbPopup, FXPopup)
***************
*** 618,621 ****
--- 618,633 ----
IMPLEMENT_FXDIALOGBOX_STUBS(FXRbProgressDialog, FXProgressDialog)
+ /* Start stub implementations for class FXRbRGBIcon */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbRGBIcon, FXRGBIcon)
+ IMPLEMENT_FXID_STUBS(FXRbRGBIcon, FXRGBIcon)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbRGBIcon, FXRGBIcon)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbRGBIcon, FXRGBIcon)
+
+ /* Start stub implementations for class FXRbRGBImage */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbRGBImage, FXRGBImage)
+ IMPLEMENT_FXID_STUBS(FXRbRGBImage, FXRGBImage)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbRGBImage, FXRGBImage)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbRGBImage, FXRGBImage)
+
/* Start stub implementations for class FXRbRadioButton */
IMPLEMENT_FXOBJECT_STUBS(FXRbRadioButton, FXRadioButton)
***************
*** 635,650 ****
IMPLEMENT_FXDIALOGBOX_STUBS(FXRbReplaceDialog, FXReplaceDialog)
- /* Start stub implementations for class FXRbRGBIcon */
- IMPLEMENT_FXOBJECT_STUBS(FXRbRGBIcon, FXRGBIcon)
- IMPLEMENT_FXID_STUBS(FXRbRGBIcon, FXRGBIcon)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbRGBIcon, FXRGBIcon)
- IMPLEMENT_FXIMAGE_STUBS(FXRbRGBIcon, FXRGBIcon)
-
- /* Start stub implementations for class FXRbRGBImage */
- IMPLEMENT_FXOBJECT_STUBS(FXRbRGBImage, FXRGBImage)
- IMPLEMENT_FXID_STUBS(FXRbRGBImage, FXRGBImage)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbRGBImage, FXRGBImage)
- IMPLEMENT_FXIMAGE_STUBS(FXRbRGBImage, FXRGBImage)
-
/* Start stub implementations for class FXRbRootWindow */
IMPLEMENT_FXOBJECT_STUBS(FXRbRootWindow, FXRootWindow)
--- 647,650 ----
***************
*** 662,666 ****
IMPLEMENT_FXSCROLLAREA_STUBS(FXRbScintilla, FXScintilla)
! #endif
/* Start stub implementations for class FXRbScrollArea */
--- 662,666 ----
IMPLEMENT_FXSCROLLAREA_STUBS(FXRbScintilla, FXScintilla)
! #endif /* WITH_FXSCINTILLA */
/* Start stub implementations for class FXRbScrollArea */
***************
*** 671,674 ****
--- 671,681 ----
IMPLEMENT_FXSCROLLAREA_STUBS(FXRbScrollArea, FXScrollArea)
+ /* Start stub implementations for class FXRbScrollWindow */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbScrollWindow, FXScrollWindow)
+ IMPLEMENT_FXID_STUBS(FXRbScrollWindow, FXScrollWindow)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbScrollWindow, FXScrollWindow)
+ IMPLEMENT_FXWINDOW_STUBS(FXRbScrollWindow, FXScrollWindow)
+ IMPLEMENT_FXSCROLLAREA_STUBS(FXRbScrollWindow, FXScrollWindow)
+
/* Start stub implementations for class FXRbScrollbar */
IMPLEMENT_FXOBJECT_STUBS(FXRbScrollbar, FXScrollbar)
***************
*** 683,693 ****
IMPLEMENT_FXWINDOW_STUBS(FXRbScrollCorner, FXScrollCorner)
- /* Start stub implementations for class FXRbScrollWindow */
- IMPLEMENT_FXOBJECT_STUBS(FXRbScrollWindow, FXScrollWindow)
- IMPLEMENT_FXID_STUBS(FXRbScrollWindow, FXScrollWindow)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbScrollWindow, FXScrollWindow)
- IMPLEMENT_FXWINDOW_STUBS(FXRbScrollWindow, FXScrollWindow)
- IMPLEMENT_FXSCROLLAREA_STUBS(FXRbScrollWindow, FXScrollWindow)
-
/* Start stub implementations for class FXRbSearchDialog */
IMPLEMENT_FXOBJECT_STUBS(FXRbSearchDialog, FXSearchDialog)
--- 690,693 ----
***************
*** 778,781 ****
--- 778,805 ----
IMPLEMENT_FXWINDOW_STUBS(FXRbSwitcher, FXSwitcher)
+ /* Start stub implementations for class FXRbTGAIcon */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbTGAIcon, FXTGAIcon)
+ IMPLEMENT_FXID_STUBS(FXRbTGAIcon, FXTGAIcon)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbTGAIcon, FXTGAIcon)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbTGAIcon, FXTGAIcon)
+
+ /* Start stub implementations for class FXRbTGAImage */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbTGAImage, FXTGAImage)
+ IMPLEMENT_FXID_STUBS(FXRbTGAImage, FXTGAImage)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbTGAImage, FXTGAImage)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbTGAImage, FXTGAImage)
+
+ /* Start stub implementations for class FXRbTIFIcon */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbTIFIcon, FXTIFIcon)
+ IMPLEMENT_FXID_STUBS(FXRbTIFIcon, FXTIFIcon)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbTIFIcon, FXTIFIcon)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbTIFIcon, FXTIFIcon)
+
+ /* Start stub implementations for class FXRbTIFImage */
+ IMPLEMENT_FXOBJECT_STUBS(FXRbTIFImage, FXTIFImage)
+ IMPLEMENT_FXID_STUBS(FXRbTIFImage, FXTIFImage)
+ IMPLEMENT_FXDRAWABLE_STUBS(FXRbTIFImage, FXTIFImage)
+ IMPLEMENT_FXIMAGE_STUBS(FXRbTIFImage, FXTIFImage)
+
/* Start stub implementations for class FXRbTabBar */
IMPLEMENT_FXOBJECT_STUBS(FXRbTabBar, FXTabBar)
***************
*** 823,850 ****
IMPLEMENT_FXDRAWABLE_STUBS(FXRbTextField, FXTextField)
IMPLEMENT_FXWINDOW_STUBS(FXRbTextField, FXTextField)
-
- /* Start stub implementations for class FXRbTGAIcon */
- IMPLEMENT_FXOBJECT_STUBS(FXRbTGAIcon, FXTGAIcon)
- IMPLEMENT_FXID_STUBS(FXRbTGAIcon, FXTGAIcon)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbTGAIcon, FXTGAIcon)
- IMPLEMENT_FXIMAGE_STUBS(FXRbTGAIcon, FXTGAIcon)
-
- /* Start stub implementations for class FXRbTGAImage */
- IMPLEMENT_FXOBJECT_STUBS(FXRbTGAImage, FXTGAImage)
- IMPLEMENT_FXID_STUBS(FXRbTGAImage, FXTGAImage)
- IMPLEMENT_FXDRAWABLE_STUBS(FXRbTGAImage, FXTGAImage)
- IMPLEMENT_FXIMAGE_STUBS(FXRbTGAImage, FXTGAImage)
-
- /* Start stub implementations for class FXRbTIFIcon */
- IMPLEMENT_FXOBJECT_STUBS(FXRbTIFIcon, FXTIFIcon)
- IMPLEMENT_FXID_STUBS(FXRbTIFIcon, FXTIFIcon)
- IMPLEMENT_FXDRAWABLE_...
[truncated message content] |
|
From: Lyle J. <ly...@us...> - 2002-04-25 16:48:37
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv32716/swig-interfaces
Modified Files:
Tag: release10
FXStream.i freefuncs.i markfuncs.i renames.i stubs.i
Log Message:
Fixes related to SF Bug #535955. FXStream, FXFileStream and FXMemoryStream
were not implemented properly w.r.t. virtual functions and GC.
Index: FXStream.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXStream.i,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** FXStream.i 19 Mar 2002 23:18:40 -0000 1.10
--- FXStream.i 25 Apr 2002 16:48:34 -0000 1.10.2.1
***************
*** 47,50 ****
--- 47,55 ----
%exception FXStream::FXStream "$action FXRbRegisterRubyObj(self, result);";
+ %rename(getPosition) FXStream::position() const;
+ %rename(setPosition) FXStream::position(unsigned long p);
+ %rename(setSwapBytes) FXStream::swapBytes(FXbool s);
+ %rename(getSwapBytes) FXStream::swapBytes() const;
+
/// Persistent store definition
class FXStream {
***************
*** 86,99 ****
/// Get position
! %name(getPosition) unsigned long position() const;
/// Move to position
! %name(setPosition) virtual FXbool position(unsigned long p);
/// Change swap bytes flag
! %name(setSwapBytes) void swapBytes(FXbool s);
/// Get swap bytes flag
! %name(getSwapBytes) FXbool swapBytes() const;
/// Return implementation's endianness
--- 91,104 ----
/// Get position
! unsigned long position() const;
/// Move to position
! virtual FXbool position(unsigned long p);
/// Change swap bytes flag
! void swapBytes(FXbool s);
/// Get swap bytes flag
! FXbool swapBytes() const;
/// Return implementation's endianness
***************
*** 105,108 ****
--- 110,127 ----
+ %exception FXRbStream::FXRbStream "$action FXRbRegisterRubyObj(self, result);";
+
+ class FXRbStream : public FXStream {
+ public:
+ // Constructor
+ FXRbStream(const FXObject* cont=NULL);
+
+ // Destructor
+ virtual ~FXRbStream();
+
+ public:
+ DECLARE_FXSTREAM_VIRTUALS
+ };
+
/*************************** File Store Definition ***************************/
***************
*** 124,134 ****
FXbool open(const FXString& filename,FXStreamDirection save_or_load);
- /// Move to position
- %name(setPosition) virtual FXbool position(unsigned long p);
-
/// Destructor
virtual ~FXFileStream();
};
/************************** Memory Store Definition **************************/
--- 143,165 ----
FXbool open(const FXString& filename,FXStreamDirection save_or_load);
/// Destructor
virtual ~FXFileStream();
};
+
+ %exception FXRbFileStream::FXRbFileStream "$action FXRbRegisterRubyObj(self, result);";
+
+ class FXRbFileStream : public FXFileStream {
+ public:
+ // Create file store
+ FXRbFileStream(const FXObject* cont=NULL);
+
+ // Destructor
+ virtual ~FXRbFileStream();
+
+ public:
+ DECLARE_FXSTREAM_VIRTUALS
+ };
+
/************************** Memory Store Definition **************************/
***************
*** 156,160 ****
/// Get available space
! FXuint getSpace() const { return space; }
/// Set available space
--- 187,191 ----
/// Get available space
! FXuint getSpace() const;
/// Set available space
***************
*** 178,185 ****
void giveBuffer(FXuchar *buffer,FXuint sp);
- /// Move to position
- %name(setPosition) virtual FXbool position(unsigned long p);
-
/// Destructor
virtual ~FXMemoryStream();
};
--- 209,228 ----
void giveBuffer(FXuchar *buffer,FXuint sp);
/// Destructor
virtual ~FXMemoryStream();
+ };
+
+
+ %exception FXRbMemoryStream::FXRbMemoryStream "$action FXRbRegisterRubyObj(self, result);";
+
+ class FXRbMemoryStream : public FXMemoryStream {
+ public:
+ // Create memory store
+ FXRbMemoryStream(const FXObject* cont=NULL);
+
+ // Destructor
+ virtual ~FXRbMemoryStream();
+
+ public:
+ DECLARE_FXSTREAM_VIRTUALS
};
Index: freefuncs.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/freefuncs.i,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** freefuncs.i 2 Apr 2002 04:10:16 -0000 1.2
--- freefuncs.i 25 Apr 2002 16:48:34 -0000 1.2.2.1
***************
*** 32,35 ****
--- 32,36 ----
%freefunc FXFileAssoc "FXRbUnregisterRubyObj";
%freefunc FXFileDict "FXRbUnregisterRubyObj";
+ %freefunc FXFileStream "FXRbUnregisterRubyObj";
%freefunc FXFont "FXRbUnregisterRubyObj";
%freefunc FXFontDesc "FXRbUnregisterRubyObj";
***************
*** 47,50 ****
--- 48,52 ----
%freefunc FXListItem "FXRbUnregisterRubyObj";
%freefunc FXMaterial "FXRbUnregisterRubyObj";
+ %freefunc FXMemoryStream "FXRbUnregisterRubyObj";
%freefunc FXMDIChild "FXRbUnregisterRubyObj";
%freefunc FXObject "FXRbUnregisterRubyObj";
Index: markfuncs.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/markfuncs.i,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** markfuncs.i 26 Mar 2002 22:44:03 -0000 1.4
--- markfuncs.i 25 Apr 2002 16:48:34 -0000 1.4.2.1
***************
*** 63,66 ****
--- 63,67 ----
%markfunc FXFileList "FXRbFileList::markfunc";
%markfunc FXFileSelector "FXRbFileSelector::markfunc";
+ %markfunc FXFileStream "FXRbFileStream::markfunc";
%markfunc FXFont "FXRbFont::markfunc";
%markfunc FXFontDialog "FXRbFontDialog::markfunc";
***************
*** 108,111 ****
--- 109,113 ----
%markfunc FXMainWindow "FXRbMainWindow::markfunc";
%markfunc FXMatrix "FXRbMatrix::markfunc";
+ %markfunc FXMemoryStream "FXRbMemoryStream::markfunc";
%markfunc FXMenuButton "FXRbMenuButton::markfunc";
%markfunc FXMenuCaption "FXRbMenuCaption::markfunc";
***************
*** 149,152 ****
--- 151,155 ----
%markfunc FXStatusbar "FXRbStatusbar::markfunc";
%markfunc FXStatusline "FXRbStatusline::markfunc";
+ %markfunc FXStream "FXRbStream::markfunc";
%markfunc FXStringDict "FXRbStringDict::markfunc";
%markfunc FXSwitcher "FXRbSwitcher::markfunc";
***************
*** 219,222 ****
--- 222,226 ----
%markfunc FXRbFileList "FXRbFileList::markfunc";
%markfunc FXRbFileSelector "FXRbFileSelector::markfunc";
+ %markfunc FXRbFileStream "FXRbFileStream::markfunc";
%markfunc FXRbFont "FXRbFont::markfunc";
%markfunc FXRbFontDialog "FXRbFontDialog::markfunc";
***************
*** 264,267 ****
--- 268,272 ----
%markfunc FXRbMainWindow "FXRbMainWindow::markfunc";
%markfunc FXRbMatrix "FXRbMatrix::markfunc";
+ %markfunc FXRbMemoryStream "FXRbMemoryStream::markfunc";
%markfunc FXRbMenuButton "FXRbMenuButton::markfunc";
%markfunc FXRbMenuCaption "FXRbMenuCaption::markfunc";
***************
*** 305,308 ****
--- 310,314 ----
%markfunc FXRbStatusbar "FXRbStatusbar::markfunc";
%markfunc FXRbStatusline "FXRbStatusline::markfunc";
+ %markfunc FXRbStream "FXRbStream::markfunc";
%markfunc FXRbStringDict "FXRbStringDict::markfunc";
%markfunc FXRbSwitcher "FXRbSwitcher::markfunc";
Index: renames.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/renames.i,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** renames.i 25 Feb 2002 22:49:49 -0000 1.14
--- renames.i 25 Apr 2002 16:48:34 -0000 1.14.2.1
***************
*** 63,66 ****
--- 63,67 ----
%rename FXFileList FX_FileList;
%rename FXFileSelector FX_FileSelector;
+ %rename FXFileStream FX_FileStream;
%rename FXFont FX_Font;
%rename FXFontDialog FX_FontDialog;
***************
*** 108,111 ****
--- 109,113 ----
%rename FXMainWindow FX_MainWindow;
%rename FXMatrix FX_Matrix;
+ %rename FXMemoryStream FX_MemoryStream;
%rename FXMenuButton FX_MenuButton;
%rename FXMenuCaption FX_MenuCaption;
***************
*** 149,152 ****
--- 151,155 ----
%rename FXStatusbar FX_Statusbar;
%rename FXStatusline FX_Statusline;
+ %rename FXStream FX_Stream;
%rename FXStringDict FX_StringDict;
%rename FXSwitcher FX_Switcher;
***************
*** 219,222 ****
--- 222,226 ----
%rename FXRbFileList FXFileList;
%rename FXRbFileSelector FXFileSelector;
+ %rename FXRbFileStream FXFileStream;
%rename FXRbFont FXFont;
%rename FXRbFontDialog FXFontDialog;
***************
*** 264,267 ****
--- 268,272 ----
%rename FXRbMainWindow FXMainWindow;
%rename FXRbMatrix FXMatrix;
+ %rename FXRbMemoryStream FXMemoryStream;
%rename FXRbMenuButton FXMenuButton;
%rename FXRbMenuCaption FXMenuCaption;
***************
*** 305,308 ****
--- 310,314 ----
%rename FXRbStatusbar FXStatusbar;
%rename FXRbStatusline FXStatusline;
+ %rename FXRbStream FXStream;
%rename FXRbStringDict FXStringDict;
%rename FXRbSwitcher FXSwitcher;
Index: stubs.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/stubs.i,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** stubs.i 3 Apr 2002 17:36:27 -0000 1.23
--- stubs.i 25 Apr 2002 16:48:34 -0000 1.23.2.1
***************
*** 209,212 ****
--- 209,215 ----
%name(setCurrent) void _setCurrent(FXint panel);
+ #define DECLARE_FXSTREAM_VIRTUALS \
+ %name(setPosition) FXbool _position(unsigned long p);
+
#define DECLARE_FXTABBAR_VIRTUALS \
%name(setCurrent) void _setCurrent(FXint panel,FXbool notify=FALSE);
|
|
From: Lyle J. <ly...@us...> - 2002-04-25 16:48:37
|
Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv32716/ext/fox/include
Modified Files:
Tag: release10
FXRbStream.h
Log Message:
Fixes related to SF Bug #535955. FXStream, FXFileStream and FXMemoryStream
were not implemented properly w.r.t. virtual functions and GC.
Index: FXRbStream.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbStream.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** FXRbStream.h 12 Jul 2001 19:44:18 -0000 1.1
--- FXRbStream.h 25 Apr 2002 16:48:34 -0000 1.1.2.1
***************
*** 33,37 ****
} \
FXbool cls::position(unsigned long p){ \
! return FXRbCallBoolMethod(this,"position",p); \
}
--- 33,37 ----
} \
FXbool cls::position(unsigned long p){ \
! return FXRbCallBoolMethod(this,"setPosition",p); \
}
|
|
From: Lyle J. <ly...@us...> - 2002-04-25 15:34:44
|
Update of /cvsroot/fxruby/FXRuby/tests
In directory usw-pr-cvs1:/tmp/cvs-serv4427
Added Files:
Tag: release10
stress1.rb
Log Message:
Added Gilles' case as a permanent "stress test" for FXRuby.
--- NEW FILE: stress1.rb ---
#
# An FXRuby stress test developed by Gilles Filippini
#
require "fox"
include Fox
# Test case tuning
NUMBER_OF_ITEMS = 1000
RESTART_FRAQUENCY = 20
# =======================================================================
# Tree
# =======================================================================
class DirTree < FXTreeList
def initialize(parent, nvis, tgt = nil, sel = 0, opts = 0, x = 0, y = 0, w = 0, h = 0)
super
end
def create
super
item = addItemLast(nil, "root")
@currentItem = item
expand
end
def expand
expandTree(@currentItem, true)
listSubDir(@currentItem)
end
# Updating entries of dir
def listSubDir(parentItem)
entries = (1..NUMBER_OF_ITEMS).collect { |i| i.to_s }
entries.each do |entry|
item = addItemLast(parentItem, entry)
@currentItem = item if entry == "1"
end
end
end
# =======================================================================
# Application
# =======================================================================
class Application < FXApp
include Responder
ID_TIMER, ID_LAST = enum(FXApp::ID_LAST, 2)
def initialize
super("FXTreeList Bug (the come back)", "Pini")
FXMAPFUNC(SEL_TIMEOUT, ID_TIMER, "onCount")
disableThreads
init(ARGV)
win = FXMainWindow.new(self, appName, nil, nil, DECOR_ALL, 0, 0, 400, 600)
@dirTree = DirTree.new(win, 0, nil, 0,
(TREELIST_SHOWS_LINES|TREELIST_SHOWS_BOXES|TREELIST_ROOT_BOXES|
LAYOUT_FILL_X|LAYOUT_FILL_Y))
@count = 0
end
def create
super
mainWindow.show(PLACEMENT_SCREEN)
addTimeout(100, self, ID_TIMER)
end
def onCount(sender, sel, ptr)
@count += 1
puts "count = #{@count}"
if @count % RESTART_FRAQUENCY == 0
@dirTree.clearItems
@dirTree.create
end
@dirTree.expand
addTimeout(100, self, ID_TIMER)
end
end
if __FILE__ == $0
# Make application
application = Application.new
# Create app
application.create()
# Run
application.run()
end
|
|
From: Lyle J. <ly...@us...> - 2002-04-25 02:44:29
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv9881
Modified Files:
Tag: release10
markfuncs.cpp FXRuby.cpp
Log Message:
Corrected argument types for calls to rb_gc_mark() in FXRuby.cpp and
markfuncs.cpp. For Ruby 1.6, the prototype for rb_gc_mark() should be
rb_gc_mark(void *) and for Ruby 1.7 it is rb_gc_mark(VALUE).
Index: markfuncs.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/markfuncs.cpp,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** markfuncs.cpp 2 Mar 2002 01:39:49 -0000 1.13
--- markfuncs.cpp 25 Apr 2002 02:44:26 -0000 1.13.2.1
***************
*** 5,8 ****
--- 5,14 ----
#include "FXRbCommon.h"
+ #if RUBY_VERSION_CODE < 172
+ #define MARK(p) rb_gc_mark(reinterpret_cast<void *>((p)))
+ #else
+ #define MARK(p) rb_gc_mark(reinterpret_cast<VALUE>((p)))
+ #endif
+
// FIXME: How to get to the target objects stored in the accelerator
// table? This is currently private (not protected) data for the class.
***************
*** 83,87 ****
if(self){
FXRbGcMark(self->getApp());
! if(self->getUserData()) rb_gc_mark((VALUE) self->getUserData());
}
}
--- 89,93 ----
if(self){
FXRbGcMark(self->getApp());
! if(self->getUserData()) MARK(self->getUserData());
}
}
***************
*** 203,207 ****
for(FXint i=0; i<self->getNumItems(); i++){
if(self->getItemData(i))
! rb_gc_mark((VALUE) self->getItemData(i));
}
}
--- 209,213 ----
for(FXint i=0; i<self->getNumItems(); i++){
if(self->getItemData(i))
! MARK(self->getItemData(i));
}
}
***************
*** 310,314 ****
FXRbGcMark(self->getClosedIcon());
if(self->getData())
! rb_gc_mark((VALUE) self->getData());
}
}
--- 316,320 ----
FXRbGcMark(self->getClosedIcon());
if(self->getData())
! MARK(self->getData());
}
}
***************
*** 340,344 ****
FXRbGcMark(self->getIcon());
if(self->getData())
! rb_gc_mark((VALUE) self->getData());
}
}
--- 346,350 ----
FXRbGcMark(self->getIcon());
if(self->getData())
! MARK(self->getData());
}
}
***************
*** 360,364 ****
FXRbListItem::markfunc(item);
if(self->getItemData(i))
! rb_gc_mark((VALUE) self->getItemData(i));
}
FXRbGcMark(self->getFont());
--- 366,370 ----
FXRbListItem::markfunc(item);
if(self->getItemData(i))
! MARK(self->getItemData(i));
}
FXRbGcMark(self->getFont());
***************
*** 373,377 ****
FXRbGcMark(self->getIcon());
if(self->getData())
! rb_gc_mark((VALUE) self->getData());
}
}
--- 379,383 ----
FXRbGcMark(self->getIcon());
if(self->getData())
! MARK(self->getData());
}
}
***************
*** 393,397 ****
FXRbGcMark(self->getItemIcon(i,j));
if(self->getItemData(i,j))
! rb_gc_mark((VALUE) self->getItemData(i,j));
}
}
--- 399,403 ----
FXRbGcMark(self->getItemIcon(i,j));
if(self->getItemData(i,j))
! MARK(self->getItemData(i,j));
}
}
***************
*** 406,410 ****
FXRbGcMark(self->getIcon());
if(self->getData())
! rb_gc_mark((VALUE) self->getData());
}
}
--- 412,416 ----
FXRbGcMark(self->getIcon());
if(self->getData())
! MARK(self->getData());
}
}
***************
*** 426,430 ****
FXRbHeaderItem::markfunc(item);
if(item->getData())
! rb_gc_mark((VALUE) item->getData());
}
FXRbGcMark(self->getFont());
--- 432,436 ----
FXRbHeaderItem::markfunc(item);
if(item->getData())
! MARK(item->getData());
}
FXRbGcMark(self->getFont());
***************
*** 440,444 ****
FXRbGcMark(self->getMiniIcon());
if(self->getData())
! rb_gc_mark((VALUE) self->getData());
}
}
--- 446,450 ----
FXRbGcMark(self->getMiniIcon());
if(self->getData())
! MARK(self->getData());
}
}
***************
*** 461,465 ****
FXRbIconItem::markfunc(item);
if(self->getItemData(i))
! rb_gc_mark((VALUE) self->getItemData(i));
}
FXRbGcMark(self->getFont());
--- 467,471 ----
FXRbIconItem::markfunc(item);
if(self->getItemData(i))
! MARK(self->getItemData(i));
}
FXRbGcMark(self->getFont());
***************
*** 745,749 ****
FXRbGcMark(self->getItemIcon(i));
if(self->getItemData(i))
! rb_gc_mark((VALUE) self->getItemData(i));
}
}
--- 751,755 ----
FXRbGcMark(self->getItemIcon(i));
if(self->getItemData(i))
! MARK(self->getItemData(i));
}
}
Index: FXRuby.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -C2 -d -r1.40 -r1.40.2.1
*** FXRuby.cpp 3 Apr 2002 21:40:27 -0000 1.40
--- FXRuby.cpp 25 Apr 2002 02:44:26 -0000 1.40.2.1
***************
*** 158,162 ****
--- 158,166 ----
VALUE value=FXRbGetRubyObj(obj);
if(value!=Qnil){
+ #if RUBY_VERSION_CODE < 172
+ rb_gc_mark(reinterpret_cast<void *>(value));
+ #else
rb_gc_mark(value);
+ #endif
}
}
|
|
From: Lyle J. <ly...@us...> - 2002-04-25 02:34:35
|
Update of /cvsroot/fxruby/FXRuby/doc
In directory usw-pr-cvs1:/tmp/cvs-serv4481
Modified Files:
Tag: release10
build.xml
Log Message:
Modified instructions about the fix for rb_gc_mark()'s declaration in
intern.h; should read rb_gc_mark(void *) and not rb_gc_mark(VALUE).
Index: build.xml
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/doc/build.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** build.xml 21 Mar 2002 19:09:11 -0000 1.5
--- build.xml 25 Apr 2002 02:34:32 -0000 1.5.2.1
***************
*** 72,76 ****
<programlisting format="linespecific">void rb_thread_wait_for(struct timeval);</programlisting>
<para>and change the declaration for <function>rb_gc_mark()</function> in <filename>intern.h</filename> to read:</para>
! <programlisting format="linespecific">void rb_gc_mark(VALUE);</programlisting>
</listitem>
</itemizedlist>
--- 72,76 ----
<programlisting format="linespecific">void rb_thread_wait_for(struct timeval);</programlisting>
<para>and change the declaration for <function>rb_gc_mark()</function> in <filename>intern.h</filename> to read:</para>
! <programlisting format="linespecific">void rb_gc_mark(void *);</programlisting>
</listitem>
</itemizedlist>
|
|
From: Lyle J. <ly...@us...> - 2002-04-24 15:59:32
|
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv20002
Modified Files:
Tag: release10
typemaps.i
Log Message:
Added in typemap for FXString and corrected out typemap for FXQuat.
Index: typemaps.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/typemaps.i,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C2 -d -r1.35 -r1.35.2.1
*** typemaps.i 3 Apr 2002 21:40:57 -0000 1.35
--- typemaps.i 24 Apr 2002 15:59:26 -0000 1.35.2.1
***************
*** 29,32 ****
--- 29,42 ----
/* Convert Ruby string to FXString */
+ %typemap(ruby, in) FXString {
+ if ($input != Qnil) {
+ Check_Type($input, T_STRING);
+ $1 = FXString(STR2CSTR($input));
+ } else {
+ $1 = FXString::null;
+ }
+ }
+
+ /* Convert Ruby string to const FXString& */
%typemap(ruby, in) const FXString& {
if ($input != Qnil) {
***************
*** 353,357 ****
%typemap(ruby, out) FXQuat {
FXQuat *resultptr = new FXQuat($1);
! $result = FXRbGetRubyObj($1, "FXQuat *");
}
%typemap(ruby, out) FXQuat& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
--- 363,367 ----
%typemap(ruby, out) FXQuat {
FXQuat *resultptr = new FXQuat($1);
! $result = FXRbGetRubyObj(resultptr, "FXQuat *");
}
%typemap(ruby, out) FXQuat& "$result = FXRbGetRubyObj($1, \"$1_ltype\");";
|
|
From: Lyle J. <ly...@us...> - 2002-04-24 15:58:44
|
Update of /cvsroot/fxruby/FXRuby/tests
In directory usw-pr-cvs1:/tmp/cvs-serv19492
Modified Files:
Tag: release10
TC_FXViewport.rb
Log Message:
Corrected checks on FXViewport#w and FXViewport#h; we expect them to be
of type Integer (either Bignum or Fixnum). Was failing if it was not a
Fixnum.
Index: TC_FXViewport.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/tests/TC_FXViewport.rb,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** TC_FXViewport.rb 26 Mar 2002 21:35:20 -0000 1.2
--- TC_FXViewport.rb 24 Apr 2002 15:58:41 -0000 1.2.2.1
***************
*** 9,17 ****
@viewport = FXViewport.new
end
def testAttributes
assert_not_nil(@viewport.w)
! assert_kind_of(Fixnum, @viewport.w)
assert_not_nil(@viewport.h)
! assert_kind_of(Fixnum, @viewport.h)
assert_not_nil(@viewport.left)
assert_kind_of(Float, @viewport.left)
--- 9,18 ----
@viewport = FXViewport.new
end
+
def testAttributes
assert_not_nil(@viewport.w)
! assert_kind_of(Integer, @viewport.w)
assert_not_nil(@viewport.h)
! assert_kind_of(Integer, @viewport.h)
assert_not_nil(@viewport.left)
assert_kind_of(Float, @viewport.left)
|
|
From: Lyle J. <ly...@us...> - 2002-04-24 15:48:44
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv16047
Modified Files:
Tag: release10
core_wrap.cpp dialogs_wrap.cpp icons_wrap.cpp image_wrap.cpp
layout_wrap.cpp mdi_wrap.cpp opengl_wrap.cpp ui_wrap.cpp
Log Message:
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62.2.1
retrieving revision 1.62.2.2
diff -C2 -d -r1.62.2.1 -r1.62.2.2
*** core_wrap.cpp 24 Apr 2002 03:30:52 -0000 1.62.2.1
--- core_wrap.cpp 24 Apr 2002 15:48:29 -0000 1.62.2.2
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -C2 -d -r1.34.2.1 -r1.34.2.2
*** dialogs_wrap.cpp 24 Apr 2002 03:03:53 -0000 1.34.2.1
--- dialogs_wrap.cpp 24 Apr 2002 15:48:35 -0000 1.34.2.2
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -C2 -d -r1.37.2.1 -r1.37.2.2
*** icons_wrap.cpp 24 Apr 2002 03:03:54 -0000 1.37.2.1
--- icons_wrap.cpp 24 Apr 2002 15:48:36 -0000 1.37.2.2
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -C2 -d -r1.39.2.1 -r1.39.2.2
*** image_wrap.cpp 24 Apr 2002 03:03:55 -0000 1.39.2.1
--- image_wrap.cpp 24 Apr 2002 15:48:36 -0000 1.39.2.2
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
Index: layout_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** layout_wrap.cpp 24 Apr 2002 03:03:56 -0000 1.8.2.1
--- layout_wrap.cpp 24 Apr 2002 15:48:36 -0000 1.8.2.2
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
Index: mdi_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v
retrieving revision 1.36.2.1
retrieving revision 1.36.2.2
diff -C2 -d -r1.36.2.1 -r1.36.2.2
*** mdi_wrap.cpp 24 Apr 2002 03:03:57 -0000 1.36.2.1
--- mdi_wrap.cpp 24 Apr 2002 15:48:37 -0000 1.36.2.2
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41.2.1
retrieving revision 1.41.2.2
diff -C2 -d -r1.41.2.1 -r1.41.2.2
*** opengl_wrap.cpp 24 Apr 2002 03:03:57 -0000 1.41.2.1
--- opengl_wrap.cpp 24 Apr 2002 15:48:37 -0000 1.41.2.2
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
***************
*** 1512,1516 ****
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(result, "FXQuat *");
}
return vresult;
--- 1512,1516 ----
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(resultptr, "FXQuat *");
}
return vresult;
***************
*** 1531,1535 ****
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(result, "FXQuat *");
}
return vresult;
--- 1531,1535 ----
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(resultptr, "FXQuat *");
}
return vresult;
***************
*** 1550,1554 ****
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(result, "FXQuat *");
}
return vresult;
--- 1550,1554 ----
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(resultptr, "FXQuat *");
}
return vresult;
***************
*** 1569,1573 ****
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(result, "FXQuat *");
}
return vresult;
--- 1569,1573 ----
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(resultptr, "FXQuat *");
}
return vresult;
***************
*** 1590,1594 ****
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(result, "FXQuat *");
}
return vresult;
--- 1590,1594 ----
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(resultptr, "FXQuat *");
}
return vresult;
***************
*** 1611,1615 ****
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(result, "FXQuat *");
}
return vresult;
--- 1611,1615 ----
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(resultptr, "FXQuat *");
}
return vresult;
***************
*** 1634,1638 ****
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(result, "FXQuat *");
}
return vresult;
--- 1634,1638 ----
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(resultptr, "FXQuat *");
}
return vresult;
***************
*** 8029,8033 ****
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(result, "FXQuat *");
}
return vresult;
--- 8029,8033 ----
{
FXQuat *resultptr = new FXQuat(result);
! vresult = FXRbGetRubyObj(resultptr, "FXQuat *");
}
return vresult;
Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -d -r1.9.2.1 -r1.9.2.2
*** ui_wrap.cpp 24 Apr 2002 03:30:57 -0000 1.9.2.1
--- ui_wrap.cpp 24 Apr 2002 15:48:38 -0000 1.9.2.2
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020423-2123
*
* This file is not intended to be easily readable and contains a number of
--- 1,5 ----
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020422-1501
*
* This file is not intended to be easily readable and contains a number of
|
