[Fxruby-commits] CVS: FXRuby/swig-interfaces FXApp.i,1.38.2.4,1.38.2.5 FXColorSelector.i,1.15,1.15.2
Status: Inactive
Brought to you by:
lyle
Update of /cvsroot/fxruby/FXRuby/swig-interfaces In directory usw-pr-cvs1:/tmp/cvs-serv29682/swig-interfaces Modified Files: Tag: release10 FXApp.i FXColorSelector.i FXComboBox.i FXDC.i FXDebugTarget.i FXDial.i FXDict.i FXFileDialog.i FXFileDict.i FXFileSelector.i FXFont.i FXFontDialog.i FXFontSelector.i FXGLObject.i FXGLShape.i FXGLViewer.i FXHMat.i FXHVec.i FXHeader.i FXIconList.i FXId.i FXImage.i FXInputDialog.i FXList.i FXListBox.i FXPrintDialog.i FXQuat.i FXRange.i FXRegion.i FXScintilla.i FXScrollArea.i FXSlider.i FXSpinner.i FXStatusline.i FXStream.i FXTable.i FXText.i FXTreeList.i FXTreeListBox.i FXVec.i FXWindow.i Log Message: Replaced %addmethods directives with %extend in a number of SWIG interface files. Fixed the default argument values for FXIconDict and FXRbIconDict constructors (in FXFileDict.i) from "FXIconDict::defaultIconPath" to just "defaultIconPath"; otherwise SWIG expands this incorrectly. Index: FXApp.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXApp.i,v retrieving revision 1.38.2.4 retrieving revision 1.38.2.5 diff -C2 -d -r1.38.2.4 -r1.38.2.5 *** FXApp.i 1 May 2002 14:18:06 -0000 1.38.2.4 --- FXApp.i 6 May 2002 19:16:29 -0000 1.38.2.5 *************** *** 145,149 **** #ifdef SWIGRUBY ! %addmethods { // Copyright notice for library static VALUE copyright() { --- 145,149 ---- #ifdef SWIGRUBY ! %extend { // Copyright notice for library static VALUE copyright() { *************** *** 221,225 **** FXChore* removeChore(FXChore *c); ! %addmethods { /** * Add signal processing message to be sent to target object when --- 221,225 ---- FXChore* removeChore(FXChore *c); ! %extend { /** * Add signal processing message to be sent to target object when *************** *** 390,394 **** */ // virtual void init(int& argc,char** argv,FXbool connect=TRUE); ! %addmethods { void init(VALUE arr,FXbool connect=TRUE) { int i; --- 390,394 ---- */ // virtual void init(int& argc,char** argv,FXbool connect=TRUE); ! %extend { void init(VALUE arr,FXbool connect=TRUE) { int i; Index: FXColorSelector.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXColorSelector.i,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** FXColorSelector.i 19 Mar 2002 23:18:40 -0000 1.15 --- FXColorSelector.i 6 May 2002 19:16:29 -0000 1.15.2.1 *************** *** 61,65 **** protected: #ifdef 0 ! %addmethods { // Returns a read-only array of the names, which isn't quite right :( static VALUE wellname() { --- 61,65 ---- protected: #ifdef 0 ! %extend { // Returns a read-only array of the names, which isn't quite right :( static VALUE wellname() { Index: FXComboBox.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXComboBox.i,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -C2 -d -r1.23 -r1.23.2.1 *** FXComboBox.i 19 Mar 2002 23:18:40 -0000 1.23 --- FXComboBox.i 6 May 2002 19:16:29 -0000 1.23.2.1 *************** *** 134,138 **** FXString getItemText(FXint index) const; ! %addmethods { /// Set data pointer for specified item void setItemData(FXint index, VALUE ptr) { --- 134,138 ---- FXString getItemText(FXint index) const; ! %extend { /// Set data pointer for specified item void setItemData(FXint index, VALUE ptr) { Index: FXDC.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDC.i,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -C2 -d -r1.21 -r1.21.2.1 *** FXDC.i 3 Apr 2002 21:40:57 -0000 1.21 --- FXDC.i 6 May 2002 19:16:29 -0000 1.21.2.1 *************** *** 204,208 **** virtual void drawLine(FXint x1,FXint y1,FXint x2,FXint y2); #ifdef SWIGPYTHON ! %addmethods { // points is assumed to be a list of (x, y) tuples void drawLines(PyObject* pointlist){ --- 204,208 ---- virtual void drawLine(FXint x1,FXint y1,FXint x2,FXint y2); #ifdef SWIGPYTHON ! %extend { // points is assumed to be a list of (x, y) tuples void drawLines(PyObject* pointlist){ *************** *** 312,316 **** virtual void setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength); ! %addmethods { /// Get dash pattern VALUE getDashPattern() const { --- 312,316 ---- virtual void setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength); ! %extend { /// Get dash pattern VALUE getDashPattern() const { Index: FXDebugTarget.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDebugTarget.i,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** FXDebugTarget.i 19 Mar 2002 23:18:40 -0000 1.12 --- FXDebugTarget.i 6 May 2002 19:16:29 -0000 1.12.2.1 *************** *** 35,39 **** public: #ifdef SWIGRUBY ! %addmethods { static VALUE messageTypeName() { VALUE messageTypeNames = rb_ary_new(); --- 35,39 ---- public: #ifdef SWIGRUBY ! %extend { static VALUE messageTypeName() { VALUE messageTypeNames = rb_ary_new(); Index: FXDial.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDial.i,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** FXDial.i 19 Mar 2002 23:18:40 -0000 1.17 --- FXDial.i 6 May 2002 19:16:29 -0000 1.17.2.1 *************** *** 81,85 **** #ifdef SWIGRUBY ! %addmethods { /// Obtain the current range of the dial VALUE getRange() const { --- 81,85 ---- #ifdef SWIGRUBY ! %extend { /// Obtain the current range of the dial VALUE getRange() const { *************** *** 94,98 **** #endif #ifdef SWIGPYTHON ! %addmethods { PyObject* getRange() const { FXint lo,hi; --- 94,98 ---- #endif #ifdef SWIGPYTHON ! %extend { PyObject* getRange() const { FXint lo,hi; Index: FXDict.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDict.i,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** FXDict.i 19 Mar 2002 23:18:40 -0000 1.17 --- FXDict.i 6 May 2002 19:16:29 -0000 1.17.2.1 *************** *** 110,114 **** #ifdef SWIGRUBY ! %addmethods { // Returns a new array populated with the keys from this hash VALUE keys() const { --- 110,114 ---- #ifdef SWIGRUBY ! %extend { // Returns a new array populated with the keys from this hash VALUE keys() const { *************** *** 118,122 **** } ! %addmethods { // Returns true if the given key is present FXbool has_key(const FXchar* ky) { --- 118,122 ---- } ! %extend { // Returns true if the given key is present FXbool has_key(const FXchar* ky) { *************** *** 125,129 **** } ! %addmethods { // Returns true if hash contains no key-value pairs FXbool empty() const { --- 125,129 ---- } ! %extend { // Returns true if hash contains no key-value pairs FXbool empty() const { Index: FXFileDialog.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileDialog.i,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -C2 -d -r1.16 -r1.16.2.1 *** FXFileDialog.i 19 Mar 2002 23:18:40 -0000 1.16 --- FXFileDialog.i 6 May 2002 19:16:29 -0000 1.16.2.1 *************** *** 43,47 **** #ifdef SWIGRUBY ! %addmethods { // Return list of selected file names. VALUE getFilenames() const { --- 43,47 ---- #ifdef SWIGRUBY ! %extend { // Return list of selected file names. VALUE getFilenames() const { *************** *** 60,64 **** } #else ! %addmethods { PyObject* getFilenames() const { FXString* filenames=self->getFilenames(); --- 60,64 ---- } #else ! %extend { PyObject* getFilenames() const { FXString* filenames=self->getFilenames(); *************** *** 104,108 **** */ #ifdef SWIGRUBY ! %addmethods { // Takes an array of strings as described above void setPatternList(VALUE ary) { --- 104,108 ---- */ #ifdef SWIGRUBY ! %extend { // Takes an array of strings as described above void setPatternList(VALUE ary) { *************** *** 189,193 **** #ifdef SWIGRUBY ! %addmethods { // Open multiple existing files static VALUE getOpenFilenames(FXWindow* owner, --- 189,193 ---- #ifdef SWIGRUBY ! %extend { // Open multiple existing files static VALUE getOpenFilenames(FXWindow* owner, Index: FXFileDict.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileDict.i,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -C2 -d -r1.19 -r1.19.2.1 *** FXFileDict.i 28 Mar 2002 16:32:52 -0000 1.19 --- FXFileDict.i 6 May 2002 19:16:29 -0000 1.19.2.1 *************** *** 45,49 **** virtual void deleteData(void*); public: ! %addmethods { /// Default icon search path static VALUE defaultIconPath(){ --- 45,49 ---- virtual void deleteData(void*); public: ! %extend { /// Default icon search path static VALUE defaultIconPath(){ *************** *** 55,59 **** /// Construct an icon dictionary, with given path ! FXIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath); /// Get application --- 55,60 ---- /// Construct an icon dictionary, with given path ! // FXIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath); ! FXIconDict(FXApp* a,const FXString& p=defaultIconPath); /// Get application *************** *** 84,88 **** public: // Construct an icon dictionary, with given path ! FXRbIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath); // Destructor --- 85,90 ---- public: // Construct an icon dictionary, with given path ! // FXRbIconDict(FXApp* a,const FXString& p=FXIconDict::defaultIconPath); ! FXRbIconDict(FXApp* a,const FXString& p=defaultIconPath); // Destructor *************** *** 106,110 **** public: #ifdef SWIGRUBY ! %addmethods { /// Registry key used to find fallback executable icons static VALUE defaultExecBinding(){ --- 108,112 ---- public: #ifdef SWIGRUBY ! %extend { /// Registry key used to find fallback executable icons static VALUE defaultExecBinding(){ Index: FXFileSelector.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileSelector.i,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -C2 -d -r1.19 -r1.19.2.1 *** FXFileSelector.i 19 Mar 2002 23:18:40 -0000 1.19 --- FXFileSelector.i 6 May 2002 19:16:29 -0000 1.19.2.1 *************** *** 131,135 **** #ifdef SWIGRUBY ! %addmethods { // Return list of selected file names. VALUE getFilenames() const { --- 131,135 ---- #ifdef SWIGRUBY ! %extend { // Return list of selected file names. VALUE getFilenames() const { *************** *** 149,153 **** #endif #ifdef SWIGPYTHON ! %addmethods { PyObject* getFilenames() const { FXString* filenames=self->getFilenames(); --- 149,153 ---- #endif #ifdef SWIGPYTHON ! %extend { PyObject* getFilenames() const { FXString* filenames=self->getFilenames(); *************** *** 193,197 **** */ #ifdef SWIGRUBY ! %addmethods { // Takes an array of strings as described above void setPatternList(VALUE ary) { --- 193,197 ---- */ #ifdef SWIGRUBY ! %extend { // Takes an array of strings as described above void setPatternList(VALUE ary) { Index: FXFont.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFont.i,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** FXFont.i 19 Mar 2002 23:18:40 -0000 1.15 --- FXFont.i 6 May 2002 19:16:29 -0000 1.15.2.1 *************** *** 207,211 **** FXuint getHints() const; ! %addmethods { // Get font description FXFontDesc getFontDesc() const { --- 207,211 ---- FXuint getHints() const; ! %extend { // Get font description FXFontDesc getFontDesc() const { *************** *** 255,259 **** FXint getFontSpacing() const; ! %addmethods { // Calculate width of given text in this font FXint getTextWidth(const FXchar *text) const { --- 255,259 ---- FXint getFontSpacing() const; ! %extend { // Calculate width of given text in this font FXint getTextWidth(const FXchar *text) const { *************** *** 269,273 **** #ifdef SWIGRUBY ! %addmethods { // List all fonts matching hints (returns an array of FXFontDesc objects) static FXbool listFonts(const FXString& face, --- 269,273 ---- #ifdef SWIGRUBY ! %extend { // List all fonts matching hints (returns an array of FXFontDesc objects) static FXbool listFonts(const FXString& face, Index: FXFontDialog.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFontDialog.i,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** FXFontDialog.i 19 Mar 2002 23:18:40 -0000 1.12 --- FXFontDialog.i 6 May 2002 19:16:29 -0000 1.12.2.1 *************** *** 39,43 **** #ifdef SWIGRUBY ! %addmethods { /// Get the current font selection FXFontDesc getFontSelection() const { --- 39,43 ---- #ifdef SWIGRUBY ! %extend { /// Get the current font selection FXFontDesc getFontSelection() const { *************** *** 48,52 **** } #else ! %addmethods { %new FXFontDesc* getFontSelection() const { FXFontDesc* fontdesc = new FXFontDesc; --- 48,52 ---- } #else ! %extend { %new FXFontDesc* getFontSelection() const { FXFontDesc* fontdesc = new FXFontDesc; Index: FXFontSelector.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFontSelector.i,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** FXFontSelector.i 19 Mar 2002 23:18:40 -0000 1.12 --- FXFontSelector.i 6 May 2002 19:16:29 -0000 1.12.2.1 *************** *** 106,110 **** #ifdef SWIGRUBY ! %addmethods { /// Get font selection FXFontDesc getFontSelection() const { --- 106,110 ---- #ifdef SWIGRUBY ! %extend { /// Get font selection FXFontDesc getFontSelection() const { *************** *** 115,119 **** } #else ! %addmethods { %new FXFontDesc* getFontSelection() const { FXFontDesc* fontdesc = new FXFontDesc; --- 115,119 ---- } #else ! %extend { %new FXFontDesc* getFontSelection() const { FXFontDesc* fontdesc = new FXFontDesc; Index: FXGLObject.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLObject.i,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -C2 -d -r1.23 -r1.23.2.1 *** FXGLObject.i 2 Apr 2002 03:44:27 -0000 1.23 --- FXGLObject.i 6 May 2002 19:16:29 -0000 1.23.2.1 *************** *** 43,47 **** #ifdef SWIGRUBY /// Called by the viewer to get bounds for this object ! %addmethods { FXRange bounds() { FXRange box; --- 43,47 ---- #ifdef SWIGRUBY /// Called by the viewer to get bounds for this object ! %extend { FXRange bounds() { FXRange box; *************** *** 51,55 **** } #else ! %addmethods { // Called by the viewer to get bounds for this object FXRange* bounds(FXRange& box) { --- 51,55 ---- } #else ! %extend { // Called by the viewer to get bounds for this object FXRange* bounds(FXRange& box) { *************** *** 131,135 **** FXGLObject* child(FXint pos) const; ! %addmethods { /// Insert child object at given position void insert(FXint pos,FXGLObject* obj){ --- 131,135 ---- FXGLObject* child(FXint pos) const; ! %extend { /// Insert child object at given position void insert(FXint pos,FXGLObject* obj){ Index: FXGLShape.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLShape.i,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** FXGLShape.i 2 Apr 2002 03:44:27 -0000 1.17 --- FXGLShape.i 6 May 2002 19:16:29 -0000 1.17.2.1 *************** *** 107,111 **** #ifdef SWIGRUBY ! %addmethods { // Get the material for specified side (where side = 0 or 1) FXMaterial getMaterial(FXint side) const { --- 107,111 ---- #ifdef SWIGRUBY ! %extend { // Get the material for specified side (where side = 0 or 1) FXMaterial getMaterial(FXint side) const { *************** *** 116,120 **** } #else ! %addmethods { %new FXMaterial* getMaterial(FXint side) const { FXMaterial *mtl = new FXMaterial; --- 116,120 ---- } #else ! %extend { %new FXMaterial* getMaterial(FXint side) const { FXMaterial *mtl = new FXMaterial; Index: FXGLViewer.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLViewer.i,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -C2 -d -r1.25 -r1.25.2.1 *** FXGLViewer.i 19 Mar 2002 23:18:40 -0000 1.25 --- FXGLViewer.i 6 May 2002 19:16:29 -0000 1.25.2.1 *************** *** 328,332 **** // Common DND type names ! %addmethods { static VALUE objectTypeName(){ return to_ruby(FXGLViewer::objectTypeName); --- 328,332 ---- // Common DND type names ! %extend { static VALUE objectTypeName(){ return to_ruby(FXGLViewer::objectTypeName); *************** *** 349,353 **** #ifdef SWIGRUBY ! %addmethods { // Return a list of all objects in the given rectangle VALUE lasso(FXint x1,FXint y1,FXint x2,FXint y2) { --- 349,353 ---- #ifdef SWIGRUBY ! %extend { // Return a list of all objects in the given rectangle VALUE lasso(FXint x1,FXint y1,FXint x2,FXint y2) { *************** *** 366,370 **** } #else ! %addmethods { PyObject* lasso(FXint x1,FXint y1,FXint x2,FXint y2) { FXGLObject **items = self->lasso(x1,y1,x2,y2); --- 366,370 ---- } #else ! %extend { PyObject* lasso(FXint x1,FXint y1,FXint x2,FXint y2) { FXGLObject **items = self->lasso(x1,y1,x2,y2); *************** *** 436,440 **** #ifdef SWIGRUBY ! %addmethods { // Return a list of all objects in the given rectangle VALUE select(FXint x,FXint y,FXint w,FXint h) { --- 436,440 ---- #ifdef SWIGRUBY ! %extend { // Return a list of all objects in the given rectangle VALUE select(FXint x,FXint y,FXint w,FXint h) { *************** *** 465,469 **** #ifdef SWIGRUBY ! %addmethods { /// Return the viewer's viewport FXViewport getViewport() const { --- 465,469 ---- #ifdef SWIGRUBY ! %extend { /// Return the viewer's viewport FXViewport getViewport() const { *************** *** 485,489 **** #else ! %addmethods { // void getViewport(FXViewport& v) const; %new FXViewport* getViewport() const { --- 485,489 ---- #else ! %extend { // void getViewport(FXViewport& v) const; %new FXViewport* getViewport() const { *************** *** 541,545 **** #ifdef SWIGRUBY ! %addmethods { /// Return default object material setting FXMaterial getMaterial() const { --- 541,545 ---- #ifdef SWIGRUBY ! %extend { /// Return default object material setting FXMaterial getMaterial() const { *************** *** 550,554 **** } #else ! %addmethods { /// Return default object material setting %new FXMaterial* getMaterial() const { --- 550,554 ---- } #else ! %extend { /// Return default object material setting %new FXMaterial* getMaterial() const { *************** *** 600,604 **** #ifdef SWIGRUBY ! %addmethods { /// Return boresight vector (an array of two arrays) VALUE getBoreVector(FXint sx,FXint sy) { --- 600,604 ---- #ifdef SWIGRUBY ! %extend { /// Return boresight vector (an array of two arrays) VALUE getBoreVector(FXint sx,FXint sy) { *************** *** 624,628 **** } #else ! %addmethods { /// Return boresight vector (a tuple of two lists) PyObject* getBoreVector(FXint sx,FXint sy) { --- 624,628 ---- } #else ! %extend { /// Return boresight vector (a tuple of two lists) PyObject* getBoreVector(FXint sx,FXint sy) { *************** *** 751,755 **** #ifdef SWIGRUBY ! %addmethods { // Read the pixels off the screen as R,G,B tuples. VALUE readPixels(FXint x, FXint y, FXint w, FXint h) { --- 751,755 ---- #ifdef SWIGRUBY ! %extend { // Read the pixels off the screen as R,G,B tuples. VALUE readPixels(FXint x, FXint y, FXint w, FXint h) { *************** *** 782,786 **** } #else ! %addmethods { PyObject *readPixels(FXint x,FXint y,FXint w,FXint h) { FXuchar *buffer; --- 782,786 ---- } #else ! %extend { PyObject *readPixels(FXint x,FXint y,FXint w,FXint h) { FXuchar *buffer; *************** *** 851,855 **** * This can be used for move/draw printed output depth sorting. */ ! %addmethods { void setZSortFunc(VALUE proc){ } --- 851,855 ---- * This can be used for move/draw printed output depth sorting. */ ! %extend { void setZSortFunc(VALUE proc){ } *************** *** 859,863 **** #ifdef SWIGRUBY /// Return hidden surface sorting function. ! %addmethods { VALUE getZSortFunc() const { return Qnil; --- 859,863 ---- #ifdef SWIGRUBY /// Return hidden surface sorting function. ! %extend { VALUE getZSortFunc() const { return Qnil; *************** *** 890,894 **** #ifdef SWIGRUBY ! %addmethods { // Return light source settings FXLight getLight() const { --- 890,894 ---- #ifdef SWIGRUBY ! %extend { // Return light source settings FXLight getLight() const { *************** *** 899,903 **** } #else ! %addmethods { // Return light source settings %new FXLight* getLight() const { --- 899,903 ---- } #else ! %extend { // Return light source settings %new FXLight* getLight() const { Index: FXHMat.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHMat.i,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** FXHMat.i 19 Mar 2002 23:18:40 -0000 1.9 --- FXHMat.i 6 May 2002 19:16:29 -0000 1.9.2.1 *************** *** 62,66 **** // Operators ! %addmethods { // Add matrices FXHMat __add__(const FXHMat& other) { --- 62,66 ---- // Operators ! %extend { // Add matrices FXHMat __add__(const FXHMat& other) { Index: FXHVec.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHVec.i,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** FXHVec.i 19 Mar 2002 23:18:40 -0000 1.6 --- FXHVec.i 6 May 2002 19:16:29 -0000 1.6.2.1 *************** *** 46,50 **** // Other good stuff ! %addmethods { FXfloat __getitem__(FXint i){ if(i<0||i>3){ --- 46,50 ---- // Other good stuff ! %extend { FXfloat __getitem__(FXint i){ if(i<0||i>3){ Index: FXHeader.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHeader.i,v retrieving revision 1.30 retrieving revision 1.30.2.1 diff -C2 -d -r1.30 -r1.30.2.1 *** FXHeader.i 2 Apr 2002 03:44:27 -0000 1.30 --- FXHeader.i 6 May 2002 19:16:29 -0000 1.30.2.1 *************** *** 67,71 **** #ifdef SWIGRUBY ! %addmethods { /// Change item's user data void setData(VALUE ptr) { --- 67,71 ---- #ifdef SWIGRUBY ! %extend { /// Change item's user data void setData(VALUE ptr) { *************** *** 80,84 **** #endif #ifdef SWIGPYTHON ! %addmethods { void setData(PyObject* ptr) { FXPySetData(self, ptr); --- 80,84 ---- #endif #ifdef SWIGPYTHON ! %extend { void setData(PyObject* ptr) { FXPySetData(self, ptr); *************** *** 188,192 **** #ifdef SWIGRUBY ! %addmethods { /// Replace the item with a [possibly subclassed] item FXint replaceItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){ --- 188,192 ---- #ifdef SWIGRUBY ! %extend { /// Replace the item with a [possibly subclassed] item FXint replaceItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){ *************** *** 223,227 **** ! %addmethods { /// Insert a new [possibly subclassed] item at the given index FXint insertItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){ --- 223,227 ---- ! %extend { /// Insert a new [possibly subclassed] item at the given index FXint insertItem1(FXint index,FXHeaderItem* item,FXbool notify=FALSE){ *************** *** 235,239 **** %name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %addmethods { /// Append a [possibly subclassed] item to the list FXint appendItem1(FXHeaderItem* item,FXbool notify=FALSE){ --- 235,239 ---- %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){ *************** *** 247,251 **** %name(appendItem2) FXint appendItem(const FXString& text,FXIcon *icon=NULL,FXint size=0,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %addmethods { /// Prepend a [possibly subclassed] item to the list FXint prependItem1(FXHeaderItem* item,FXbool notify=FALSE){ --- 247,251 ---- %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){ *************** *** 286,290 **** #endif ! %addmethods { /// Remove item at index void removeItem(FXint index,FXbool notify=FALSE){ --- 286,290 ---- #endif ! %extend { /// Remove item at index void removeItem(FXint index,FXbool notify=FALSE){ *************** *** 348,352 **** #ifdef SWIGRUBY ! %addmethods { /// Change data of item at index void setItemData(FXint index, VALUE ptr){ --- 348,352 ---- #ifdef SWIGRUBY ! %extend { /// Change data of item at index void setItemData(FXint index, VALUE ptr){ Index: FXIconList.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIconList.i,v retrieving revision 1.34 retrieving revision 1.34.2.1 diff -C2 -d -r1.34 -r1.34.2.1 *** FXIconList.i 2 Apr 2002 03:44:27 -0000 1.34 --- FXIconList.i 6 May 2002 19:16:29 -0000 1.34.2.1 *************** *** 83,87 **** FXIcon* getMiniIcon() const; ! %addmethods { void setData(VALUE ptr){ self->setData((void*) ptr); --- 83,87 ---- FXIcon* getMiniIcon() const; ! %extend { void setData(VALUE ptr){ self->setData((void*) ptr); *************** *** 279,283 **** FXIconItem *retrieveItem(FXint index) const; ! %addmethods { /// Replace the item with a [possibly subclassed] item FXint replaceItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){ --- 279,283 ---- FXIconItem *retrieveItem(FXint index) const; ! %extend { /// Replace the item with a [possibly subclassed] item FXint replaceItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){ *************** *** 314,318 **** ! %addmethods { /// Insert a new [possibly subclassed] item at the give index FXint insertItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){ --- 314,318 ---- ! %extend { /// Insert a new [possibly subclassed] item at the give index FXint insertItem1(FXint index,FXIconItem* item,FXbool notify=FALSE){ *************** *** 326,330 **** %name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %addmethods { /// Append a [possibly subclassed] item to the end of the list FXint appendItem1(FXIconItem* item,FXbool notify=FALSE){ --- 326,330 ---- %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){ *************** *** 338,342 **** %name(appendItem2) FXint appendItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %addmethods { /// Append a [possibly subclassed] item to the end of the list FXint prependItem1(FXIconItem* item,FXbool notify=FALSE){ --- 338,342 ---- %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){ *************** *** 350,354 **** %name(prependItem2) FXint prependItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %addmethods { /// Remove item from list void removeItem(FXint index,FXbool notify=FALSE){ --- 350,354 ---- %name(prependItem2) FXint prependItem(const FXString& text,FXIcon *big=NULL,FXIcon* mini=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %extend { /// Remove item from list void removeItem(FXint index,FXbool notify=FALSE){ *************** *** 423,427 **** FXIcon* getItemMiniIcon(FXint index) const; ! %addmethods { /// Change item user-data pointer void setItemData(FXint index, VALUE ptr){ --- 423,427 ---- FXIcon* getItemMiniIcon(FXint index) const; ! %extend { /// Change item user-data pointer void setItemData(FXint index, VALUE ptr){ Index: FXId.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXId.i,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** FXId.i 19 Mar 2002 23:18:40 -0000 1.13 --- FXId.i 6 May 2002 19:16:29 -0000 1.13.2.1 *************** *** 51,55 **** virtual void destroy(); ! %addmethods { /// Set user data pointer void setUserData(VALUE ptr){ --- 51,55 ---- virtual void destroy(); ! %extend { /// Set user data pointer void setUserData(VALUE ptr){ Index: FXImage.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXImage.i,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** FXImage.i 19 Mar 2002 23:18:40 -0000 1.15 --- FXImage.i 6 May 2002 19:16:29 -0000 1.15.2.1 *************** *** 73,77 **** /// To get to the pixel data ! %addmethods { VALUE getData() const { FXuchar* data=self->getData(); --- 73,77 ---- /// To get to the pixel data ! %extend { VALUE getData() const { FXuchar* data=self->getData(); Index: FXInputDialog.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXInputDialog.i,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** FXInputDialog.i 19 Mar 2002 23:18:40 -0000 1.17 --- FXInputDialog.i 6 May 2002 19:16:29 -0000 1.17.2.1 *************** *** 72,76 **** #ifdef SWIGRUBY ! %addmethods { // Return limits VALUE getLimits() { --- 72,76 ---- #ifdef SWIGRUBY ! %extend { // Return limits VALUE getLimits() { *************** *** 84,88 **** } #else ! %addmethods { PyObject* getLimits() const { FXdouble lo,hi; --- 84,88 ---- } #else ! %extend { PyObject* getLimits() const { FXdouble lo,hi; *************** *** 105,109 **** * Return TRUE if the new value is accepted, and false otherwise. */ ! %addmethods { static VALUE getString(const FXString& initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL){ FXString result(initial); --- 105,109 ---- * Return TRUE if the new value is accepted, and false otherwise. */ ! %extend { static VALUE getString(const FXString& initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL){ FXString result(initial); *************** *** 123,127 **** * case the input can be any number. */ ! %addmethods { static VALUE getInteger(FXint initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL,FXint lo=1,FXint hi=0){ FXint result=initial; --- 123,127 ---- * case the input can be any number. */ ! %extend { static VALUE getInteger(FXint initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL,FXint lo=1,FXint hi=0){ FXint result=initial; *************** *** 141,145 **** * case the input can be any number. */ ! %addmethods { static VALUE getReal(FXdouble initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL,FXdouble lo=1.0,FXdouble hi=0.0){ FXdouble result=initial; --- 141,145 ---- * case the input can be any number. */ ! %extend { static VALUE getReal(FXdouble initial,FXWindow* owner,const FXString& caption,const FXString& label,FXIcon* ic=NULL,FXdouble lo=1.0,FXdouble hi=0.0){ FXdouble result=initial; Index: FXList.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXList.i,v retrieving revision 1.36 retrieving revision 1.36.2.1 diff -C2 -d -r1.36 -r1.36.2.1 *** FXList.i 2 Apr 2002 03:44:27 -0000 1.36 --- FXList.i 6 May 2002 19:16:29 -0000 1.36.2.1 *************** *** 67,71 **** #ifdef SWIGRUBY ! %addmethods { void setData(VALUE ptr){ self->setData((void*) ptr); --- 67,71 ---- #ifdef SWIGRUBY ! %extend { void setData(VALUE ptr){ self->setData((void*) ptr); *************** *** 79,83 **** #ifdef SWIGPYTHON ! %addmethods { void setData(PyObject* ptr) { FXPySetData(self, ptr); --- 79,83 ---- #ifdef SWIGPYTHON ! %extend { void setData(PyObject* ptr) { FXPySetData(self, ptr); *************** *** 214,218 **** #ifdef SWIGRUBY ! %addmethods { /// Replace the item with a [possibly subclassed] item FXint replaceItem1(FXint index,FXListItem* item,FXbool notify=FALSE){ --- 214,218 ---- #ifdef SWIGRUBY ! %extend { /// Replace the item with a [possibly subclassed] item FXint replaceItem1(FXint index,FXListItem* item,FXbool notify=FALSE){ *************** *** 248,252 **** } ! %addmethods { /// Insert a new [possibly subclassed] item at the give index FXint insertItem1(FXint index,FXListItem* item,FXbool notify=FALSE){ --- 248,252 ---- } ! %extend { /// Insert a new [possibly subclassed] item at the give index FXint insertItem1(FXint index,FXListItem* item,FXbool notify=FALSE){ *************** *** 260,264 **** %name(insertItem2) FXint insertItem(FXint index,const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %addmethods { /// Append a [possibly subclassed] item to the list FXint appendItem1(FXListItem* item,FXbool notify=FALSE){ --- 260,264 ---- %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){ *************** *** 272,276 **** %name(appendItem2) FXint appendItem(const FXString& text,FXIcon *icon=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %addmethods { /// Prepend a [possibly subclassed] item to the list FXint prependItem1(FXListItem* item,FXbool notify=FALSE){ --- 272,276 ---- %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){ *************** *** 299,303 **** #endif ! %addmethods { /// Remove item from list void removeItem(FXint index,FXbool notify=FALSE){ --- 299,303 ---- #endif ! %extend { /// Remove item from list void removeItem(FXint index,FXbool notify=FALSE){ *************** *** 370,374 **** #ifdef SWIGRUBY ! %addmethods { /// Change item user-data pointer void setItemData(FXint index, VALUE ptr){ --- 370,374 ---- #ifdef SWIGRUBY ! %extend { /// Change item user-data pointer void setItemData(FXint index, VALUE ptr){ Index: FXListBox.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXListBox.i,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -C2 -d -r1.23 -r1.23.2.1 *** FXListBox.i 19 Mar 2002 23:18:40 -0000 1.23 --- FXListBox.i 6 May 2002 19:16:29 -0000 1.23.2.1 *************** *** 122,126 **** #ifdef SWIGRUBY ! %addmethods { /// Set data pointer for specified item void setItemData(FXint index,VALUE ptr) { --- 122,126 ---- #ifdef SWIGRUBY ! %extend { /// Set data pointer for specified item void setItemData(FXint index,VALUE ptr) { Index: FXPrintDialog.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXPrintDialog.i,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -C2 -d -r1.14 -r1.14.2.1 *** FXPrintDialog.i 19 Mar 2002 23:18:40 -0000 1.14 --- FXPrintDialog.i 6 May 2002 19:16:29 -0000 1.14.2.1 *************** *** 130,134 **** #ifdef SWIGRUBY ! %addmethods { // Returns information about the selected printer FXPrinter getPrinter() { --- 130,134 ---- #ifdef SWIGRUBY ! %extend { // Returns information about the selected printer FXPrinter getPrinter() { *************** *** 139,143 **** } #else ! %addmethods { /// Get printer info %new FXPrinter* getPrinter() const { --- 139,143 ---- } #else ! %extend { /// Get printer info %new FXPrinter* getPrinter() const { Index: FXQuat.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXQuat.i,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** FXQuat.i 19 Mar 2002 23:18:40 -0000 1.9 --- FXQuat.i 6 May 2002 19:16:29 -0000 1.9.2.1 *************** *** 49,53 **** void setRollPitchYaw(FXfloat roll,FXfloat pitch,FXfloat yaw); ! %addmethods { #ifdef SWIGRUBY // Obtain yaw, pitch, and roll --- 49,53 ---- void setRollPitchYaw(FXfloat roll,FXfloat pitch,FXfloat yaw); ! %extend { #ifdef SWIGRUBY // Obtain yaw, pitch, and roll Index: FXRange.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXRange.i,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** FXRange.i 19 Mar 2002 23:18:40 -0000 1.11 --- FXRange.i 6 May 2002 19:16:29 -0000 1.11.2.1 *************** *** 41,45 **** FXRangeSlice(FXRange& r,FXint s); ! %addmethods { FXfloat __getitem__(FXint i) const { return (*self)[i]; --- 41,45 ---- FXRangeSlice(FXRange& r,FXint s); ! %extend { FXfloat __getitem__(FXint i) const { return (*self)[i]; *************** *** 89,93 **** FXbool contains(FXfloat x,FXfloat y,FXfloat z) const; ! %addmethods { FXRangeSlice __getitem__(FXint i){ return FXRangeSlice(*self,i); --- 89,93 ---- FXbool contains(FXfloat x,FXfloat y,FXfloat z) const; ! %extend { FXRangeSlice __getitem__(FXint i){ return FXRangeSlice(*self,i); *************** *** 116,120 **** FXRange& clipTo(const FXRange& box); ! %addmethods { #ifdef SWIGRUBY /// Get corners of box --- 116,120 ---- FXRange& clipTo(const FXRange& box); ! %extend { #ifdef SWIGRUBY /// Get corners of box Index: FXRegion.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXRegion.i,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** FXRegion.i 19 Mar 2002 23:18:40 -0000 1.6 --- FXRegion.i 6 May 2002 19:16:29 -0000 1.6.2.1 *************** *** 54,58 **** FXbool contains(FXint x,FXint y,FXint w,FXint h) const; ! %addmethods { // Return bounding box FXRectangle bounds() const { --- 54,58 ---- FXbool contains(FXint x,FXint y,FXint w,FXint h) const; ! %extend { // Return bounding box FXRectangle bounds() const { *************** *** 66,70 **** FXRegion& offset(FXint dx,FXint dy); ! %addmethods { /// Union region r with this one FXRegion __add__(const FXRegion& other) { --- 66,70 ---- FXRegion& offset(FXint dx,FXint dy); ! %extend { /// Union region r with this one FXRegion __add__(const FXRegion& other) { *************** *** 94,98 **** #ifdef SWIGPYTHON ! %addmethods { FXbool __ne__(const FXRegion& other) { return (*self) != other; --- 94,98 ---- #ifdef SWIGPYTHON ! %extend { FXbool __ne__(const FXRegion& other) { return (*self) != other; Index: FXScintilla.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXScintilla.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 *** FXScintilla.i 24 Apr 2002 03:04:43 -0000 1.9.2.2 --- FXScintilla.i 6 May 2002 19:16:29 -0000 1.9.2.3 *************** *** 37,41 **** int modifiers; // SCN_KEY int modificationType; // SCN_MODIFIED ! %addmethods { // Need to be careful about when this field's value is actually defined VALUE text() const { --- 37,41 ---- int modifiers; // SCN_KEY int modificationType; // SCN_MODIFIED ! %extend { // Need to be careful about when this field's value is actually defined VALUE text() const { *************** *** 61,65 **** int y; // SCN_DWELLSTART, SCN_DWELLEND %mutable; ! %addmethods { VALUE wParam() const { return INT2NUM(self->wParam); --- 61,65 ---- int y; // SCN_DWELLSTART, SCN_DWELLEND %mutable; ! %extend { VALUE wParam() const { return INT2NUM(self->wParam); *************** *** 110,114 **** void setScintillaID(int id); ! %addmethods { VALUE sendMessage(unsigned int iMsg, VALUE wParam = Qnil, VALUE lParam = Qnil){ // Convert wParam argument --- 110,114 ---- void setScintillaID(int id); ! %extend { VALUE sendMessage(unsigned int iMsg, VALUE wParam = Qnil, VALUE lParam = Qnil){ // Convert wParam argument Index: FXScrollArea.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXScrollArea.i,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** FXScrollArea.i 19 Mar 2002 23:18:40 -0000 1.17 --- FXScrollArea.i 6 May 2002 19:16:29 -0000 1.17.2.1 *************** *** 120,124 **** #ifdef SWIGRUBY /// Get the current position ! %addmethods { VALUE getPosition() const { FXint x, y; --- 120,124 ---- #ifdef SWIGRUBY /// Get the current position ! %extend { VALUE getPosition() const { FXint x, y; *************** *** 132,136 **** #endif #ifdef SWIGPYTHON ! %addmethods { PyObject* getPosition() const { FXint x, y; --- 132,136 ---- #endif #ifdef SWIGPYTHON ! %extend { PyObject* getPosition() const { FXint x, y; Index: FXSlider.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXSlider.i,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -C2 -d -r1.18 -r1.18.2.1 *** FXSlider.i 19 Mar 2002 23:18:40 -0000 1.18 --- FXSlider.i 6 May 2002 19:16:29 -0000 1.18.2.1 *************** *** 104,108 **** #ifdef SWIGRUBY ! %addmethods { /// Get the slider's current range VALUE getRange() const { --- 104,108 ---- #ifdef SWIGRUBY ! %extend { /// Get the slider's current range VALUE getRange() const { *************** *** 117,121 **** #endif #ifdef SWIGPYTHON ! %addmethods { PyObject* getRange() const { FXint lo,hi; --- 117,121 ---- #endif #ifdef SWIGPYTHON ! %extend { PyObject* getRange() const { FXint lo,hi; Index: FXSpinner.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXSpinner.i,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -C2 -d -r1.20 -r1.20.2.1 *** FXSpinner.i 19 Mar 2002 23:18:40 -0000 1.20 --- FXSpinner.i 6 May 2002 19:16:29 -0000 1.20.2.1 *************** *** 103,107 **** #ifdef SWIGRUBY ! %addmethods { /// Get the spinner's current range VALUE getRange() const { --- 103,107 ---- #ifdef SWIGRUBY ! %extend { /// Get the spinner's current range VALUE getRange() const { *************** *** 116,120 **** #endif #ifdef SWIGPYTHON ! %addmethods { PyObject* getRange() const { FXint lo,hi; --- 116,120 ---- #endif #ifdef SWIGPYTHON ! %extend { PyObject* getRange() const { FXint lo,hi; Index: FXStatusline.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXStatusline.i,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** FXStatusline.i 19 Mar 2002 23:18:40 -0000 1.17 --- FXStatusline.i 6 May 2002 19:16:29 -0000 1.17.2.1 *************** *** 47,51 **** FXStatusline(); #ifdef 0 ! %addmethods { static VALUE defaultMessage(){ return to_ruby(FXStatusline::defaultMessage); --- 47,51 ---- FXStatusline(); #ifdef 0 ! %extend { static VALUE defaultMessage(){ return to_ruby(FXStatusline::defaultMessage); Index: FXStream.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXStream.i,v retrieving revision 1.10.2.1 retrieving revision 1.10.2.2 diff -C2 -d -r1.10.2.1 -r1.10.2.2 *** FXStream.i 25 Apr 2002 16:48:34 -0000 1.10.2.1 --- FXStream.i 6 May 2002 19:16:29 -0000 1.10.2.2 *************** *** 193,197 **** #ifdef SWIGRUBY ! %addmethods { // Take buffer away from stream VALUE takeBuffer() { --- 193,197 ---- #ifdef SWIGRUBY ! %extend { // Take buffer away from stream VALUE takeBuffer() { Index: FXTable.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTable.i,v retrieving revision 1.28 retrieving revision 1.28.2.1 diff -C2 -d -r1.28 -r1.28.2.1 *** FXTable.i 2 Apr 2002 03:44:27 -0000 1.28 --- FXTable.i 6 May 2002 19:16:29 -0000 1.28.2.1 *************** *** 101,105 **** virtual void setIcon(FXIcon* icn); FXIcon* getIcon() const; ! %addmethods { void setData(VALUE ptr){ self->setData((void*) ptr); --- 101,105 ---- virtual void setIcon(FXIcon* icn); FXIcon* getIcon() const; ! %extend { void setData(VALUE ptr){ self->setData((void*) ptr); *************** *** 358,362 **** void showVertGrid(FXbool on=TRUE); ! %addmethods { /// Resize the table content to nr rows and nc columns void setTableSize(FXint nr,FXint nc,FXbool notify=FALSE){ --- 358,362 ---- void showVertGrid(FXbool on=TRUE); ! %extend { /// Resize the table content to nr rows and nc columns void setTableSize(FXint nr,FXint nc,FXbool notify=FALSE){ *************** *** 428,432 **** virtual void insertColumns(FXint col,FXint nc=1,FXbool notify=FALSE); ! %addmethods { /// Remove row(s) of cells virtual void removeRows(FXint row,FXint nr=1,FXbool notify=FALSE){ --- 428,432 ---- virtual void insertColumns(FXint col,FXint nc=1,FXbool notify=FALSE); ! %extend { /// Remove row(s) of cells virtual void removeRows(FXint row,FXint nr=1,FXbool notify=FALSE){ *************** *** 515,519 **** FXIcon* getItemIcon(FXint r,FXint c) const; ! %addmethods { /// Modify cell user-data void setItemData(FXint r,FXint c,VALUE ptr){ --- 515,519 ---- FXIcon* getItemIcon(FXint r,FXint c) const; ! %extend { /// Modify cell user-data void setItemData(FXint r,FXint c,VALUE ptr){ Index: FXText.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXText.i,v retrieving revision 1.29 retrieving revision 1.29.2.1 diff -C2 -d -r1.29 -r1.29.2.1 *** FXText.i 19 Mar 2002 23:18:40 -0000 1.29 --- FXText.i 6 May 2002 19:16:29 -0000 1.29.2.1 *************** *** 436,440 **** FXbool isStyled() const; ! %addmethods { /// Change delimiters of words void setDelimiters(const FXString& delims){ --- 436,440 ---- FXbool isStyled() const; ! %extend { /// Change delimiters of words void setDelimiters(const FXString& delims){ *************** *** 529,533 **** #ifdef SWIGRUBY ! %addmethods { // Extract n characters of text from position pos VALUE extractText(FXint pos,FXint n) const { --- 529,533 ---- #ifdef SWIGRUBY ! %extend { // Extract n characters of text from position pos VALUE extractText(FXint pos,FXint n) const { *************** *** 549,553 **** #endif ! %addmethods { /// Replace m characters at pos by n characters void replaceText(FXint pos,FXint m,const FXString& text,FXbool notify=FALSE){ --- 549,553 ---- #endif ! %extend { /// Replace m characters at pos by n characters void replaceText(FXint pos,FXint m,const FXString& text,FXbool notify=FALSE){ *************** *** 584,588 **** void removeText(FXint pos,FXint n,FXbool notify=FALSE); ! %addmethods { /// Change style of text range (overloaded) void changeStyle(FXint pos,FXint n,VALUE vStyle){ --- 584,588 ---- void removeText(FXint pos,FXint n,FXbool notify=FALSE); ! %extend { /// Change style of text range (overloaded) void changeStyle(FXint pos,FXint n,VALUE vStyle){ Index: FXTreeList.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTreeList.i,v retrieving revision 1.33 retrieving revision 1.33.2.1 diff -C2 -d -r1.33 -r1.33.2.1 *** FXTreeList.i 2 Apr 2002 03:44:27 -0000 1.33 --- FXTreeList.i 6 May 2002 19:16:29 -0000 1.33.2.1 *************** *** 101,105 **** FXIcon* getClosedIcon() const; ! %addmethods { void setData(VALUE ptr){ self->setData((void*) ptr); --- 101,105 ---- FXIcon* getClosedIcon() const; ! %extend { void setData(VALUE ptr){ self->setData((void*) ptr); *************** *** 256,260 **** FXTreeItem* getLastItem() const; ! %addmethods { /// Prepend new [possibly subclassed] item as first child of p FXTreeItem* addItemFirst1(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){ --- 256,260 ---- FXTreeItem* getLastItem() const; ! %extend { /// Prepend new [possibly subclassed] item as first child of p FXTreeItem* addItemFirst1(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){ *************** *** 268,272 **** FXTreeItem* addItemFirst(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %addmethods { /// Append new [possibly subclassed] item as last child of p FXTreeItem* addItemLast1(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){ --- 268,272 ---- FXTreeItem* addItemFirst(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %extend { /// Append new [possibly subclassed] item as last child of p FXTreeItem* addItemLast1(FXTreeItem* p,FXTreeItem* item,FXbool notify=FALSE){ *************** *** 280,284 **** FXTreeItem* addItemLast(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %addmethods { /// Append new [possibly subclassed] item after to other item FXTreeItem* addItemAfter1(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){ --- 280,284 ---- FXTreeItem* addItemLast(FXTreeItem* p,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %extend { /// Append new [possibly subclassed] item after to other item FXTreeItem* addItemAfter1(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){ *************** *** 292,296 **** FXTreeItem* addItemAfter(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %addmethods { /// Prepend new [possibly subclassed] item prior to other item FXTreeItem* addItemBefore1(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){ --- 292,296 ---- FXTreeItem* addItemAfter(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %extend { /// Prepend new [possibly subclassed] item prior to other item FXTreeItem* addItemBefore1(FXTreeItem* other,FXTreeItem* item,FXbool notify=FALSE){ *************** *** 304,308 **** FXTreeItem* addItemBefore(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %addmethods { /// Remove item void removeItem(FXTreeItem* item,FXbool notify=FALSE){ --- 304,308 ---- FXTreeItem* addItemBefore(FXTreeItem* other,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE); ! %extend { /// Remove item void removeItem(FXTreeItem* item,FXbool notify=FALSE){ *************** *** 387,391 **** FXIcon* getItemClosedIcon(const FXTreeItem* item) const; ! %addmethods { /// Change item user-data pointer void setItemData(FXTreeItem* item,VALUE ptr){ --- 387,391 ---- FXIcon* getItemClosedIcon(const FXTreeItem* item) const; ! %extend { /// Change item user-data pointer void setItemData(FXTreeItem* item,VALUE ptr){ Index: FXTreeListBox.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTreeListBox.i,v retrieving revision 1.27 retrieving revision 1.27.2.1 diff -C2 -d -r1.27 -r1.27.2.1 *** FXTreeListBox.i 19 Mar 2002 23:18:40 -0000 1.27 --- FXTreeListBox.i 6 May 2002 19:16:29 -0000 1.27.2.1 *************** *** 79,83 **** FXTreeItem* getLastItem() const; ! %addmethods { /// Add item as first child of parent p FXTreeItem* addItemFirst1(FXTreeItem* p,FXTreeItem* item,void* dummy=NULL){ --- 79,83 ---- FXTreeItem* getLastItem() const; ! %extend { /// Add item as first child of parent p FXTreeItem* addItemFirst1(FXTreeItem* p,FXTreeItem* item,void* dummy=NULL){ *************** *** 172,176 **** FXIcon* getItemClosedIcon(const FXTreeItem* item) const; ! %addmethods { /// Change item's user data void setItemData(FXTreeItem* item,VALUE ptr){ --- 172,176 ---- FXIcon* getItemClosedIcon(const FXTreeItem* item) const; ! %extend { /// Change item's user data void setItemData(FXTreeItem* item,VALUE ptr){ Index: FXVec.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXVec.i,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** FXVec.i 19 Mar 2002 23:18:40 -0000 1.4 --- FXVec.i 6 May 2002 19:16:29 -0000 1.4.2.1 *************** *** 29,33 **** // Other good stuff ! %addmethods { FXfloat __getitem__(FXint i){ if(i<0||i>2){ --- 29,33 ---- // Other good stuff ! %extend { FXfloat __getitem__(FXint i){ if(i<0||i>2){ Index: FXWindow.i =================================================================== RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXWindow.i,v retrieving revision 1.32 retrieving revision 1.32.2.1 diff -C2 -d -r1.32 -r1.32.2.1 *** FXWindow.i 26 Mar 2002 21:49:50 -0000 1.32 --- FXWindow.i 6 May 2002 19:16:29 -0000 1.32.2.1 *************** *** 265,269 **** // Common DND type names ! %addmethods { static VALUE deleteTypeName() { return to_ruby(FXWindow::deleteTypeName); --- 265,269 ---- // Common DND type names ! %extend { static VALUE deleteTypeName() { return to_ruby(FXWindow::deleteTypeName); *************** *** 404,408 **** FXint indexOfChild(const FXWindow *window) const; ! %addmethods { // Remove specified child window FXbool removeChild(FXWindow* child){ --- 404,408 ---- FXint indexOfChild(const FXWindow *window) const; ! %extend { // Remove specified child window FXbool removeChild(FXWindow* child){ *************** *** 449,453 **** #ifdef SWIGRUBY ! %addmethods { /// Return the cursor position and mouse button-state VALUE getCursorPosition() const { --- 449,453 ---- #ifdef SWIGRUBY ! %extend { /// Return the cursor position and mouse button-state VALUE getCursorPosition() const { *************** *** 597,601 **** FXbool hasSelection() const; ! %addmethods { /// Try to acquire the primary selection, given a list of drag types FXbool acquireSelection(VALUE typesArray){ --- 597,601 ---- FXbool hasSelection() const; ! %extend { /// Try to acquire the primary selection, given a list of drag types FXbool acquireSelection(VALUE typesArray){ *************** *** 621,625 **** FXbool hasClipboard() const; ! %addmethods { /// Try to acquire the clipboard, given a list of drag types FXbool acquireClipboard(VALUE typesArray){ --- 621,625 ---- FXbool hasClipboard() const; ! %extend { /// Try to acquire the clipboard, given a list of drag types FXbool acquireClipboard(VALUE typesArray){ *************** *** 654,658 **** FXbool isDragging() const; ! %addmethods { /// Initiate a drag operation with a list of previously registered drag types FXbool beginDrag(VALUE typesArray){ --- 654,658 ---- FXbool isDragging() const; ! %extend { /// Initiate a drag operation with a list of previously registered drag types FXbool beginDrag(VALUE typesArray){ *************** *** 704,708 **** #ifdef SWIGRUBY ! %addmethods { // When being dragged over, inquire the drag types which are being offered VALUE inquireDNDTypes(FXDNDOrigin origin) { --- 704,708 ---- ... [truncated message content] |