[Fxruby-commits] CVS: FXRuby/ext/fox/include FXRbDrawable.h,1.1,1.1.2.1 FXRbShell.h,1.1,1.1.2.1 FXRbTopWindow.h,1.1,1.1.2.1 FXRbWindow.h,1.3,1.3.2.1

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

Update of /cvsroot/fxruby/FXRuby/ext/fox/include
In directory usw-pr-cvs1:/tmp/cvs-serv21837/ext/fox/include

Modified Files:
      Tag: release10
	FXRbDrawable.h FXRbShell.h FXRbTopWindow.h FXRbWindow.h 
Log Message:
Made the constructors for FXDrawable, FXShell and FXTopWindow public so
that these classes can be subclassed in FXRuby.


Index: FXRbDrawable.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbDrawable.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** FXRbDrawable.h	12 Jul 2001 19:44:17 -0000	1.1
--- FXRbDrawable.h	13 Jun 2002 15:06:55 -0000	1.1.2.1
***************
*** 46,53 ****
    FXRbDrawable(){}
  
    // Construct with specified width and height
    FXRbDrawable(FXApp* a,FXint w,FXint h) : FXDrawable(a,w,h){}
  
- public:
    // Mark dependencies for the GC
    static void markfunc(FXDrawable* drawable);
--- 46,53 ----
    FXRbDrawable(){}
  
+ public:
    // Construct with specified width and height
    FXRbDrawable(FXApp* a,FXint w,FXint h) : FXDrawable(a,w,h){}
  
    // Mark dependencies for the GC
    static void markfunc(FXDrawable* drawable);

Index: FXRbShell.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbShell.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** FXRbShell.h	12 Jul 2001 19:44:18 -0000	1.1
--- FXRbShell.h	13 Jun 2002 15:06:55 -0000	1.1.2.1
***************
*** 38,41 ****
--- 38,42 ----
    FXRbShell(){}
  
+ public:
    // Construct shell with specified application
    FXRbShell(FXApp* a,FXuint opts,FXint x,FXint y,FXint w,FXint h) : FXShell(a,opts,x,y,w,h){}
***************
*** 44,48 ****
    FXRbShell(FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h) : FXShell(own,opts,x,y,w,h){}
  
- public:
    // Mark dependencies for the GC
    static void markfunc(FXShell* shell);
--- 45,48 ----

Index: FXRbTopWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbTopWindow.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** FXRbTopWindow.h	12 Jul 2001 19:44:19 -0000	1.1
--- FXRbTopWindow.h	13 Jun 2002 15:06:55 -0000	1.1.2.1
***************
*** 58,62 ****
  #include "FXRbWindowVirtuals.h"
  #include "FXRbTopWindowVirtuals.h"
! protected:
    // Construct unowned 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) : FXTopWindow(a,name,ic,mi,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
--- 58,62 ----
  #include "FXRbWindowVirtuals.h"
  #include "FXRbTopWindowVirtuals.h"
! public:
    // Construct unowned 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) : FXTopWindow(a,name,ic,mi,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
***************
*** 64,68 ****
    // 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) : FXTopWindow(owner,name,ic,mi,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
! public:
    // Mark dependencies for the GC
    static void markfunc(FXTopWindow* top);
--- 64,68 ----
    // 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) : FXTopWindow(owner,name,ic,mi,opts,x,y,w,h,pl,pr,pt,pb,hs,vs){}
! 
    // Mark dependencies for the GC
    static void markfunc(FXTopWindow* top);

Index: FXRbWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbWindow.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** FXRbWindow.h	26 Nov 2001 17:47:45 -0000	1.3
--- FXRbWindow.h	13 Jun 2002 15:06:55 -0000	1.3.2.1
***************
*** 177,185 ****
  protected:
    FXRbWindow(){}
-   FXRbWindow(FXApp* a,FXVisual *vis):FXWindow(a,vis){}
-   FXRbWindow(FXApp* a,FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h):FXWindow(a,own,opts,x,y,w,h){}
  public:
    // Constructor
    FXRbWindow(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXWindow(p,opts,x,y,w,h){}
  
    // Mark dependencies for the GC
--- 177,189 ----
  protected:
    FXRbWindow(){}
  public:
    // Constructor
    FXRbWindow(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXWindow(p,opts,x,y,w,h){}
+ 
+   // Another constructor
+   FXRbWindow(FXApp* a,FXVisual *vis):FXWindow(a,vis){}
+   
+   // Yet another constructor
+   FXRbWindow(FXApp* a,FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h):FXWindow(a,own,opts,x,y,w,h){}
  
    // Mark dependencies for the GC