[Fxruby-commits] CVS: FXRuby/swig-interfaces FX4Splitter.i,1.13,1.13.2.1 FXApp.i,1.38.2.5,1.38.2.6 F
Status: Inactive
Brought to you by:
lyle
Update of /cvsroot/fxruby/FXRuby/swig-interfaces In directory usw-pr-cvs1:/tmp/cvs-serv15718/swig-interfaces Modified Files: Tag: release10 FX4Splitter.i FXApp.i FXDC.i FXDCWindow.i FXDialogBox.i FXFont.i FXHMat.i FXHeader.i FXIconList.i FXList.i FXMenubar.i FXMessageBox.i FXRange.i FXRegion.i FXShell.i FXSplitter.i FXToolbar.i FXTopWindow.i FXTreeList.i FXTreeListBox.i FXWindow.i typemaps.i Log Message: Removed a lot of scaffolding that we were using to make overloaded methods work properly. This is now supported directly by SWIG 1.3.14 and so we don't have to do it anymore. Index: FX4Splitter.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FX4Splitter.i,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** FX4Splitter.i 19 Mar 2002 23:18:40 -0000 1.13 --- FX4Splitter.i 8 Jul 2002 13:27:51 -0000 1.13.2.1 *************** *** 27,31 **** }; - %ignore FX4Splitter::FX4Splitter(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h); %exception FX4Splitter::FX4Splitter "$action FXRbRegisterRubyObj(self, result);"; --- 27,30 ---- *************** *** 119,123 **** }; - %ignore FXRb4Splitter::FXRb4Splitter(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h); %exception FXRb4Splitter::FXRb4Splitter "$action FXRbRegisterRubyObj(self, result);"; --- 118,121 ---- Index: FXApp.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXApp.i,v retrieving revision 1.38.2.5 retrieving revision 1.38.2.6 diff -C2 -d -r1.38.2.5 -r1.38.2.6 *** FXApp.i 6 May 2002 19:16:29 -0000 1.38.2.5 --- FXApp.i 8 Jul 2002 13:27:51 -0000 1.38.2.6 *************** *** 116,122 **** %ignore FXApp::findWindowAt(FXint rx, FXint ry, FXID window) const; - %rename(stopModalMatching) FXApp::stopModal(FXWindow* window,FXint value); - %rename(stopModalInnermost) FXApp::stopModal(FXint value); - /// Application Object class FXApp : public FXObject { --- 116,119 ---- Index: FXDC.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDC.i,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -C2 -d -r1.21.2.1 -r1.21.2.2 *** FXDC.i 6 May 2002 19:16:29 -0000 1.21.2.1 --- FXDC.i 8 Jul 2002 13:27:51 -0000 1.21.2.2 *************** *** 139,145 **** class FXRegion; ! %rename(setStippleFromBitmap) FXDC::setStipple(FXBitmap *bitmap,FXint dx,FXint dy); ! %rename(setStippleFromPattern) FXDC::setStipple(FXStipplePattern pat,FXint dx,FXint dy); ! %rename(setClipRectangle1) FXDC::setClipRectangle(const FXRectangle& rectangle); %rename(setClipRectangle4) FXDC::setClipRectangle(FXint x,FXint y,FXint w,FXint h); --- 139,144 ---- class FXRegion; ! %rename(setStippleFromBitmap) FXDC::setStipple(FXBitmap *bitmap,FXint dx=0,FXint dy=0); ! %rename(setStippleFromPattern) FXDC::setStipple(FXStipplePattern pat,FXint dx=0,FXint dy=0); %rename(setClipRectangle1) FXDC::setClipRectangle(const FXRectangle& rectangle); %rename(setClipRectangle4) FXDC::setClipRectangle(FXint x,FXint y,FXint w,FXint h); Index: FXDCWindow.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDCWindow.i,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** FXDCWindow.i 19 Mar 2002 23:18:40 -0000 1.12 --- FXDCWindow.i 8 Jul 2002 13:27:51 -0000 1.12.2.1 *************** *** 29,33 **** class FXVisual; - %ignore FXDCWindow::FXDCWindow(FXDrawable* drawable); %exception FXDCWindow::FXDCWindow "$action FXRbRegisterRubyObj(self, result);"; --- 29,32 ---- *************** *** 62,66 **** }; - %ignore FXRbDCWindow::FXRbDCWindow(FXDrawable* drawable); %exception FXRbDCWindow::FXRbDCWindow "$action FXRbRegisterRubyObj(self, result);"; --- 61,64 ---- Index: FXDialogBox.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDialogBox.i,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** FXDialogBox.i 19 Mar 2002 23:18:40 -0000 1.17 --- FXDialogBox.i 8 Jul 2002 13:27:51 -0000 1.17.2.1 *************** *** 21,25 **** ***********************************************************************/ - %ignore FXDialogBox::FXDialogBox(FXWindow* owner,const FXString& name,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs); %exception FXDialogBox::FXDialogBox "$action FXRbRegisterRubyObj(self, result);"; --- 21,24 ---- *************** *** 57,61 **** }; - %ignore FXRbDialogBox::FXRbDialogBox(FXWindow* owner,const FXString& name,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs); %exception FXRbDialogBox::FXRbDialogBox "$action FXRbRegisterRubyObj(self, result);"; --- 56,59 ---- Index: FXFont.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFont.i,v retrieving revision 1.15.2.2 retrieving revision 1.15.2.3 diff -C2 -d -r1.15.2.2 -r1.15.2.3 *** FXFont.i 24 May 2002 22:20:57 -0000 1.15.2.2 --- FXFont.i 8 Jul 2002 13:27:51 -0000 1.15.2.3 *************** *** 152,158 **** }; - %ignore FXFont::FXFont(FXApp* a,const FXString& face,FXuint sz,FXuint wt,FXuint sl,FXuint enc,FXuint setw,FXuint h); - %ignore FXFont::FXFont(FXApp* a,const FXString& nm); - %exception FXFont::FXFont "$action FXRbRegisterRubyObj(self, result);"; --- 152,155 ---- *************** *** 293,299 **** virtual ~FXFont(); }; - - %ignore FXRbFont::FXRbFont(FXApp* a,const FXString& face,FXuint sz,FXuint wt,FXuint sl,FXuint enc,FXuint setw,FXuint h); - %ignore FXRbFont::FXRbFont(FXApp* a,const FXString& nm); %exception FXRbFont::FXRbFont "$action FXRbRegisterRubyObj(self, result);"; --- 290,293 ---- Index: FXHMat.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHMat.i,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -C2 -d -r1.9.2.2 -r1.9.2.3 *** FXHMat.i 8 May 2002 21:09:55 -0000 1.9.2.2 --- FXHMat.i 8 Jul 2002 13:27:51 -0000 1.9.2.3 *************** *** 21,48 **** ***********************************************************************/ - %ignore FXHMat::FXHMat(); - %ignore FXHMat::FXHMat(FXfloat w); - %ignore FXHMat::FXHMat(const FXHVec& a,const FXHVec& b,const FXHVec& c,const FXHVec& d); - - %rename(rot1) FXHMat::rot(const FXQuat& q); - %rename(rot2) FXHMat::rot(const FXVec& v,FXfloat phi); - %rename(rot3) FXHMat::rot(const FXVec& v,FXfloat c,FXfloat s); - - %rename(xrot1) FXHMat::xrot(FXfloat phi); - %rename(xrot2) FXHMat::xrot(FXfloat c,FXfloat s); - - %rename(yrot1) FXHMat::yrot(FXfloat phi); - %rename(yrot2) FXHMat::yrot(FXfloat c,FXfloat s); - - %rename(zrot1) FXHMat::zrot(FXfloat phi); - %rename(zrot2) FXHMat::zrot(FXfloat c,FXfloat s); - - %rename(trans1) FXHMat::trans(const FXVec& v); - %rename(trans3) FXHMat::trans(FXfloat tx,FXfloat ty,FXfloat tz); - - %rename(scalef) FXHMat::scale(FXfloat s); - %rename(scalev) FXHMat::scale(const FXVec& v); - %rename(scale3) FXHMat::scale(FXfloat sx,FXfloat sy,FXfloat sz); - %exception FXHMat::FXHMat "$action FXRbRegisterRubyObj(self, result);"; --- 21,24 ---- Index: FXHeader.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHeader.i,v retrieving revision 1.30.2.1 retrieving revision 1.30.2.2 diff -C2 -d -r1.30.2.1 -r1.30.2.2 *** FXHeader.i 6 May 2002 19:16:29 -0000 1.30.2.1 --- FXHeader.i 8 Jul 2002 13:27:51 -0000 1.30.2.2 *************** *** 190,194 **** %extend { /// Replace the item with a [possibly subclassed] item ! FXint replaceItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXHeaderItem* oldItem=self->retrieveItem(index); --- 190,194 ---- %extend { /// Replace the item with a [possibly subclassed] item ! FXint replaceItem(FXint index,FXHeaderItem* item,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXHeaderItem* oldItem=self->retrieveItem(index); *************** *** 207,211 **** /// Replace items text, icon, and user-data pointer ! FXint replaceItem2(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXHeaderItem* oldItem=self->retrieveItem(index); --- 207,211 ---- /// Replace items text, icon, and user-data pointer ! FXint replaceItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXHeaderItem* oldItem=self->retrieveItem(index); *************** *** 225,229 **** %extend { /// Insert a new [possibly subclassed] item at the given index ! FXint insertItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem))) ((FXRbHeaderItem*)item)->owned=TRUE; --- 225,229 ---- %extend { /// Insert a new [possibly subclassed] item at the given index ! FXint insertItem(FXint index,FXHeaderItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem))) ((FXRbHeaderItem*)item)->owned=TRUE; *************** *** 233,241 **** /// Insert item at index with given text, icon, and user-data pointer ! %name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Append a [possibly subclassed] item to the list ! FXint appendItem1(FXHeaderItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem))) ((FXRbHeaderItem*)item)->owned=TRUE; --- 233,241 ---- /// Insert item at index with given text, icon, and user-data pointer ! FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Append a [possibly subclassed] item to the list ! FXint appendItem(FXHeaderItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem))) ((FXRbHeaderItem*)item)->owned=TRUE; *************** *** 245,253 **** /// Append new item with given text and optional icon, and user-data pointer ! %name(appendItem2) FXint appendItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Prepend a [possibly subclassed] item to the list ! FXint prependItem1(FXHeaderItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem))) ((FXRbHeaderItem*)item)->owned=TRUE; --- 245,253 ---- /// Append new item with given text and optional icon, and user-data pointer ! FXint appendItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Prepend a [possibly subclassed] item to the list ! FXint prependItem(FXHeaderItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbHeaderItem))) ((FXRbHeaderItem*)item)->owned=TRUE; *************** *** 257,261 **** /// Prepend new item with given text and optional icon, and user-data pointer ! %name(prependItem2) FXint prependItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE); #endif --- 257,261 ---- /// Prepend new item with given text and optional icon, and user-data pointer ! FXint prependItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE); #endif *************** *** 265,269 **** /// Replace items text, icon, and user-data pointer ! %name(replaceItem2) FXint replaceItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE); /// Insert a new [possibly subclassed] item at the give index --- 265,269 ---- /// Replace items text, icon, and user-data pointer ! FXint replaceItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE); /// Insert a new [possibly subclassed] item at the give index *************** *** 271,275 **** /// Insert item at index with given text, icon, and user-data pointer ! %name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE); /// Append a [possibly subclassed] item to the list --- 271,275 ---- /// Insert item at index with given text, icon, and user-data pointer ! FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE); /// Append a [possibly subclassed] item to the list *************** *** 277,281 **** /// Append new item with given text and optional icon, and user-data pointer ! %name(appendItem2) FXint appendItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE); /// Prepend a [possibly subclassed] item to the list --- 277,281 ---- /// Append new item with given text and optional icon, and user-data pointer ! FXint appendItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE); /// Prepend a [possibly subclassed] item to the list *************** *** 283,287 **** /// Prepend new item with given text and optional icon, and user-data pointer ! %name(prependItem2) FXint prependItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE); #endif --- 283,287 ---- /// Prepend new item with given text and optional icon, and user-data pointer ! FXint prependItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ptr=NULL,FXbool notify=FALSE); #endif Index: FXIconList.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIconList.i,v retrieving revision 1.34.2.1 retrieving revision 1.34.2.2 diff -C2 -d -r1.34.2.1 -r1.34.2.2 *** FXIconList.i 6 May 2002 19:16:29 -0000 1.34.2.1 --- FXIconList.i 8 Jul 2002 13:27:51 -0000 1.34.2.2 *************** *** 281,285 **** %extend { /// Replace the item with a [possibly subclassed] item ! FXint replaceItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXIconItem* oldItem=self->retrieveItem(index); --- 281,285 ---- %extend { /// Replace the item with a [possibly subclassed] item ! FXint replaceItem(FXint index,FXIconItem* item,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXIconItem* oldItem=self->retrieveItem(index); *************** *** 298,302 **** /// Replace items text, icons, and user-data pointer ! FXint replaceItem2(FXint index,const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXIconItem* oldItem=self->retrieveItem(index); --- 298,302 ---- /// Replace items text, icons, and user-data pointer ! FXint replaceItem(FXint index,const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXIconItem* oldItem=self->retrieveItem(index); *************** *** 316,320 **** %extend { /// Insert a new [possibly subclassed] item at the give index ! FXint insertItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbIconItem))) ((FXRbIconItem*)item)->owned=TRUE; --- 316,320 ---- %extend { /// Insert a new [possibly subclassed] item at the give index ! FXint insertItem(FXint index,FXIconItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbIconItem))) ((FXRbIconItem*)item)->owned=TRUE; *************** *** 324,332 **** /// Insert item at index with given text, icons, and user-data pointer ! %name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Append a [possibly subclassed] item to the end of the list ! FXint appendItem1(FXIconItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbIconItem))) ((FXRbIconItem*)item)->owned=TRUE; --- 324,332 ---- /// Insert item at index with given text, icons, and user-data pointer ! FXint insertItem(FXint index,const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Append a [possibly subclassed] item to the end of the list ! FXint appendItem(FXIconItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbIconItem))) ((FXRbIconItem*)item)->owned=TRUE; *************** *** 336,344 **** /// Append new item with given text and optional icons, and user-data pointer ! %name(appendItem2) FXint appendItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Append a [possibly subclassed] item to the end of the list ! FXint prependItem1(FXIconItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbIconItem))) ((FXRbIconItem*)item)->owned=TRUE; --- 336,344 ---- /// Append new item with given text and optional icons, and user-data pointer ! FXint appendItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Append a [possibly subclassed] item to the end of the list ! FXint prependItem(FXIconItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbIconItem))) ((FXRbIconItem*)item)->owned=TRUE; *************** *** 348,352 **** /// Append new item with given text and optional icons, and user-data pointer ! %name(prependItem2) FXint prependItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { --- 348,352 ---- /// Append new item with given text and optional icons, and user-data pointer ! FXint prependItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { Index: FXList.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXList.i,v retrieving revision 1.36.2.1 retrieving revision 1.36.2.2 diff -C2 -d -r1.36.2.1 -r1.36.2.2 *** FXList.i 6 May 2002 19:16:29 -0000 1.36.2.1 --- FXList.i 8 Jul 2002 13:27:51 -0000 1.36.2.2 *************** *** 216,220 **** %extend { /// Replace the item with a [possibly subclassed] item ! FXint replaceItem1(FXint index,FXListItem* item,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXListItem* oldItem=self->retrieveItem(index); --- 216,220 ---- %extend { /// Replace the item with a [possibly subclassed] item ! FXint replaceItem(FXint index,FXListItem* item,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXListItem* oldItem=self->retrieveItem(index); *************** *** 233,237 **** /// Replace item's text, icon, and user-data pointer ! FXint replaceItem2(FXint index,const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXListItem* oldItem=self->retrieveItem(index); --- 233,237 ---- /// Replace item's text, icon, and user-data pointer ! FXint replaceItem(FXint index,const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE){ // Save pointer to the soon-to-be-destroyed item FXListItem* oldItem=self->retrieveItem(index); *************** *** 250,254 **** %extend { /// Insert a new [possibly subclassed] item at the give index ! FXint insertItem1(FXint index,FXListItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbListItem))) ((FXRbListItem*)item)->owned=TRUE; --- 250,254 ---- %extend { /// Insert a new [possibly subclassed] item at the give index ! FXint insertItem(FXint index,FXListItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbListItem))) ((FXRbListItem*)item)->owned=TRUE; *************** *** 258,266 **** /// Insert item at index with given text, icon, and user-data pointer ! %name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Append a [possibly subclassed] item to the list ! FXint appendItem1(FXListItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbListItem))) ((FXRbListItem*)item)->owned=TRUE; --- 258,266 ---- /// Insert item at index with given text, icon, and user-data pointer ! FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Append a [possibly subclassed] item to the list ! FXint appendItem(FXListItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbListItem))) ((FXRbListItem*)item)->owned=TRUE; *************** *** 270,278 **** /// Append new item with given text and optional icon, and user-data pointer ! %name(appendItem2) FXint appendItem(const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Prepend a [possibly subclassed] item to the list ! FXint prependItem1(FXListItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbListItem))) ((FXRbListItem*)item)->owned=TRUE; --- 270,278 ---- /// Append new item with given text and optional icon, and user-data pointer ! FXint appendItem(const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); %extend { /// Prepend a [possibly subclassed] item to the list ! FXint prependItem(FXListItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbListItem))) ((FXRbListItem*)item)->owned=TRUE; *************** *** 282,300 **** /// Prepend new item with given text and optional icon, and user-data pointer ! %name(prependItem2) FXint prependItem(const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); #endif #ifdef SWIGPYTHON FXint insertItem(FXint index,FXListItem* item,FXbool notify=FALSE); ! %name(insertItemStr) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,void* ptr=NULL,FXbool notify=FALSE); FXint replaceItem(FXint index,FXListItem* item,FXbool notify=FALSE); ! %name(replaceItemStr) FXint replaceItem(FXint index,const FXString& text,FXIcon *icon=NULL,void* ptr=NULL,FXbool notify=FALSE); FXint appendItem(FXListItem* item,FXbool notify=FALSE); ! %name(appendItemStr) FXint appendItem(const FXString& text,FXIcon *icon=NULL,void* ptr=NULL,FXbool notify=FALSE); FXint prependItem(FXListItem* item,FXbool notify=FALSE); ! %name(prependItemStr) FXint prependItem(const FXString& text,FXIcon *icon=NULL,void* ptr=NULL,FXbool notify=FALSE); #endif --- 282,300 ---- /// Prepend new item with given text and optional icon, and user-data pointer ! FXint prependItem(const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); #endif #ifdef SWIGPYTHON FXint insertItem(FXint index,FXListItem* item,FXbool notify=FALSE); ! FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,void* ptr=NULL,FXbool notify=FALSE); FXint replaceItem(FXint index,FXListItem* item,FXbool notify=FALSE); ! FXint replaceItem(FXint index,const FXString& text,FXIcon *icon=NULL,void* ptr=NULL,FXbool notify=FALSE); FXint appendItem(FXListItem* item,FXbool notify=FALSE); ! FXint appendItem(const FXString& text,FXIcon *icon=NULL,void* ptr=NULL,FXbool notify=FALSE); FXint prependItem(FXListItem* item,FXbool notify=FALSE); ! FXint prependItem(const FXString& text,FXIcon *icon=NULL,void* ptr=NULL,FXbool notify=FALSE); #endif Index: FXMenubar.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXMenubar.i,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -d -r1.14 -r1.14.2.1 *** FXMenubar.i 19 Mar 2002 23:18:40 -0000 1.14 --- FXMenubar.i 8 Jul 2002 13:27:51 -0000 1.14.2.1 *************** *** 21,26 **** ***********************************************************************/ - %ignore FXMenubar::FXMenubar(FXComposite* p,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs); - %exception FXMenubar::FXMenubar "$action FXRbRegisterRubyObj(self, result);"; --- 21,24 ---- *************** *** 55,59 **** }; - %ignore FXRbMenubar::FXRbMenubar(FXComposite* p,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs); %exception FXRbMenubar::FXRbMenubar "$action FXRbRegisterRubyObj(self, result);"; --- 53,56 ---- Index: FXMessageBox.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXMessageBox.i,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -C2 -d -r1.16 -r1.16.2.1 *** FXMessageBox.i 19 Mar 2002 23:18:40 -0000 1.16 --- FXMessageBox.i 8 Jul 2002 13:27:51 -0000 1.16.2.1 *************** *** 42,47 **** }; - %ignore FXMessageBox::FXMessageBox(FXApp* a,const FXString& caption,const FXString& text,FXIcon* ic,FXuint opts,FXint x,FXint y); - %exception FXMessageBox::FXMessageBox "$action FXRbRegisterRubyObj(self, result);"; --- 42,45 ---- *************** *** 111,116 **** #endif - - %ignore FXRbMessageBox::FXRbMessageBox(FXApp* a,const FXString& caption,const FXString& text,FXIcon* ic,FXuint opts,FXint x,FXint y); %exception FXRbMessageBox::FXRbMessageBox "$action FXRbRegisterRubyObj(self, result);"; --- 109,112 ---- Index: FXRange.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXRange.i,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -C2 -d -r1.11.2.2 -r1.11.2.3 *** FXRange.i 24 May 2002 16:24:29 -0000 1.11.2.2 --- FXRange.i 8 Jul 2002 13:27:51 -0000 1.11.2.3 *************** *** 52,65 **** }; - // Do not wrap default constructor - %ignore FXRange::FXRange(); - // Rename these methods %rename("empty?") FXRange::empty() const; %rename("overlaps?") FXRange::overlap(const FXRange& box) const; %rename("contains?") FXRange::contains(FXfloat x,FXfloat y,FXfloat z) const; - %rename("includeRange") FXRange::include(const FXRange& box); - %rename("includePoint") FXRange::include(FXfloat x,FXfloat y,FXfloat z); - %rename("includeVec") FXRange::include(const FXVec& v); %rename("intersects?") FXRange::intersects(const FXVec& u,const FXVec& v) const; --- 52,59 ---- *************** *** 76,80 **** // Initialize ! FXRange(FXfloat xlo=0.0f,FXfloat xhi=0.0f,FXfloat ylo=0.0f,FXfloat yhi=0.0f,FXfloat zlo=0.0f,FXfloat zhi=0.0f); // Length of side i --- 70,74 ---- // Initialize ! FXRange(FXfloat xlo,FXfloat xhi,FXfloat ylo,FXfloat yhi,FXfloat zlo,FXfloat zhi); // Length of side i Index: FXRegion.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXRegion.i,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -C2 -d -r1.6.2.3 -r1.6.2.4 *** FXRegion.i 8 May 2002 21:43:44 -0000 1.6.2.3 --- FXRegion.i 8 Jul 2002 13:27:51 -0000 1.6.2.4 *************** *** 21,30 **** ***********************************************************************/ - %ignore FXRegion::FXRegion(); %ignore FXRegion::operator=(const FXRegion& r); %rename("empty?") FXRegion::empty() const; - %rename("containsPoint?") FXRegion::contains(FXint x,FXint y) const; - %rename("containsRectangle?") FXRegion::contains(FXint x,FXint y,FXint w,FXint h) const; %exception FXRegion::FXRegion "$action FXRbRegisterRubyObj(self, result);"; --- 21,27 ---- Index: FXShell.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXShell.i,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -C2 -d -r1.12.2.1 -r1.12.2.2 *** FXShell.i 13 Jun 2002 15:06:55 -0000 1.12.2.1 --- FXShell.i 8 Jul 2002 13:27:51 -0000 1.12.2.2 *************** *** 41,47 **** }; - // Don't attempt to wrap this overloaded constructor - %ignore FXRbShell::FXRbShell(FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h); - %exception FXRbShell::FXRbShell "$action FXRbRegisterRubyObj(self, result);"; --- 41,44 ---- Index: FXSplitter.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXSplitter.i,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -C2 -d -r1.16 -r1.16.2.1 *** FXSplitter.i 19 Mar 2002 23:18:40 -0000 1.16 --- FXSplitter.i 8 Jul 2002 13:27:51 -0000 1.16.2.1 *************** *** 31,36 **** - %ignore FXSplitter::FXSplitter(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h); - %exception FXSplitter::FXSplitter "$action FXRbRegisterRubyObj(self, result);"; --- 31,34 ---- *************** *** 100,105 **** virtual ~FXSplitter(); }; - - %ignore FXRbSplitter::FXRbSplitter(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h); %exception FXRbSplitter::FXRbSplitter "$action FXRbRegisterRubyObj(self, result);"; --- 98,101 ---- Index: FXToolbar.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXToolbar.i,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -C2 -d -r1.19 -r1.19.2.1 *** FXToolbar.i 19 Mar 2002 23:18:40 -0000 1.19 --- FXToolbar.i 8 Jul 2002 13:27:51 -0000 1.19.2.1 *************** *** 21,26 **** ***********************************************************************/ - %ignore FXToolbar::FXToolbar(FXComposite* p,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs); - %exception FXToolbar::FXToolbar "$action FXRbRegisterRubyObj(self, result);"; --- 21,24 ---- *************** *** 124,129 **** virtual ~FXToolbar(); }; - - %ignore FXRbToolbar::FXRbToolbar(FXComposite* p,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs); %exception FXRbToolbar::FXRbToolbar "$action FXRbRegisterRubyObj(self, result);"; --- 122,125 ---- Index: FXTopWindow.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTopWindow.i,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -C2 -d -r1.17.2.1 -r1.17.2.2 *** FXTopWindow.i 13 Jun 2002 15:06:55 -0000 1.17.2.1 --- FXTopWindow.i 8 Jul 2002 13:27:51 -0000 1.17.2.2 *************** *** 166,172 **** }; - // Don't try to wrap this overloaded constructor - %ignore FXRbTopWindow::FXRbTopWindow(FXWindow* owner,const FXString& name,FXIcon *ic,FXIcon *mi,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs); - %exception FXRbTopWindow::FXRbTopWindow "$action FXRbRegisterRubyObj(self, result);"; --- 166,169 ---- Index: FXTreeList.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTreeList.i,v retrieving revision 1.33.2.1 retrieving revision 1.33.2.2 diff -C2 -d -r1.33.2.1 -r1.33.2.2 *** FXTreeList.i 6 May 2002 19:16:29 -0000 1.33.2.1 --- FXTreeList.i 8 Jul 2002 13:27:51 -0000 1.33.2.2 *************** *** 160,168 **** }; - %rename(addItemFirst2) FXTreeList::addItemFirst(FXTreeItem* p,const FXString& text,FXIcon* oi,FXIcon* ci,void* ITEMDATA,FXbool notify); - %rename(addItemLast2) FXTreeList::addItemLast(FXTreeItem* p,const FXString& text,FXIcon* oi,FXIcon* ci,void* ITEMDATA,FXbool notify); - %rename(addItemAfter2) FXTreeList::addItemAfter(FXTreeItem* other,const FXString& text,FXIcon* oi,FXIcon* ci,void* ITEMDATA,FXbool notify); - %rename(addItemBefore2) FXTreeList::addItemBefore(FXTreeItem* other,const FXString& text,FXIcon* oi,FXIcon* ci,void* ITEMDATA,FXbool notify); - %exception FXTreeList::FXTreeList "$action FXRbRegisterRubyObj(self, result);"; --- 160,163 ---- *************** *** 258,262 **** %extend { /// Prepend new [possibly subclassed] item as first child of p ! FXTreeItem* addItemFirst1(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; --- 253,257 ---- %extend { /// Prepend new [possibly subclassed] item as first child of p ! FXTreeItem* addItemFirst(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; *************** *** 270,274 **** %extend { /// Append new [possibly subclassed] item as last child of p ! FXTreeItem* addItemLast1(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; --- 265,269 ---- %extend { /// Append new [possibly subclassed] item as last child of p ! FXTreeItem* addItemLast(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; *************** *** 282,286 **** %extend { /// Append new [possibly subclassed] item after to other item ! FXTreeItem* addItemAfter1(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; --- 277,281 ---- %extend { /// Append new [possibly subclassed] item after to other item ! FXTreeItem* addItemAfter(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; *************** *** 294,298 **** %extend { /// Prepend new [possibly subclassed] item prior to other item ! FXTreeItem* addItemBefore1(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; --- 289,293 ---- %extend { /// Prepend new [possibly subclassed] item prior to other item ! FXTreeItem* addItemBefore(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; Index: FXTreeListBox.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTreeListBox.i,v retrieving revision 1.27.2.1 retrieving revision 1.27.2.2 diff -C2 -d -r1.27.2.1 -r1.27.2.2 *** FXTreeListBox.i 6 May 2002 19:16:29 -0000 1.27.2.1 --- FXTreeListBox.i 8 Jul 2002 13:27:51 -0000 1.27.2.2 *************** *** 81,85 **** %extend { /// Add item as first child of parent p ! FXTreeItem* addItemFirst1(FXTreeItem* p,FXTreeItem* item,void* dummy=NULL){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; --- 81,85 ---- %extend { /// Add item as first child of parent p ! FXTreeItem* addItemFirst(FXTreeItem* p,FXTreeItem* item,void* dummy=NULL){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; *************** *** 88,92 **** /// Add item as last child after parent p ! FXTreeItem* addItemLast1(FXTreeItem* p,FXTreeItem* item,void* dummy=NULL){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; --- 88,92 ---- /// Add item as last child after parent p ! FXTreeItem* addItemLast(FXTreeItem* p,FXTreeItem* item,void* dummy=NULL){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; *************** *** 95,99 **** /// Add item after other item ! FXTreeItem* addItemAfter1(FXTreeItem* other,FXTreeItem* item,void* dummy=NULL){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; --- 95,99 ---- /// Add item after other item ! FXTreeItem* addItemAfter(FXTreeItem* other,FXTreeItem* item,void* dummy=NULL){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; *************** *** 102,106 **** /// Add item before other item ! FXTreeItem* addItemBefore1(FXTreeItem* other,FXTreeItem* item,void* dummy=NULL){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; --- 102,106 ---- /// Add item before other item ! FXTreeItem* addItemBefore(FXTreeItem* other,FXTreeItem* item,void* dummy=NULL){ if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))) ((FXRbTreeItem*)item)->owned=TRUE; *************** *** 110,123 **** /// Add item as first child of parent p ! %name(addItemFirst2) FXTreeItem* addItemFirst(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL); /// Add item as last child of parent p ! %name(addItemLast2) FXTreeItem* addItemLast(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL); /// Add item after other item ! %name(addItemAfter2) FXTreeItem* addItemAfter(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL); /// Add item before other item ! %name(addItemBefore2) FXTreeItem* addItemBefore(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL); /// Remove item --- 110,123 ---- /// Add item as first child of parent p ! FXTreeItem* addItemFirst(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL); /// Add item as last child of parent p ! FXTreeItem* addItemLast(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL); /// Add item after other item ! FXTreeItem* addItemAfter(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL); /// Add item before other item ! FXTreeItem* addItemBefore(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL); /// Remove item Index: FXWindow.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXWindow.i,v retrieving revision 1.32.2.3 retrieving revision 1.32.2.4 diff -C2 -d -r1.32.2.3 -r1.32.2.4 *** FXWindow.i 13 Jun 2002 15:06:55 -0000 1.32.2.3 --- FXWindow.i 8 Jul 2002 13:27:51 -0000 1.32.2.4 *************** *** 84,94 **** - // Rename these methods - %rename(updateArea) FXWindow::update(FXint x,FXint y,FXint w,FXint h); - %rename(updateWindow) FXWindow::update(); - %rename(repaintArea) FXWindow::repaint(FXint x,FXint y,FXint w,FXint h); - %rename(repaintWindow) FXWindow::repaint(); - - /// Base class for all windows class FXWindow : public FXDrawable { --- 84,87 ---- Index: typemaps.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/typemaps.i,v retrieving revision 1.35.2.7 retrieving revision 1.35.2.8 diff -C2 -d -r1.35.2.7 -r1.35.2.8 *** typemaps.i 5 Jul 2002 22:11:17 -0000 1.35.2.7 --- typemaps.i 8 Jul 2002 13:27:51 -0000 1.35.2.8 *************** *** 25,28 **** --- 25,33 ---- ***********************************************************************/ + /* Type-checking rules */ + %typecheck(5) const FXString& { + $1 = (NIL_P($input) || TYPE($input) == T_STRING) ? 1 : 0; + } + /* Convert Ruby VALUE to VALUE */ %typemap(ruby, out) VALUE "$result = $1;"; |