[Fxruby-commits] CVS: FXRuby/swig-interfaces FXMemoryBuffer.i,1.1,1.2 common.i,1.1,1.2 FX4Splitter.i
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
[Fxruby-commits] CVS: FXRuby/swig-interfaces FXMemoryBuffer.i,1.1,1.2 common.i,1.1,1.2 FX4Splitter.i,1.13,1.14 FXApp.i,1.38,1.39 FXColorSelector.i,1.15,1.16 FXComboBox.i,1.23,1.24 FXCursor.i,1.11,1.12 FXDC.i,1.21,1.22 FXDCWindow.i,1.12,1.13 FXDebugTarget.i,1.12,1.13 FXDial.i,1.17,1.18 FXDialogBox.i,1.17,1.18 FXDict.i,1.17,1.18 FXDirList.i,1.20,1.21 FXDrawable.i,1.10,1.11 FXFileDialog.i,1.16,1.17 FXFileDict.i,1.19,1.20 FXFileList.i,1.21,1.22 FXFileSelector.i,1.19,1.20 FXFont.i,1.15,1.16 FXFontDialog.i,1.12,1.13 FXFontSelector.i,1.12,1.13 FXGIFCursor.i,1.11,1.12 FXGLCanvas.i,1.14,1.15 FXGLContext.i,1.14,1.15 FXGLObject.i,1.23,1.24 FXGLShape.i,1.17,1.18 FXGLViewer.i,1.25,1.26 FXHMat.i,1.9,1.10 FXHVec.i,1.6,1.7 FXHeader.i,1.30,1.31 FXIcon.i,1.9,1.10 FXIconList.i,1.34,1.35 FXId.i,1.13,1.14 FXImage.i,1.15,1.16 FXInputDialog.i,1.17,1.18 FXList.i,1.36,1.37 FXListBox.i,1.23,1.24 FXMenubar.i,1.14,1.15 FXMessageBox.i,1.16,1.17 FXPrintDialog.i,1.14,1.15 FXQuat.i,1.9,1.10 FXRange.i,1.11,1.12 FXRecentFiles.i,1.12,1.13 FXRegion.i,1.6,1.7 FXScintilla.i,1.9,1.10 FXScrollArea.i,1.17,1.18 FXShell.i,1.12,1.13 FXSlider.i,1.18,1.19 FXSpinner.i,1.20,1.21 FXSplitter.i,1.16,1.17 FXStatusline.i,1.17,1.18 FXStream.i,1.10,1.11 FXTable.i,1.28,1.29 FXText.i,1.29,1.30 FXToolbar.i,1.19,1.20 FXTopWindow.i,1.17,1.18 FXTreeList.i,1.33,1.34 FXTreeListBox.i,1.27,1.28 FXVec.i,1.4,1.5 FXWindow.i,1.32,1.33 Makefile,1.20,1.21 core.i,1.27,1.28 dialogs.i,1.13,1.14 freefuncs.i,1.2,1.3 icons.i,1.13,1.14 image.i,1.15,1.16 layout.i,1.4,1.5 markfuncs.i,1.4,1.5 mdi.i,1.11,1.12 opengl.i,1.15,1.16 renames.i,1.14,1.15 scintilla.i,1.4,1.5 stubs.i,1.23,1.24 swig.sed,1.4,1.5 typemaps.i,1.35,1.36 ui.i,1.2,1.3
Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv26972/swig-interfaces
Modified Files:
FX4Splitter.i FXApp.i FXColorSelector.i FXComboBox.i
FXCursor.i FXDC.i FXDCWindow.i FXDebugTarget.i FXDial.i
FXDialogBox.i FXDict.i FXDirList.i FXDrawable.i FXFileDialog.i
FXFileDict.i FXFileList.i FXFileSelector.i FXFont.i
FXFontDialog.i FXFontSelector.i FXGIFCursor.i FXGLCanvas.i
FXGLContext.i FXGLObject.i FXGLShape.i FXGLViewer.i FXHMat.i
FXHVec.i FXHeader.i FXIcon.i FXIconList.i FXId.i FXImage.i
FXInputDialog.i FXList.i FXListBox.i FXMenubar.i
FXMessageBox.i FXPrintDialog.i FXQuat.i FXRange.i
FXRecentFiles.i FXRegion.i FXScintilla.i FXScrollArea.i
FXShell.i FXSlider.i FXSpinner.i FXSplitter.i FXStatusline.i
FXStream.i FXTable.i FXText.i FXToolbar.i FXTopWindow.i
FXTreeList.i FXTreeListBox.i FXVec.i FXWindow.i Makefile
core.i dialogs.i freefuncs.i icons.i image.i layout.i
markfuncs.i mdi.i opengl.i renames.i scintilla.i stubs.i
swig.sed typemaps.i ui.i
Added Files:
FXMemoryBuffer.i common.i
Log Message:
Merged changes from the release10 branch back onto the main trunk.
Index: FX4Splitter.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FX4Splitter.i,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FX4Splitter.i 19 Mar 2002 23:18:40 -0000 1.13
--- FX4Splitter.i 11 Jul 2002 13:33:13 -0000 1.14
***************
*** 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
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** FXApp.i 26 Mar 2002 21:38:50 -0000 1.38
--- FXApp.i 11 Jul 2002 13:33:13 -0000 1.39
***************
*** 74,78 ****
/// FOX Event
struct FXEvent {
! %readonly
FXuint type; /// Event type
FXuint time; /// Time of last event
--- 74,78 ----
/// FOX Event
struct FXEvent {
! %immutable;
FXuint type; /// Event type
FXuint time; /// Time of last event
***************
*** 97,101 ****
FXbool synthetic; /// True if synthetic expose event
FXDragType target; /// Target drag type being requested
! %readwrite
};
--- 97,101 ----
FXbool synthetic; /// True if synthetic expose event
FXDragType target; /// Target drag type being requested
! %mutable;
};
***************
*** 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 ----
***************
*** 145,149 ****
#ifdef SWIGRUBY
! %addmethods {
// Copyright notice for library
static VALUE copyright() {
--- 142,146 ----
#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
--- 218,222 ----
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;
--- 387,391 ----
*/
// virtual void init(int& argc,char** argv,FXbool connect=TRUE);
! %extend {
void init(VALUE arr,FXbool connect=TRUE) {
int i;
***************
*** 521,524 ****
--- 518,524 ----
%exception FXRbApp::FXRbApp "$action FXRbRegisterRubyObj(self, result);";
+ %rename("threadsEnabled=") FXRbApp::setThreadsEnabled(FXbool);
+ %rename("threadsEnabled?") FXRbApp::threadsEnabled() const;
+
class FXRbApp : public FXApp {
public:
***************
*** 533,541 ****
FXRbApp(const FXchar *name="Application",const FXchar *vendor="FoxDefault");
! // Enable support for multithreaded applications
! void enableThreads();
! // Disable support for multithreaded applications
! void disableThreads();
// Set the amount of time to sleep
--- 533,541 ----
FXRbApp(const FXchar *name="Application",const FXchar *vendor="FoxDefault");
! // Enable (or disable) support for multithreaded applications
! void setThreadsEnabled(FXbool enabled);
! // Are threads enabled?
! FXbool threadsEnabled() const;
// Set the amount of time to sleep
Index: FXColorSelector.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXColorSelector.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** FXColorSelector.i 19 Mar 2002 23:18:40 -0000 1.15
--- FXColorSelector.i 11 Jul 2002 13:33:14 -0000 1.16
***************
*** 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.24
diff -C2 -d -r1.23 -r1.24
*** FXComboBox.i 19 Mar 2002 23:18:40 -0000 1.23
--- FXComboBox.i 11 Jul 2002 13:33:14 -0000 1.24
***************
*** 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: FXCursor.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXCursor.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXCursor.i 19 Mar 2002 23:18:40 -0000 1.11
--- FXCursor.i 11 Jul 2002 13:33:14 -0000 1.12
***************
*** 33,37 ****
};
- %ignore FXCursor::FXCursor(FXApp* a,const void* src,const void* msk,FXint w,FXint h,FXint hx,FXint hy);
%exception FXCursor::FXCursor "$action FXRbRegisterRubyObj(self, result);";
--- 33,36 ----
***************
*** 55,59 ****
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXCursor(FXApp* a,const void* src,const void* msk,FXint w=32,FXint h=32,FXint hx=-1,FXint hy=-1);
/// Width of cursor
--- 54,58 ----
/// Make cursor from source and mask; cursor size should at most 32x32 for portability!
! FXCursor(FXApp* a,const void* src,const void* msk,FXint w,FXint h,FXint hx,FXint hy);
/// Width of cursor
***************
*** 100,103 ****
--- 99,105 ----
// Constructor
FXRbCursor(FXApp* a,FXStockCursor curid=CURSOR_ARROW);
+
+ // Construct from source and mask
+ FXRbCursor(FXApp* a,const void* src,const void* msk,FXint w,FXint h,FXint hx,FXint hy);
// Destructor
Index: FXDC.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDC.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FXDC.i 3 Apr 2002 21:40:57 -0000 1.21
--- FXDC.i 11 Jul 2002 13:33:14 -0000 1.22
***************
*** 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);
***************
*** 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){
--- 203,207 ----
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 {
--- 311,315 ----
virtual void setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength);
! %extend {
/// Get dash pattern
VALUE getDashPattern() const {
Index: FXDCWindow.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDCWindow.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FXDCWindow.i 19 Mar 2002 23:18:40 -0000 1.12
--- FXDCWindow.i 11 Jul 2002 13:33:14 -0000 1.13
***************
*** 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: FXDebugTarget.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDebugTarget.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FXDebugTarget.i 19 Mar 2002 23:18:40 -0000 1.12
--- FXDebugTarget.i 11 Jul 2002 13:33:14 -0000 1.13
***************
*** 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.18
diff -C2 -d -r1.17 -r1.18
*** FXDial.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXDial.i 11 Jul 2002 13:33:14 -0000 1.18
***************
*** 77,98 ****
FXint getValue() const;
- /// Change the dial's range
- void setRange(FXint lo,FXint hi);
-
#ifdef SWIGRUBY
! %addmethods {
/// Obtain the current range of the dial
VALUE getRange() const {
! FXint lo, hi;
! self->getRange(lo, hi);
! VALUE result = rb_ary_new();
! rb_ary_push(result, INT2NUM(lo));
! rb_ary_push(result, INT2NUM(hi));
! return result;
}
}
#endif
#ifdef SWIGPYTHON
! %addmethods {
PyObject* getRange() const {
FXint lo,hi;
--- 77,102 ----
FXint getValue() const;
#ifdef SWIGRUBY
! %extend {
! /// Change the dial's range
! void setRange(VALUE range){
! FXint lo,hi;
! FXRbRange2LoHi(range,lo,hi);
! self->setRange(lo,hi);
! }
!
/// Obtain the current range of the dial
VALUE getRange() const {
! FXint lo,hi;
! self->getRange(lo,hi);
! return rb_range_new(INT2NUM(lo),INT2NUM(hi),0);
}
}
#endif
#ifdef SWIGPYTHON
! /// Change the dial's range
! void setRange(FXint lo,FXint hi)
!
! %extend {
PyObject* getRange() const {
FXint lo,hi;
Index: FXDialogBox.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDialogBox.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FXDialogBox.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXDialogBox.i 11 Jul 2002 13:33:14 -0000 1.18
***************
*** 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: FXDict.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDict.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FXDict.i 19 Mar 2002 23:18:40 -0000 1.17
--- FXDict.i 11 Jul 2002 13:33:14 -0000 1.18
***************
*** 21,28 ****
--- 21,40 ----
***********************************************************************/
+ // Do not wrap these functions
+ %ignore FXDict::size() const;
+ %ignore FXDict::size(FXint m);
%ignore FXDict::insert(const FXchar* ky,const void* ptr,FXbool mrk);
+ %ignore FXDict::remove(const FXchar* ky);
%ignore FXDict::replace(const FXchar* ky,const void* ptr,FXbool mrk);
+ %ignore FXDict::find(const FXchar* ky) const;
%ignore FXDict::data(FXuint pos) const;
+ // Rename this one
+ %rename("length") FXDict::no() const;
+
+ // Mark these as predicate methods
+ %predicate FXDict::empty() const;
+ %predicate FXDict::has_key(const FXchar* ky) const;
+
%exception FXDict::FXDict "$action FXRbRegisterRubyObj(self, result);";
***************
*** 72,81 ****
* Return the size of the table, including the empty slots.
*/
! %name(getSize) FXint size() const;
/**
* Resize the table to the given size.
*/
! %name(setSize) void size(FXint m);
/**
--- 84,93 ----
* Return the size of the table, including the empty slots.
*/
! FXint size() const;
/**
* Resize the table to the given size.
*/
! void size(FXint m);
/**
***************
*** 101,137 ****
* Remove data given key.
*/
! // void* remove(const FXchar* ky); // FIXME
/**
* Find data pointer given key.
*/
! // void* find(const FXchar* ky) const; // FIXME
!
! #ifdef SWIGRUBY
!
! %addmethods {
! // Returns a new array populated with the keys from this hash
! VALUE keys() const {
! VALUE arr = rb_ary_new();
! return arr;
! }
! }
!
! %addmethods {
! // Returns true if the given key is present
! FXbool has_key(const FXchar* ky) {
! return (self->find(ky) != 0);
! }
! }
!
! %addmethods {
! // Returns true if hash contains no key-value pairs
! FXbool empty() const {
! return (self->no() == 0);
! }
! }
- #endif /* SWIGRUBY */
-
/**
* Return key at position pos.
--- 113,123 ----
* Remove data given key.
*/
! void* remove(const FXchar* ky);
/**
* Find data pointer given key.
*/
! void* find(const FXchar* ky) const;
/**
* Return key at position pos.
***************
*** 174,177 ****
--- 160,189 ----
/// Clear all entries
void clear();
+
+ #ifdef SWIGRUBY
+
+ // Add methods similar to those for Ruby's Hash class
+ %extend {
+ // Returns a new array populated with the keys from this hash
+ VALUE keys() const {
+ VALUE arr = rb_ary_new();
+ for(FXint p=self->first(); p<self->size(); p=self->next(p)){
+ rb_ary_push(arr,rb_str_new2(self->key(p)));
+ }
+ return arr;
+ }
+
+ // Returns true if the given key is present
+ FXbool has_key(const FXchar* ky) const {
+ return (self->find(ky) != 0);
+ }
+
+ // Returns true if hash contains no key-value pairs
+ FXbool empty() const {
+ return (self->no() == 0);
+ }
+ }
+
+ #endif /* SWIGRUBY */
/// Destructor
Index: FXDirList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDirList.i,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** FXDirList.i 2 Apr 2002 03:44:27 -0000 1.20
--- FXDirList.i 11 Jul 2002 13:33:14 -0000 1.21
***************
*** 86,89 ****
--- 86,95 ----
};
+ // Rename these methods
+ %rename(getShowFiles) FXDirList::showFiles() const;
+ %rename(setShowFiles) FXDirList::showFiles(FXbool showing);
+ %rename(getShowHiddenFiles) FXDirList::showHiddenFiles() const;
+ %rename(setShowHiddenFiles) FXDirList::showHiddenFiles(FXbool showing);
+
%exception FXDirList::FXDirList "$action FXRbRegisterRubyObj(self, result);";
***************
*** 211,224 ****
/// Return TRUE if showing files as well as directories
! %name(getShowFiles) FXbool showFiles() const;
/// Show or hide normal files
! %name(setShowFiles) void showFiles(FXbool showing);
/// Return TRUE if showing hidden files and directories
! %name(getShowHiddenFiles) FXbool showHiddenFiles() const;
/// Show or hide hidden files and directories
! %name(setShowHiddenFiles) void showHiddenFiles(FXbool showing);
/// Change file associations
--- 217,230 ----
/// Return TRUE if showing files as well as directories
! FXbool showFiles() const;
/// Show or hide normal files
! void showFiles(FXbool showing);
/// Return TRUE if showing hidden files and directories
! FXbool showHiddenFiles() const;
/// Show or hide hidden files and directories
! void showHiddenFiles(FXbool showing);
/// Change file associations
Index: FXDrawable.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDrawable.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FXDrawable.i 19 Mar 2002 23:18:40 -0000 1.10
--- FXDrawable.i 11 Jul 2002 13:33:14 -0000 1.11
***************
*** 65,72 ****
FXRbDrawable();
// Construct with this width and height
FXRbDrawable(FXApp* a,FXint w,FXint h);
- public:
// Destructor
virtual ~FXRbDrawable();
--- 65,72 ----
FXRbDrawable();
+ public:
// Construct with this width and height
FXRbDrawable(FXApp* a,FXint w,FXint h);
// Destructor
virtual ~FXRbDrawable();
Index: FXFileDialog.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileDialog.i,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** FXFileDialog.i 19 Mar 2002 23:18:40 -0000 1.16
--- FXFileDialog.i 11 Jul 2002 13:33:14 -0000 1.17
***************
*** 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.20
diff -C2 -d -r1.19 -r1.20
*** FXFileDict.i 28 Mar 2002 16:32:52 -0000 1.19
--- FXFileDict.i 11 Jul 2002 13:33:14 -0000 1.20
***************
*** 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
***************
*** 93,98 ****
};
- %ignore FXFileDict::FXFileDict(FXApp* a,FXSettings* db);
-
%exception FXFileDict::FXFileDict "$action FXRbRegisterRubyObj(self, result);";
--- 95,98 ----
***************
*** 106,110 ****
public:
#ifdef SWIGRUBY
! %addmethods {
/// Registry key used to find fallback executable icons
static VALUE defaultExecBinding(){
--- 106,110 ----
public:
#ifdef SWIGRUBY
! %extend {
/// Registry key used to find fallback executable icons
static VALUE defaultExecBinding(){
***************
*** 210,215 ****
};
-
- %ignore FXRbFileDict::FXRbFileDict(FXApp* a,FXSettings* db);
%exception FXRbFileDict::FXRbFileDict "$action FXRbRegisterRubyObj(self, result);";
--- 210,213 ----
Index: FXFileList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileList.i,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FXFileList.i 2 Apr 2002 03:44:27 -0000 1.21
--- FXFileList.i 11 Jul 2002 13:33:14 -0000 1.22
***************
*** 106,109 ****
--- 106,116 ----
};
+
+ // Rename these methods
+ %rename(getHiddenFilesShown) FXFileList::showHiddenFiles() const;
+ %rename(setHiddenFilesShown) FXFileList::showHiddenFiles(FXbool showing);
+ %rename(getOnlyDirectoriesShown) FXFileList::showOnlyDirectories() const;
+ %rename(setOnlyDirectoriesShown) FXFileList::showOnlyDirectories(FXbool shown);
+
%exception FXFileList::FXFileList "$action FXRbRegisterRubyObj(self, result);";
Index: FXFileSelector.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFileSelector.i,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** FXFileSelector.i 19 Mar 2002 23:18:40 -0000 1.19
--- FXFileSelector.i 11 Jul 2002 13:33:14 -0000 1.20
***************
*** 40,43 ****
--- 40,48 ----
};
+
+ // Rename these methods
+ %rename(setReadOnlyShown) FXFileSelector::showReadOnly(FXbool show);
+ %rename(getReadOnlyShown) FXFileSelector::shownReadOnly() const;
+
%exception FXFileSelector::FXFileSelector "$action FXRbRegisterRubyObj(self, result);";
***************
*** 131,135 ****
#ifdef SWIGRUBY
! %addmethods {
// Return list of selected file names.
VALUE getFilenames() const {
--- 136,140 ----
#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();
--- 154,158 ----
#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) {
--- 198,202 ----
*/
#ifdef SWIGRUBY
! %extend {
// Takes an array of strings as described above
void setPatternList(VALUE ary) {
***************
*** 262,269 ****
/// Show readonly button
! %name(setReadOnlyShown) void showReadOnly(FXbool show);
/// Return TRUE if readonly is shown
! %name(getReadOnlyShown) FXbool shownReadOnly() const;
/// Set initial state of readonly button
--- 267,274 ----
/// Show readonly button
! void showReadOnly(FXbool show);
/// Return TRUE if readonly is shown
! FXbool shownReadOnly() const;
/// Set initial state of readonly button
Index: FXFont.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFont.i,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** FXFont.i 19 Mar 2002 23:18:40 -0000 1.15
--- FXFont.i 11 Jul 2002 13:33:14 -0000 1.16
***************
*** 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 ----
***************
*** 207,211 ****
FXuint getHints() const;
! %addmethods {
// Get font description
FXFontDesc getFontDesc() const {
--- 204,208 ----
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 {
--- 252,256 ----
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,
--- 266,270 ----
#ifdef SWIGRUBY
! %extend {
// List all fonts matching hints (returns an array of FXFontDesc objects)
static FXbool listFonts(const FXString& face,
***************
*** 294,300 ****
};
- %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);";
--- 291,294 ----
***************
*** 341,344 ****
%}
! %name(fxparsefontdesc) FXFontDesc* fxparsefontdesc2(const FXchar* string);
%name(fxunparsefontdesc) FXString fxunparsefontdesc2(const FXFontDesc& fontdesc);
--- 335,338 ----
%}
! %name(fxparsefontdesc) FXFontDesc *fxparsefontdesc2(const FXchar* string);
%name(fxunparsefontdesc) FXString fxunparsefontdesc2(const FXFontDesc& fontdesc);
Index: FXFontDialog.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXFontDialog.i,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FXFontDialog.i 19 Mar 2002 23:18:40 -0000 1.12
--- FXFontDialog.i 11 Jul 2002 13:33:14 -0000 1.13
***************
*** 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.13
diff -C2 -d -r1.12 -r1.13
*** FXFontSelector.i 19 Mar 2002 23:18:40 -0000 1.12
--- FXFontSelector.i 11 Jul 2002 13:33:14 -0000 1.13
***************
*** 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: FXGIFCursor.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGIFCursor.i,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXGIFCursor.i 19 Mar 2002 23:18:40 -0000 1.11
--- FXGIFCursor.i 11 Jul 2002 13:33:14 -0000 1.12
***************
*** 23,38 ****
%exception FXGIFCursor::FXGIFCursor "$action FXRbRegisterRubyObj(self, result);";
! /// GIF Cursor class
! class FXGIFCursor : public FXCursor {
! protected:
! FXGIFCursor(){}
! public:
! /// Construct a cursor from memory stream formatted as CompuServe GIF format
! FXGIFCursor(FXApp* a,const void* pix,FXint hx=-1,FXint hy=-1);
! /// Destroy
! virtual ~FXGIFCursor(){}
! };
%exception FXRbGIFCursor::FXRbGIFCursor "$action FXRbRegisterRubyObj(self, result);";
--- 23,31 ----
%exception FXGIFCursor::FXGIFCursor "$action FXRbRegisterRubyObj(self, result);";
! %ignore ::fxloadGIF(FXStream& store,FXuchar*& data,FXColor& transp,FXint& width,FXint& height);
! %apply const FXuchar *PIXELS { const FXuchar *data };
! %include FXGIFCursor.h
%exception FXRbGIFCursor::FXRbGIFCursor "$action FXRbRegisterRubyObj(self, result);";
***************
*** 41,45 ****
public:
// Constructor
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx=-1,FXint hy=-1);
// Destructor
--- 34,38 ----
public:
// Constructor
! FXRbGIFCursor(FXApp* a,const void* pix,FXint hx,FXint hy);
// Destructor
***************
*** 54,58 ****
%inline %{
! /// Load a gif file from a stream
VALUE fxloadGIF(FXStream& store){
FXuchar* data;
--- 47,51 ----
%inline %{
! /// Load a GIF file from a stream
VALUE fxloadGIF(FXStream& store){
FXuchar* data;
***************
*** 74,79 ****
}
%}
-
-
- /// Save a gif file to a stream
- FXbool fxsaveGIF(FXStream& store,const FXuchar *PIXELS,FXColor transp,FXint width,FXint height);
--- 67,68 ----
Index: FXGLCanvas.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLCanvas.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** FXGLCanvas.i 19 Mar 2002 23:18:40 -0000 1.14
--- FXGLCanvas.i 11 Jul 2002 13:33:14 -0000 1.15
***************
*** 21,25 ****
***********************************************************************/
- %ignore FXGLCanvas::FXGLCanvas(FXComposite* p,FXGLVisual *vis,FXGLCanvas* sharegroup,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h);
%ignore FXGLCanvas::getContext() const;
--- 21,24 ----
***************
*** 68,73 ****
virtual ~FXGLCanvas();
};
-
- %ignore FXRbGLCanvas::FXRbGLCanvas(FXComposite* p,FXGLVisual *vis,FXGLCanvas* sharegroup,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h);
%exception FXRbGLCanvas::FXRbGLCanvas "$action FXRbRegisterRubyObj(self, result);";
--- 67,70 ----
Index: FXGLContext.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLContext.i,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** FXGLContext.i 19 Mar 2002 23:18:40 -0000 1.14
--- FXGLContext.i 11 Jul 2002 13:33:14 -0000 1.15
***************
*** 25,30 ****
class FXGLVisual;
- %ignore FXGLContext::FXGLContext(FXApp* a,FXGLVisual *vis,FXGLContext *shared);
-
%exception FXGLContext::FXGLContext "$action FXRbRegisterRubyObj(self, result);";
--- 25,28 ----
***************
*** 78,82 ****
};
- %ignore FXRbGLContext::FXRbGLContext(FXApp* a,FXGLVisual *vis,FXGLContext *shared);
%exception FXRbGLContext::FXRbGLContext "$action FXRbRegisterRubyObj(self, result);";
--- 76,79 ----
Index: FXGLObject.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLObject.i,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** FXGLObject.i 2 Apr 2002 03:44:27 -0000 1.23
--- FXGLObject.i 11 Jul 2002 13:33:14 -0000 1.24
***************
*** 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) {
***************
*** 113,116 ****
--- 113,121 ----
%}
+
+ // Rename these methods
+ %rename(removeObj) FXGLGroup::remove(FXGLObject* obj);
+ %rename(removePos) FXGLGroup::remove(FXint pos);
+
%exception FXGLGroup::FXGLGroup "$action FXRbRegisterRubyObj(self, result);";
***************
*** 131,135 ****
FXGLObject* child(FXint pos) const;
! %addmethods {
/// Insert child object at given position
void insert(FXint pos,FXGLObject* obj){
--- 136,140 ----
FXGLObject* child(FXint pos) const;
! %extend {
/// Insert child object at given position
void insert(FXint pos,FXGLObject* obj){
***************
*** 158,165 ****
/// Remove child object
! %name(removeObj) void remove(FXGLObject* obj);
/// Remove child object at given position
! %name(removePos) void remove(FXint pos);
/// Remove all children
--- 163,170 ----
/// Remove child object
! void remove(FXGLObject* obj);
/// Remove child object at given position
! void remove(FXint pos);
/// Remove all children
Index: FXGLShape.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLShape.i,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** FXGLShape.i 2 Apr 2002 03:44:27 -0000 1.17
--- FXGLShape.i 11 Jul 2002 13:33:14 -0000 1.18
***************
*** 41,46 ****
- %ignore FXGLShape::FXGLShape(FXfloat x,FXfloat y,FXfloat z,FXuint opts,const FXMaterial& front,const FXMaterial& back);
-
%exception FXGLShape::FXGLShape "$action FXRbRegisterRubyObj(self, result);";
--- 41,44 ----
***************
*** 107,111 ****
#ifdef SWIGRUBY
! %addmethods {
// Get the material for specified side (where side = 0 or 1)
FXMaterial getMaterial(FXint side) const {
--- 105,109 ----
#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;
--- 114,118 ----
}
#else
! %extend {
%new FXMaterial* getMaterial(FXint side) const {
FXMaterial *mtl = new FXMaterial;
***************
*** 125,130 ****
#endif
};
-
- %ignore FXRbGLShape::FXRbGLShape(FXfloat x,FXfloat y,FXfloat z,FXuint opts,const FXMaterial& front,const FXMaterial& back);
%exception FXRbGLShape::FXRbGLShape "$action FXRbRegisterRubyObj(self, result);";
--- 123,126 ----
Index: FXGLViewer.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXGLViewer.i,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** FXGLViewer.i 19 Mar 2002 23:18:40 -0000 1.25
--- FXGLViewer.i 11 Jul 2002 13:33:14 -0000 1.26
***************
*** 84,89 ****
// typedef FXbool (*FXZSortFunc)(FXfloat*& buffer,FXint& used,FXint& size); FIXME
- %ignore FXGLViewer::FXGLViewer(FXComposite* p,FXGLVisual *vis,FXGLViewer* sharegroup,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
-
/******************************** Viewer Class ******************************/
--- 84,87 ----
***************
*** 328,332 ****
// Common DND type names
! %addmethods {
static VALUE objectTypeName(){
return to_ruby(FXGLViewer::objectTypeName);
--- 326,330 ----
// 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) {
--- 347,351 ----
#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);
--- 364,368 ----
}
#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) {
--- 434,438 ----
#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 {
--- 463,467 ----
#ifdef SWIGRUBY
! %extend {
/// Return the viewer's viewport
FXViewport getViewport() const {
***************
*** 485,489 ****
#else
! %addmethods {
// void getViewport(FXViewport& v) const;
%new FXViewport* getViewport() const {
--- 483,487 ----
#else
! %extend {
// void getViewport(FXViewport& v) const;
%new FXViewport* getViewport() const {
***************
*** 541,545 ****
#ifdef SWIGRUBY
! %addmethods {
/// Return default object material setting
FXMaterial getMaterial() const {
--- 539,543 ----
#ifdef SWIGRUBY
! %extend {
/// Return default object material setting
FXMaterial getMaterial() const {
***************
*** 550,554 ****
}
#else
! %addmethods {
/// Return default object material setting
%new FXMaterial* getMaterial() const {
--- 548,552 ----
}
#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) {
--- 598,602 ----
#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) {
--- 622,626 ----
}
#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) {
--- 749,753 ----
#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;
--- 780,784 ----
}
#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){
}
--- 849,853 ----
* 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;
--- 857,861 ----
#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 {
--- 888,892 ----
#ifdef SWIGRUBY
! %extend {
// Return light source settings
FXLight getLight() const {
***************
*** 899,903 ****
}
#else
! %addmethods {
// Return light source settings
%new FXLight* getLight() const {
--- 897,901 ----
}
#else
! %extend {
// Return light source settings
%new FXLight* getLight() const {
***************
*** 917,921 ****
- %ignore FXRbGLViewer::FXRbGLViewer(FXComposite* p,FXGLVisual *vis,FXGLViewer* sharegroup,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
%exception FXRbGLViewer::FXRbGLViewer "$action FXRbRegisterRubyObj(self, result);";
--- 915,918 ----
Index: FXHMat.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXHMat.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FXHMat.i 19 Mar 2002 23:18:40 -0000 1.9
--- FXHMat.i 11 Jul 2002 13:33:14 -0000 1.10
***************
*** 21,49 ****
***********************************************************************/
- %ignore FXHMat::FXHMat();
- %ignore FXHMat::FXHMat(FXfloat w);
- %ignore FXHMat::FXHMat(const FXHVec& a,const FXHVec& b,const FXHVec& c,const FXHVec& d);
- %ignore FXHMat::FXHMat(const FXHMat& other);
-
- %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 ----
***************
*** 62,66 ****
// Operators
! %addmethods {
// Add matrices
FXHMat __add__(const FXHMat& other) {
--- 37,41 ----
// 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.7
diff -C2 -d -r1.6 -r1.7
*** FXHVec.i 19 Mar 2002 23:18:40 -0000 1.6
--- FXHVec.i 11 Jul 2002 13:33:14 -0000 1.7
***************
*** 21,29 ****
***********************************************************************/
- %ignore FXHVec::FXHVec();
- %ignore FXHVec::FXHVec(const FXHVec& w);
- %ignore FXHVec::FXHVec(const FXVec& w);
- %ignore FXHVec::FXHVec(FXColor color);
-
%exception FXHVec::FXHVec "$action FXRbRegisterRubyObj(self, result);";
--- 21,24 ----
***************
*** 46,50 ****
// Other good stuff
! %addmethods {
FXfloat __getitem__(FXint i){
if(i<0||i>3){
--- 41,45 ----
// 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.31
diff -C2 -d -r1.30 -r1.31
*** FXHeader.i 2 Apr 2002 03:44:27 -0000 1.30
--- FXHeader.i 11 Jul 2002 13:33:14 -0000 1.31
***************
*** 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,194 ****
#ifdef SWIGRUBY
! %addmethods {
/// 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);
--- 188,194 ----
#ifdef SWIGRUBY
! %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);
***************
*** 223,229 ****
! %addmethods {
/// 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;
--- 223,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);
! %addmethods {
/// 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);
! %addmethods {
/// 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,290 ****
/// 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
! %addmethods {
/// Remove item at index
void removeItem(FXint index,FXbool notify=FALSE){
--- 283,290 ----
/// 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
! %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: FXIcon.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIcon.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FXIcon.i 19 Mar 2002 23:18:40 -0000 1.9
--- FXIcon.i 11 Jul 2002 13:33:14 -0000 1.10
***************
*** 38,42 ****
* and options as in FXImage.
*/
! FXIcon(FXApp* a,const void *pix=NULL,FXColor clr=0,FXuint opts=0,FXint w=1,FXint h=1);
/// Create the icon resource
--- 38,42 ----
* and options as in FXImage.
*/
! FXIcon(FXApp* a,const void *IMGPIXELS=NULL,FXColor clr=0,FXuint opts=0,FXint w=1,FXint h=1);
/// Create the icon resource
***************
*** 70,74 ****
public:
// Constructor
! FXRbIcon(FXApp* a,const void *pix=NULL,FXColor clr=0,FXuint opts=0,FXint w=1,FXint h=1);
// Destructor
--- 70,74 ----
public:
// Constructor
! FXRbIcon(FXApp* a,const void *IMGPIXELS=NULL,FXColor clr=0,FXuint opts=0,FXint w=1,FXint h=1);
// Destructor
Index: FXIconList.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXIconList.i,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** FXIconList.i 2 Apr 2002 03:44:27 -0000 1.34
--- FXIconList.i 11 Jul 2002 13:33:14 -0000 1.35
***************
*** 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,285 ****
FXIconItem *retrieveItem(FXint index) const;
! %addmethods {
/// 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);
--- 279,285 ----
FXIconItem *retrieveItem(FXint index) const;
! %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);
***************
*** 314,320 ****
! %addmethods {
/// 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;
--- 314,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);
! %addmethods {
/// 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);
! %addmethods {
/// 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,354 ****
/// 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);
! %addmethods {
/// Remove item from list
void removeItem(FXint index,FXbool notify=FALSE){
--- 348,354 ----
/// 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 {
/// Remo...
[truncated message content] |
