[Fxruby-commits] CVS: FXRuby/ext/fox extconf.rb.in,1.1,1.2 FXRbApp.cpp,1.9,1.10 FXRuby.cpp,1.40,1.41
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
[Fxruby-commits] CVS: FXRuby/ext/fox extconf.rb.in,1.1,1.2 FXRbApp.cpp,1.9,1.10 FXRuby.cpp,1.40,1.41 core_wrap.cpp,1.62,1.63 dialogs_wrap.cpp,1.34,1.35 extconf.rb,1.27,1.28 icons_wrap.cpp,1.37,1.38 image_wrap.cpp,1.39,1.40 impl.cpp,1.12,1.13 layout_wrap.cpp,1.8,1.9 librb.c,1.6,1.7 markfuncs.cpp,1.13,1.14 mdi_wrap.cpp,1.36,1.37 opengl_wrap.cpp,1.41,1.42 scintilla_wrap.cpp,1.16,1.17 ui_wrap.cpp,1.9,1.10 extconf.rb.tmpl,1.17,NONE
|
From: Lyle J. <ly...@us...> - 2002-07-11 13:34:22
|
Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv26972/ext/fox
Modified Files:
FXRbApp.cpp FXRuby.cpp core_wrap.cpp dialogs_wrap.cpp
extconf.rb icons_wrap.cpp image_wrap.cpp impl.cpp
layout_wrap.cpp librb.c markfuncs.cpp mdi_wrap.cpp
opengl_wrap.cpp scintilla_wrap.cpp ui_wrap.cpp
Added Files:
extconf.rb.in
Removed Files:
extconf.rb.tmpl
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: FXRbApp.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRbApp.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FXRbApp.cpp 28 Feb 2002 01:01:45 -0000 1.9
--- FXRbApp.cpp 11 Jul 2002 13:32:57 -0000 1.10
***************
*** 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);
***************
*** 68,85 ****
! // Enable threads
! void FXRbApp::enableThreads(){
! if(!threadsEnabled){
! threadsEnabled=TRUE;
! threadsChore=addChore(this,ID_CHORE_THREADS);
! FXASSERT(threadsChore!=0);
}
! }
!
!
! // Disable threads
! void FXRbApp::disableThreads(){
! if(threadsEnabled){
! threadsEnabled=FALSE;
if(threadsChore!=0){
removeChore(threadsChore);
--- 68,82 ----
! // 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){
removeChore(threadsChore);
Index: FXRuby.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** FXRuby.cpp 3 Apr 2002 21:40:27 -0000 1.40
--- FXRuby.cpp 11 Jul 2002 13:32:57 -0000 1.41
***************
*** 50,60 ****
struct swig_type_info;
- // SWIG runtime functions we need
- extern "C" {
- swig_type_info * SWIG_TypeQuery(const char *);
- VALUE SWIG_NewPointerObj(void *ptr, swig_type_info *type, int own);
- void * SWIG_ConvertPtr(VALUE obj, swig_type_info *ty);
- }
-
// Wrapper around SWIG_TypeQuery() that caches results for performance
swig_type_info *FXRbTypeQuery(const char *desc){
--- 50,53 ----
***************
*** 74,81 ****
// Wrapper around SWIG_NewPointerObj()
VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
VALUE obj=SWIG_NewPointerObj(ptr,ty,1);
! FXRbRegisterRubyObj(obj,ptr);
return obj;
}
--- 67,93 ----
+ /**
+ * Maps C++ objects to Ruby instances.
+ * The objects in this map were created from Ruby code and are typically
+ * backed by one of our custom C++ classes (like FXRbButton). When the
+ * associated Ruby instance is garbage-collected this C++ object will be
+ * destroyed, so it's important that the objects in this map get marked
+ * during GC's mark phase if they're still reachable.
+ */
+ static std::map<const void*,VALUE> FXRuby_ObjMap;
+
+ /**
+ * Maps C++ objects to Ruby instances.
+ * The objects in this map were created by FOX and are backed by standard
+ * FOX classes (like FXButton). Unlike the objects stored in FXRuby_ObjMap
+ * (see above), when the associated Ruby instance is garbage-collected
+ * this C++ object will _not_ be destroyed.
+ */
+ static std::map<const void*,VALUE> FXRuby_BorrowedRefs;
+
// Wrapper around SWIG_NewPointerObj()
VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
VALUE obj=SWIG_NewPointerObj(ptr,ty,1);
! FXRuby_BorrowedRefs[ptr]=obj;
return obj;
}
***************
*** 84,94 ****
// Wrapper around SWIG_ConvertPtr()
void* FXRbConvertPtr(VALUE obj,swig_type_info* ty){
! return SWIG_ConvertPtr(obj,ty);
}
- // Maps C++ objects to Ruby instances
- static std::map<const void*,VALUE> FXRuby_ObjMap;
-
// Should we catch exceptions thrown by message handlers?
FXbool FXRbCatchExceptions=FALSE;
--- 96,105 ----
// Wrapper around SWIG_ConvertPtr()
void* FXRbConvertPtr(VALUE obj,swig_type_info* ty){
! void *ptr;
! SWIG_ConvertPtr(obj,&ptr,ty,1);
! return ptr;
}
// Should we catch exceptions thrown by message handlers?
FXbool FXRbCatchExceptions=FALSE;
***************
*** 128,151 ****
FXASSERT(FXRuby_ObjMap.find(foxObj)==FXRuby_ObjMap.end());
}
}
/**
! * Return the Ruby instance associated with this C++ object (if any),
! * or Qnil if no associated Ruby instance was found.
*/
! VALUE FXRbGetRubyObj(const void *foxObj) {
std::map<const void*,VALUE>::const_iterator itr=FXRuby_ObjMap.find(foxObj);
! return (itr!=FXRuby_ObjMap.end()) ? itr->second : Qnil;
}
-
/**
* Return the registered Ruby class instance associated with this
* FOX object, or a new registered instance if not found.
*/
! VALUE FXRbGetRubyObj(const void *foxObj, const char *type){
! VALUE rbObj = FXRbGetRubyObj(foxObj);
! return (rbObj == Qnil) ? FXRbNewPointerObj(const_cast<void*>(foxObj), FXRbTypeQuery(type)) : rbObj;
}
--- 139,178 ----
FXASSERT(FXRuby_ObjMap.find(foxObj)==FXRuby_ObjMap.end());
}
+
+ std::map<const void*,VALUE>::iterator itr2=FXRuby_BorrowedRefs.find(foxObj);
+ if(itr2!=FXRuby_BorrowedRefs.end()){
+ obj=itr2->second;
+ DATA_PTR(obj)=0;
+ FXRuby_BorrowedRefs.erase(itr2);
+ FXASSERT(FXRuby_BorrowedRefs.find(foxObj)==FXRuby_BorrowedRefs.end());
+ }
}
/**
! * Return the registered Ruby class instance associated with this
! * FOX object, or Qnil if not found.
*/
! VALUE FXRbGetRubyObj(const void *foxObj,FXbool searchBoth){
std::map<const void*,VALUE>::const_iterator itr=FXRuby_ObjMap.find(foxObj);
! if(itr!=FXRuby_ObjMap.end()){
! return itr->second;
! }
! else if(searchBoth){
! itr=FXRuby_BorrowedRefs.find(foxObj);
! return (itr!=FXRuby_BorrowedRefs.end()) ? itr->second : Qnil;
! }
! else{
! return Qnil;
! }
}
/**
* Return the registered Ruby class instance associated with this
* FOX object, or a new registered instance if not found.
*/
! VALUE FXRbGetRubyObj(const void *foxObj,const char *type){
! VALUE rbObj=FXRbGetRubyObj(foxObj,TRUE);
! return (rbObj==Qnil) ? FXRbNewPointerObj(const_cast<void*>(foxObj), FXRbTypeQuery(type)) : rbObj;
}
***************
*** 156,162 ****
void FXRbGcMark(void *obj){
if(obj){
! VALUE value=FXRbGetRubyObj(obj);
if(value!=Qnil){
rb_gc_mark(value);
}
}
--- 183,193 ----
void FXRbGcMark(void *obj){
if(obj){
! VALUE value=FXRbGetRubyObj(obj); // only search FXRuby_ObjMap!
if(value!=Qnil){
+ #if RUBY_VERSION_CODE < 172
+ rb_gc_mark(reinterpret_cast<void *>(value));
+ #else
rb_gc_mark(value);
+ #endif
}
}
***************
*** 406,410 ****
type == SEL_DESELECTED ||
type == SEL_INSERTED ||
! type == SEL_DELETED) return to_ruby((FXTableRange*)ptr);
}
else if(sender->isMemberOf(FXMETACLASS(FXText))){
--- 437,443 ----
type == SEL_DESELECTED ||
type == SEL_INSERTED ||
! type == SEL_DELETED){
! return to_ruby(reinterpret_cast<FXTableRange*>(ptr));
! }
}
else if(sender->isMemberOf(FXMETACLASS(FXText))){
***************
*** 496,499 ****
--- 529,533 ----
void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
FXEvent* ev;
+ void *ptr;
static FXint intValue;
static FXint intRange[2];
***************
*** 559,563 ****
case SEL_DND_REQUEST:
case SEL_PICKED:
! return SWIG_ConvertPtr(value, FXRbTypeQuery("FXEvent *"));
case SEL_IO_READ:
case SEL_IO_WRITE:
--- 593,598 ----
case SEL_DND_REQUEST:
case SEL_PICKED:
! SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),1);
! return ptr;
case SEL_IO_READ:
case SEL_IO_WRITE:
***************
*** 825,828 ****
--- 860,881 ----
//----------------------------------------------------------------------
+ void FXRbRange2LoHi(VALUE range,FXint& lo,FXint& hi){
+ if(Qtrue!=rb_obj_is_instance_of(range,rb_cRange)){
+ rb_raise(rb_eTypeError,"wrong argument type %s (expected %s)",rb_class2name(CLASS_OF(range)),rb_class2name(rb_cRange));
+ }
+ else{
+ VALUE beg=rb_funcall(range,rb_intern("begin"),0,NULL);
+ VALUE end=rb_funcall(range,rb_intern("end"),0,NULL);
+ VALUE excl=rb_funcall(range,rb_intern("exclude_end?"),0,NULL);
+ lo=NUM2INT(beg);
+ hi=NUM2INT(end);
+ if(excl==Qtrue){
+ hi--;
+ }
+ }
+ }
+
+ //----------------------------------------------------------------------
+
void FXRbCallVoidMethod(FXObject* recv, const char *func) {
/*
***************
*** 1153,1161 ****
Init_scintilla();
#endif
! rb_f_require(Qnil, rb_str_new2("fox/aliases"));
! rb_f_require(Qnil, rb_str_new2("fox/core"));
! rb_f_require(Qnil, rb_str_new2("fox/iterators"));
! rb_f_require(Qnil, rb_str_new2("fox/keys"));
! rb_f_require(Qnil, rb_str_new2("fox/overloads"));
! rb_f_require(Qnil, rb_str_new2("fox/responder2"));
}
--- 1206,1214 ----
Init_scintilla();
#endif
! rb_require("fox/core");
! rb_require("fox/iterators");
! rb_require("fox/keys");
! rb_require("fox/overloads");
! rb_require("fox/aliases");
! rb_require("fox/responder2");
}
Index: core_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/core_wrap.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** core_wrap.cpp 3 Apr 2002 21:40:27 -0000 1.62
--- core_wrap.cpp 11 Jul 2002 13:32:57 -0000 1.63
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...18963 lines suppressed...]
rb_define_method(cFX_Document.klass, "onUpdFilename", VALUEFUNC(_wrap_FX_Document_onUpdFilename), -1);
***************
*** 19434,19441 ****
cFX_Document.destroy = (void (*)(void *)) free_FXDocument;
! cFXDocument.klass = rb_define_class_under(mFox, "FXDocument", cFX_Document.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbDocument, (void *) &cFXDocument);
! rb_define_singleton_method(cFXDocument.klass, "new", VALUEFUNC(_wrap_new_FXDocument), -1);
! rb_define_method(cFXDocument.klass, "initialize", VALUEFUNC(_wrap_FXDocument_initialize), -1);
rb_define_method(cFXDocument.klass, "onDefault", VALUEFUNC(_wrap_FXDocument_onDefault), -1);
rb_define_method(cFXDocument.klass, "save", VALUEFUNC(_wrap_FXDocument_save), -1);
--- 20714,20721 ----
cFX_Document.destroy = (void (*)(void *)) free_FXDocument;
! cFXDocument.klass = rb_define_class_under(mFox, "FXDocument", ((swig_class *) SWIGTYPE_p_FXDocument->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbDocument, (void *) &cFXDocument);
! rb_define_singleton_method(cFXDocument.klass, "new", VALUEFUNC(_wrap_FXDocument_allocate), -1);
! rb_define_method(cFXDocument.klass, "initialize", VALUEFUNC(_wrap_new_FXDocument), -1);
rb_define_method(cFXDocument.klass, "onDefault", VALUEFUNC(_wrap_FXDocument_onDefault), -1);
rb_define_method(cFXDocument.klass, "save", VALUEFUNC(_wrap_FXDocument_save), -1);
Index: dialogs_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/dialogs_wrap.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** dialogs_wrap.cpp 2 Apr 2002 23:30:43 -0000 1.34
--- dialogs_wrap.cpp 11 Jul 2002 13:33:08 -0000 1.35
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...11491 lines suppressed...]
rb_define_method(cFX_MessageBox.klass, "onCmdCancel", VALUEFUNC(_wrap_FX_MessageBox_onCmdCancel), -1);
***************
*** 14010,14017 ****
cFX_MessageBox.mark = (void (*)(void *)) FXRbMessageBox::markfunc;
! cFXMessageBox.klass = rb_define_class_under(mFox, "FXMessageBox", cFX_MessageBox.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbMessageBox, (void *) &cFXMessageBox);
! rb_define_singleton_method(cFXMessageBox.klass, "new", VALUEFUNC(_wrap_new_FXMessageBox), -1);
! rb_define_method(cFXMessageBox.klass, "initialize", VALUEFUNC(_wrap_FXMessageBox_initialize), -1);
rb_define_method(cFXMessageBox.klass, "onDefault", VALUEFUNC(_wrap_FXMessageBox_onDefault), -1);
rb_define_method(cFXMessageBox.klass, "save", VALUEFUNC(_wrap_FXMessageBox_save), -1);
--- 14637,14644 ----
cFX_MessageBox.mark = (void (*)(void *)) FXRbMessageBox::markfunc;
! cFXMessageBox.klass = rb_define_class_under(mFox, "FXMessageBox", ((swig_class *) SWIGTYPE_p_FXMessageBox->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbMessageBox, (void *) &cFXMessageBox);
! rb_define_singleton_method(cFXMessageBox.klass, "new", VALUEFUNC(_wrap_FXMessageBox_allocate), -1);
! rb_define_method(cFXMessageBox.klass, "initialize", VALUEFUNC(_wrap_new_FXMessageBox), -1);
rb_define_method(cFXMessageBox.klass, "onDefault", VALUEFUNC(_wrap_FXMessageBox_onDefault), -1);
rb_define_method(cFXMessageBox.klass, "save", VALUEFUNC(_wrap_FXMessageBox_save), -1);
Index: extconf.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/extconf.rb,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** extconf.rb 21 Mar 2002 23:00:40 -0000 1.27
--- extconf.rb 11 Jul 2002 13:33:08 -0000 1.28
***************
*** 4,45 ****
require 'mkmf'
def getInstalledFOXVersion
! incdir = "/usr/local/include/fox"
! ARGV.each { |arg|
if arg =~ /--with-fox-include/
! incdir = arg.split('=')[1]
end
! }
! filename = File.join(incdir, "fxver.h")
! if FileTest.exists?(filename)
! foxMajor, foxMinor, foxLevel = nil, nil, nil
! File.foreach(filename) { |line|
! if line =~ /FOX_MAJOR/
! foxMajor = line.split()[2]
! elsif line =~ /FOX_MINOR/
! foxMinor = line.split()[2]
! elsif line =~ /FOX_LEVEL/
! foxLevel = line.split()[2]
! end
! }
! if foxMajor && foxMinor && foxLevel
! return foxMajor + "." + foxMinor + "." + foxLevel
! else
! return ""
end
! else
! puts "I couldn't locate the standard FOX header file \"fxver.h\" at this location:"
! puts ""
! puts " #{filename}"
! puts ""
! puts "Please specify the locations for the FOX header files and library using the"
! puts "--with-fox-include and --with-fox-lib options to extconf.rb as described in"
! puts "the FXRuby installation instructions."
! exit
! end
end
def is_scintilla_build?
! args = ARGV.delete_if { |e| !(e =~ /--with-scintilla/) }
args.length > 0
end
--- 4,55 ----
require 'mkmf'
+ def read_fox_version(filename)
+ foxMajor, foxMinor, foxLevel = nil, nil, nil
+ File.foreach(filename) do |line|
+ if line =~ /FOX_MAJOR/
+ foxMajor = line.split()[2]
+ elsif line =~ /FOX_MINOR/
+ foxMinor = line.split()[2]
+ elsif line =~ /FOX_LEVEL/
+ foxLevel = line.split()[2]
+ end
+ end
+ [foxMajor, foxMinor, foxLevel]
+ end
+
def getInstalledFOXVersion
! # incdirs is an array of directories that we'll search (in order)
! # looking for the FOX header files
! incdirs = ["/usr/include/fox", "/usr/local/include/fox"]
! ARGV.each do |arg|
if arg =~ /--with-fox-include/
! option, value = arg.split('=')
! incdirs = [ value ] + incdirs
end
! end
!
! incdirs.each do |incdir|
! filename = File.join(incdir, "fxver.h")
! if FileTest.exists?(filename)
! foxMajor, foxMinor, foxLevel = read_fox_version(filename)
! idircflag = "-I" + incdir
! $CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag)
! return [foxMajor, foxMinor, foxLevel].join('.')
end
! end
!
! # Couldn't find it
! puts "I couldn't locate \"fxver.h\" in any of the following directories:"
! puts ""
! incdirs.each { |incdir| puts " #{incdir}" }
! puts ""
! puts "Please specify the locations for the FOX header files and library using the"
! puts "--with-fox-include and --with-fox-lib options to extconf.rb as described in"
! puts "the FXRuby installation instructions."
! exit
end
def is_scintilla_build?
! args = ARGV.delete_if { |e| !(e =~ /--with-fxscintilla/) }
args.length > 0
end
***************
*** 47,63 ****
# This directive processes the "--with-fox-include" and "--with-fox-lib"
# command line switches and modifies the CFLAGS and LDFLAGS accordingly.
! dir_config('fox', '/usr/local/include/fox', '/usr/local/lib')
! # This directive processes the "--with-scintilla-include" and
! # "--with-scintilla-lib" command line switches and modifies the CFLAGS
# and LDFLAGS accordingly.
! dir_config('scintilla', '/usr/local/include', '/usr/local/lib')
# Verify version number for FOX from the installed header files
! installedVer = getInstalledFOXVersion().split('.')
! thisVer = "1.0.3".split('.')
! if (installedVer[0] != thisVer[0]) || (installedVer[1] != thisVer[1])
puts "The version number for this installation of FOX appears to be inconsistent"
! puts "with this release of FXRuby (1.0.3)."
exit
end
--- 57,73 ----
# This directive processes the "--with-fox-include" and "--with-fox-lib"
# command line switches and modifies the CFLAGS and LDFLAGS accordingly.
! dir_config('fox', nil, '/usr/local/lib')
! # This directive processes the "--with-fxscintilla-include" and
! # "--with-fxscintilla-lib" command line switches and modifies the CFLAGS
# and LDFLAGS accordingly.
! dir_config('fxscintilla', '/usr/local/include', '/usr/local/lib')
# Verify version number for FOX from the installed header files
! instMajor, instMinor, instLevel = getInstalledFOXVersion().split('.')
! thisMajor, thisMinor, thisLevel = "1.0.11".split('.')
! unless (instMajor == thisMajor) && (instMinor == thisMinor)
puts "The version number for this installation of FOX appears to be inconsistent"
! puts "with this release of FXRuby (1.0.11)."
exit
end
***************
*** 84,88 ****
File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
! $libs = append_library($libs, "scintilla")
else
File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
--- 94,98 ----
File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
! $libs = append_library($libs, "fxscintilla")
else
File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
***************
*** 102,107 ****
have_header("sys/time.h")
have_header("signal.h")
- have_library("libpng", "png_create_read_struct")
have_library("zlib", "deflate")
have_library("libjpeg", "jpeg_mem_init")
have_library("libtiff", "TIFFSetErrorHandler")
--- 112,117 ----
have_header("sys/time.h")
have_header("signal.h")
have_library("zlib", "deflate")
+ have_library("libpng", "png_create_read_struct")
have_library("libjpeg", "jpeg_mem_init")
have_library("libtiff", "TIFFSetErrorHandler")
***************
*** 113,117 ****
File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
! $libs = append_library($libs, "scintilla-static")
else
File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
--- 123,127 ----
File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
! $libs = append_library($libs, "fxscintilla-static")
else
File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
***************
*** 134,138 ****
File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
! $libs = append_library($libs, "scintilla")
else
File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
--- 144,148 ----
File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
$CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
! $libs = append_library($libs, "fxscintilla")
else
File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
Index: icons_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/icons_wrap.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** icons_wrap.cpp 2 Apr 2002 23:30:43 -0000 1.37
--- icons_wrap.cpp 11 Jul 2002 13:33:08 -0000 1.38
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...4412 lines suppressed...]
! rb_define_singleton_method(cFXXPMIcon.klass, "new", VALUEFUNC(_wrap_new_FXXPMIcon), -1);
! rb_define_method(cFXXPMIcon.klass, "initialize", VALUEFUNC(_wrap_FXXPMIcon_initialize), -1);
rb_define_method(cFXXPMIcon.klass, "onDefault", VALUEFUNC(_wrap_FXXPMIcon_onDefault), -1);
rb_define_method(cFXXPMIcon.klass, "save", VALUEFUNC(_wrap_FXXPMIcon_save), -1);
--- 7320,7334 ----
cFXTIFIcon.destroy = (void (*)(void *)) free_FXRbTIFIcon;
! cFX_XPMIcon.klass = rb_define_class_under(mFox, "FX_XPMIcon", ((swig_class *) SWIGTYPE_p_FXIcon->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXXPMIcon, (void *) &cFX_XPMIcon);
! rb_define_singleton_method(cFX_XPMIcon.klass, "new", VALUEFUNC(_wrap_FX_XPMIcon_allocate), -1);
! rb_define_method(cFX_XPMIcon.klass, "initialize", VALUEFUNC(_wrap_new_FX_XPMIcon), -1);
cFX_XPMIcon.mark = (void (*)(void *)) FXRbXPMIcon::markfunc;
cFX_XPMIcon.destroy = (void (*)(void *)) free_FXXPMIcon;
! cFXXPMIcon.klass = rb_define_class_under(mFox, "FXXPMIcon", ((swig_class *) SWIGTYPE_p_FXXPMIcon->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbXPMIcon, (void *) &cFXXPMIcon);
! rb_define_singleton_method(cFXXPMIcon.klass, "new", VALUEFUNC(_wrap_FXXPMIcon_allocate), -1);
! rb_define_method(cFXXPMIcon.klass, "initialize", VALUEFUNC(_wrap_new_FXXPMIcon), -1);
rb_define_method(cFXXPMIcon.klass, "onDefault", VALUEFUNC(_wrap_FXXPMIcon_onDefault), -1);
rb_define_method(cFXXPMIcon.klass, "save", VALUEFUNC(_wrap_FXXPMIcon_save), -1);
Index: image_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/image_wrap.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** image_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.39
--- image_wrap.cpp 11 Jul 2002 13:33:09 -0000 1.40
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...5224 lines suppressed...]
! rb_define_singleton_method(cFXXPMImage.klass, "new", VALUEFUNC(_wrap_new_FXXPMImage), -1);
! rb_define_method(cFXXPMImage.klass, "initialize", VALUEFUNC(_wrap_FXXPMImage_initialize), -1);
rb_define_method(cFXXPMImage.klass, "onDefault", VALUEFUNC(_wrap_FXXPMImage_onDefault), -1);
rb_define_method(cFXXPMImage.klass, "save", VALUEFUNC(_wrap_FXXPMImage_save), -1);
--- 7746,7760 ----
rb_define_module_function(mFox, "fxsaveTIF", VALUEFUNC(_wrap_fxsaveTIF), -1);
! cFX_XPMImage.klass = rb_define_class_under(mFox, "FX_XPMImage", ((swig_class *) SWIGTYPE_p_FXImage->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXXPMImage, (void *) &cFX_XPMImage);
! rb_define_singleton_method(cFX_XPMImage.klass, "new", VALUEFUNC(_wrap_FX_XPMImage_allocate), -1);
! rb_define_method(cFX_XPMImage.klass, "initialize", VALUEFUNC(_wrap_new_FX_XPMImage), -1);
cFX_XPMImage.mark = (void (*)(void *)) FXRbXPMImage::markfunc;
cFX_XPMImage.destroy = (void (*)(void *)) free_FXXPMImage;
! cFXXPMImage.klass = rb_define_class_under(mFox, "FXXPMImage", ((swig_class *) SWIGTYPE_p_FXXPMImage->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbXPMImage, (void *) &cFXXPMImage);
! rb_define_singleton_method(cFXXPMImage.klass, "new", VALUEFUNC(_wrap_FXXPMImage_allocate), -1);
! rb_define_method(cFXXPMImage.klass, "initialize", VALUEFUNC(_wrap_new_FXXPMImage), -1);
rb_define_method(cFXXPMImage.klass, "onDefault", VALUEFUNC(_wrap_FXXPMImage_onDefault), -1);
rb_define_method(cFXXPMImage.klass, "save", VALUEFUNC(_wrap_FXXPMImage_save), -1);
Index: impl.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/impl.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** impl.cpp 2 Mar 2002 01:39:49 -0000 1.12
--- impl.cpp 11 Jul 2002 13:33:09 -0000 1.13
***************
*** 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_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 FXRbToggleButton */
--- 847,850 ----
Index: layout_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/layout_wrap.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** layout_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.8
--- layout_wrap.cpp 11 Jul 2002 13:33:09 -0000 1.9
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...8447 lines suppressed...]
rb_define_method(cFX_Statusbar.klass, "getCornerStyle", VALUEFUNC(_wrap_FX_Statusbar_getCornerStyle), -1);
***************
*** 11778,11785 ****
cFX_Statusbar.destroy = (void (*)(void *)) free_FXStatusbar;
! cFXStatusbar.klass = rb_define_class_under(mFox, "FXStatusbar", cFX_Statusbar.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbStatusbar, (void *) &cFXStatusbar);
! rb_define_singleton_method(cFXStatusbar.klass, "new", VALUEFUNC(_wrap_new_FXStatusbar), -1);
! rb_define_method(cFXStatusbar.klass, "initialize", VALUEFUNC(_wrap_FXStatusbar_initialize), -1);
rb_define_method(cFXStatusbar.klass, "onDefault", VALUEFUNC(_wrap_FXStatusbar_onDefault), -1);
rb_define_method(cFXStatusbar.klass, "save", VALUEFUNC(_wrap_FXStatusbar_save), -1);
--- 12156,12163 ----
cFX_Statusbar.destroy = (void (*)(void *)) free_FXStatusbar;
! cFXStatusbar.klass = rb_define_class_under(mFox, "FXStatusbar", ((swig_class *) SWIGTYPE_p_FXStatusbar->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbStatusbar, (void *) &cFXStatusbar);
! rb_define_singleton_method(cFXStatusbar.klass, "new", VALUEFUNC(_wrap_FXStatusbar_allocate), -1);
! rb_define_method(cFXStatusbar.klass, "initialize", VALUEFUNC(_wrap_new_FXStatusbar), -1);
rb_define_method(cFXStatusbar.klass, "onDefault", VALUEFUNC(_wrap_FXStatusbar_onDefault), -1);
rb_define_method(cFXStatusbar.klass, "save", VALUEFUNC(_wrap_FXStatusbar_save), -1);
Index: librb.c
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/librb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** librb.c 28 Mar 2002 14:32:31 -0000 1.6
--- librb.c 11 Jul 2002 13:33:09 -0000 1.7
***************
*** 328,359 ****
/* Convert a pointer value */
! SWIGRUNTIME(void *)
! SWIG_ConvertPtr(VALUE obj, swig_type_info *ty)
{
char *c;
- void *ptr = 0;
swig_type_info *tc;
/* Grab the pointer */
! if (NIL_P(obj))
return 0;
! else
! Data_Get_Struct(obj, void, ptr);
/* Do type-checking if type info was provided */
if (ty) {
if (ty->clientdata) {
! if (!rb_obj_is_kind_of(obj, ((swig_class *) (ty->clientdata))->klass))
! rb_raise(rb_eTypeError, "wrong argument type (expected %s)", ty->str);
! if (!ptr) rb_raise(rb_eRuntimeError, "This %s already released", ty->str);
} else {
! if ((c = SWIG_MangleStr(obj)) == NULL)
! rb_raise(rb_eTypeError, "Expected %s", ty->str);
tc = SWIG_TypeCheck(c, ty);
! if (!tc) rb_raise(rb_eTypeError, "Expected %s", ty->str);
! ptr = SWIG_TypeCast(tc, ptr);
}
}
! return ptr;
}
--- 328,373 ----
/* Convert a pointer value */
! SWIGRUNTIME(int)
! SWIG_ConvertPtr(VALUE obj, void **ptr, swig_type_info *ty, int flags)
{
char *c;
swig_type_info *tc;
/* Grab the pointer */
! if (NIL_P(obj)) {
! *ptr = 0;
return 0;
! } else
! Data_Get_Struct(obj, void, *ptr);
/* Do type-checking if type info was provided */
if (ty) {
if (ty->clientdata) {
! if (!rb_obj_is_kind_of(obj, ((swig_class *) (ty->clientdata))->klass)) {
! if (flags)
! rb_raise(rb_eTypeError, "wrong argument type (expected %s)", ty->str);
! else
! return -1;
! }
! if (*ptr == 0)
! rb_raise(rb_eRuntimeError, "This %s already released", ty->str);
} else {
! if ((c = SWIG_MangleStr(obj)) == NULL) {
! if (flags)
! rb_raise(rb_eTypeError, "Expected %s", ty->str);
! else
! return -1;
! }
tc = SWIG_TypeCheck(c, ty);
! if (!tc) {
! if (flags)
! rb_raise(rb_eTypeError, "Expected %s", ty->str);
! else
! return -1;
! }
! *ptr = SWIG_TypeCast(tc, ptr);
}
}
! return 0;
}
***************
*** 386,390 ****
SWIGRUNTIME(char *)
SWIG_UnpackData(char *c, void *ptr, int sz) {
! register unsigned char uu;
register int d;
unsigned char *u = (unsigned char *) ptr;
--- 400,404 ----
SWIGRUNTIME(char *)
SWIG_UnpackData(char *c, void *ptr, int sz) {
! register unsigned char uu = 0;
register int d;
unsigned char *u = (unsigned char *) ptr;
Index: markfuncs.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/markfuncs.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** markfuncs.cpp 2 Mar 2002 01:39:49 -0000 1.13
--- markfuncs.cpp 11 Jul 2002 13:33:09 -0000 1.14
***************
*** 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: mdi_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/mdi_wrap.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** mdi_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.36
--- mdi_wrap.cpp 11 Jul 2002 13:33:09 -0000 1.37
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...7127 lines suppressed...]
rb_define_method(cFX_MDIChild.klass, "onFocusSelf", VALUEFUNC(_wrap_FX_MDIChild_onFocusSelf), -1);
***************
*** 10892,10899 ****
cFX_MDIChild.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
! cFXMDIChild.klass = rb_define_class_under(mFox, "FXMDIChild", cFX_MDIChild.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbMDIChild, (void *) &cFXMDIChild);
! rb_define_singleton_method(cFXMDIChild.klass, "new", VALUEFUNC(_wrap_new_FXMDIChild), -1);
! rb_define_method(cFXMDIChild.klass, "initialize", VALUEFUNC(_wrap_FXMDIChild_initialize), -1);
rb_define_method(cFXMDIChild.klass, "onDefault", VALUEFUNC(_wrap_FXMDIChild_onDefault), -1);
rb_define_method(cFXMDIChild.klass, "save", VALUEFUNC(_wrap_FXMDIChild_save), -1);
--- 10890,10897 ----
cFX_MDIChild.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
! cFXMDIChild.klass = rb_define_class_under(mFox, "FXMDIChild", ((swig_class *) SWIGTYPE_p_FXMDIChild->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbMDIChild, (void *) &cFXMDIChild);
! rb_define_singleton_method(cFXMDIChild.klass, "new", VALUEFUNC(_wrap_FXMDIChild_allocate), -1);
! rb_define_method(cFXMDIChild.klass, "initialize", VALUEFUNC(_wrap_new_FXMDIChild), -1);
rb_define_method(cFXMDIChild.klass, "onDefault", VALUEFUNC(_wrap_FXMDIChild_onDefault), -1);
rb_define_method(cFXMDIChild.klass, "save", VALUEFUNC(_wrap_FXMDIChild_save), -1);
Index: opengl_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/opengl_wrap.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** opengl_wrap.cpp 2 Apr 2002 23:30:44 -0000 1.41
--- opengl_wrap.cpp 11 Jul 2002 13:33:09 -0000 1.42
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...13711 lines suppressed...]
rb_define_method(cFX_GLShape.klass, "onDNDMotion", VALUEFUNC(_wrap_FX_GLShape_onDNDMotion), -1);
***************
*** 13765,13772 ****
cFX_GLShape.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
! cFXGLShape.klass = rb_define_class_under(mFox, "FXGLShape", cFX_GLShape.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbGLShape, (void *) &cFXGLShape);
! rb_define_singleton_method(cFXGLShape.klass, "new", VALUEFUNC(_wrap_new_FXGLShape), -1);
! rb_define_method(cFXGLShape.klass, "initialize", VALUEFUNC(_wrap_FXGLShape_initialize), -1);
rb_define_method(cFXGLShape.klass, "setRange", VALUEFUNC(_wrap_FXGLShape_setRange), -1);
rb_define_method(cFXGLShape.klass, "onDefault", VALUEFUNC(_wrap_FXGLShape_onDefault), -1);
--- 16500,16507 ----
cFX_GLShape.destroy = (void (*)(void *)) FXRbUnregisterRubyObj;
! cFXGLShape.klass = rb_define_class_under(mFox, "FXGLShape", ((swig_class *) SWIGTYPE_p_FXGLShape->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbGLShape, (void *) &cFXGLShape);
! rb_define_singleton_method(cFXGLShape.klass, "new", VALUEFUNC(_wrap_FXGLShape_allocate), -1);
! rb_define_method(cFXGLShape.klass, "initialize", VALUEFUNC(_wrap_new_FXGLShape), -1);
rb_define_method(cFXGLShape.klass, "setRange", VALUEFUNC(_wrap_FXGLShape_setRange), -1);
rb_define_method(cFXGLShape.klass, "onDefault", VALUEFUNC(_wrap_FXGLShape_onDefault), -1);
Index: scintilla_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/scintilla_wrap.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** scintilla_wrap.cpp 2 Apr 2002 23:30:45 -0000 1.16
--- scintilla_wrap.cpp 11 Jul 2002 13:33:10 -0000 1.17
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...3655 lines suppressed...]
rb_define_method(cFX_Scintilla.klass, "onScintillaCommand", VALUEFUNC(_wrap_FX_Scintilla_onScintillaCommand), -1);
***************
*** 4378,4385 ****
cFX_Scintilla.destroy = (void (*)(void *)) free_FXScintilla;
! cFXScintilla.klass = rb_define_class_under(mFox, "FXScintilla", cFX_Scintilla.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbScintilla, (void *) &cFXScintilla);
! rb_define_singleton_method(cFXScintilla.klass, "new", VALUEFUNC(_wrap_new_FXScintilla), -1);
! rb_define_method(cFXScintilla.klass, "initialize", VALUEFUNC(_wrap_FXScintilla_initialize), -1);
rb_define_method(cFXScintilla.klass, "onDefault", VALUEFUNC(_wrap_FXScintilla_onDefault), -1);
rb_define_method(cFXScintilla.klass, "save", VALUEFUNC(_wrap_FXScintilla_save), -1);
--- 4466,4473 ----
cFX_Scintilla.destroy = (void (*)(void *)) free_FXScintilla;
! cFXScintilla.klass = rb_define_class_under(mFox, "FXScintilla", ((swig_class *) SWIGTYPE_p_FXScintilla->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbScintilla, (void *) &cFXScintilla);
! rb_define_singleton_method(cFXScintilla.klass, "new", VALUEFUNC(_wrap_FXScintilla_allocate), -1);
! rb_define_method(cFXScintilla.klass, "initialize", VALUEFUNC(_wrap_new_FXScintilla), -1);
rb_define_method(cFXScintilla.klass, "onDefault", VALUEFUNC(_wrap_FXScintilla_onDefault), -1);
rb_define_method(cFXScintilla.klass, "save", VALUEFUNC(_wrap_FXScintilla_save), -1);
Index: ui_wrap.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/ui_wrap.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ui_wrap.cpp 2 Apr 2002 23:30:45 -0000 1.9
--- ui_wrap.cpp 11 Jul 2002 13:33:10 -0000 1.10
***************
*** 1,5 ****
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
! * Version 1.3.12u-20020402-1643
*
* 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.14u-20020708-1058
*
[...99678 lines suppressed...]
rb_define_method(cFX_ToolbarTab.klass, "onUpdate", VALUEFUNC(_wrap_FX_ToolbarTab_onUpdate), -1);
***************
*** 106276,106283 ****
cFX_ToolbarTab.mark = (void (*)(void *)) FXRbToolbarTab::markfunc;
! cFXToolbarTab.klass = rb_define_class_under(mFox, "FXToolbarTab", cFX_ToolbarTab.klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbToolbarTab, (void *) &cFXToolbarTab);
! rb_define_singleton_method(cFXToolbarTab.klass, "new", VALUEFUNC(_wrap_new_FXToolbarTab), -1);
! rb_define_method(cFXToolbarTab.klass, "initialize", VALUEFUNC(_wrap_FXToolbarTab_initialize), -1);
rb_define_method(cFXToolbarTab.klass, "onDefault", VALUEFUNC(_wrap_FXToolbarTab_onDefault), -1);
rb_define_method(cFXToolbarTab.klass, "save", VALUEFUNC(_wrap_FXToolbarTab_save), -1);
--- 109406,109413 ----
cFX_ToolbarTab.mark = (void (*)(void *)) FXRbToolbarTab::markfunc;
! cFXToolbarTab.klass = rb_define_class_under(mFox, "FXToolbarTab", ((swig_class *) SWIGTYPE_p_FXToolbarTab->clientdata)->klass);
SWIG_TypeClientData(SWIGTYPE_p_FXRbToolbarTab, (void *) &cFXToolbarTab);
! rb_define_singleton_method(cFXToolbarTab.klass, "new", VALUEFUNC(_wrap_FXToolbarTab_allocate), -1);
! rb_define_method(cFXToolbarTab.klass, "initialize", VALUEFUNC(_wrap_new_FXToolbarTab), -1);
rb_define_method(cFXToolbarTab.klass, "onDefault", VALUEFUNC(_wrap_FXToolbarTab_onDefault), -1);
rb_define_method(cFXToolbarTab.klass, "save", VALUEFUNC(_wrap_FXToolbarTab_save), -1);
--- extconf.rb.tmpl DELETED ---
|
