[Fxruby-commits] CVS: FXRuby/swig-interfaces FXDrawable.i,1.10,1.10.2.1 FXShell.i,1.12,1.12.2.1 FXTopWindow.i,1.17,1.17.2.1 FXWindow.i,1.32.2.2,1.32.2.3

[Lyle J. <ly...@us...>]

Update of /cvsroot/fxruby/FXRuby/swig-interfaces
In directory usw-pr-cvs1:/tmp/cvs-serv21837/swig-interfaces

Modified Files:
      Tag: release10
	FXDrawable.i FXShell.i FXTopWindow.i FXWindow.i 
Log Message:
Made the constructors for FXDrawable, FXShell and FXTopWindow public so
that these classes can be subclassed in FXRuby.


Index: FXDrawable.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXDrawable.i,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** FXDrawable.i	19 Mar 2002 23:18:40 -0000	1.10
--- FXDrawable.i	13 Jun 2002 15:06:55 -0000	1.10.2.1
***************
*** 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: FXShell.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXShell.i,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** FXShell.i	19 Mar 2002 23:18:40 -0000	1.12
--- FXShell.i	13 Jun 2002 15:06:55 -0000	1.12.2.1
***************
*** 41,48 ****
--- 41,57 ----
    };
  
+ // Don't attempt to wrap this overloaded constructor
+ %ignore FXRbShell::FXRbShell(FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h);
+ 
  %exception FXRbShell::FXRbShell "$action FXRbRegisterRubyObj(self, result);";
  
  class FXRbShell : public FXShell {
  public:
+   // Construct free-floating shell window
+   FXRbShell(FXApp* a,FXuint opts,FXint x,FXint y,FXint w,FXint h);
+   
+   // Construct owned shell window
+   FXRbShell(FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h);
+ 
    // Destructor
    virtual ~FXRbShell();

Index: FXTopWindow.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXTopWindow.i,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** FXTopWindow.i	19 Mar 2002 23:18:40 -0000	1.17
--- FXTopWindow.i	13 Jun 2002 15:06:55 -0000	1.17.2.1
***************
*** 166,173 ****
--- 166,182 ----
    };
  
+ // Don't try to wrap this overloaded constructor
+ %ignore FXRbTopWindow::FXRbTopWindow(FXWindow* owner,const FXString& name,FXIcon *ic,FXIcon *mi,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs);
+ 
  %exception FXRbTopWindow::FXRbTopWindow "$action FXRbRegisterRubyObj(self, result);";
  
  class FXRbTopWindow : public FXTopWindow {
  public:
+   // Construct free-floating top-level window
+   FXRbTopWindow(FXApp* a,const FXString& name,FXIcon *ic,FXIcon *mi,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs);
+   
+   // Construct owned top-level window
+   FXRbTopWindow(FXWindow* owner,const FXString& name,FXIcon *ic,FXIcon *mi,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb,FXint hs,FXint vs);
+ 
    // Destructor
    virtual ~FXRbTopWindow();

Index: FXWindow.i
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/swig-interfaces/FXWindow.i,v
retrieving revision 1.32.2.2
retrieving revision 1.32.2.3
diff -C2 -d -r1.32.2.2 -r1.32.2.3
*** FXWindow.i	24 May 2002 22:20:57 -0000	1.32.2.2
--- FXWindow.i	13 Jun 2002 15:06:55 -0000	1.32.2.3
***************
*** 817,820 ****
--- 817,824 ----
    };
    
+ // Don't attempt to wrap these two overloaded constructors
+ %ignore FXRbWindow::FXRbWindow(FXApp* a,FXVisual *vis);
+ %ignore FXRbWindow::FXRbWindow(FXApp* a,FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h);
+ 
  %exception FXRbWindow::FXRbWindow "$action FXRbRegisterRubyObj(self, result);";
  
***************
*** 824,827 ****
--- 828,837 ----
    FXRbWindow(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
  
+   // Another constructor
+   FXRbWindow(FXApp* a,FXVisual *vis);
+   
+   // Yet another constructor
+   FXRbWindow(FXApp* a,FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h);
+   
    // Destructor
    virtual ~FXRbWindow();