fxruby-commits

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

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

Modified Files:
	FXRbDCVirtuals.h FXRbGIFCursor.h FXRbMDIChild.h 
	FXRbMDIClient.h FXRbMenuBar.h FXRbSeparator.h 
	FXRbToolBarGrip.h FXRbTopWindow.h FXRbTopWindowVirtuals.h 
Added Files:
	FXRbMDIClientVirtuals.h 
Log Message:
Many, many changes for the fox-1.1 update.


--- NEW FILE: FXRbMDIClientVirtuals.h ---
public:
  // Calls the base class version of setActiveChild()
  FXbool _setActiveChild(FXMDIChild* child=NULL,FXbool notify=FALSE);

  // Overrides the base class version of setActiveChild()
  virtual FXbool setActiveChild(FXMDIChild* child=NULL,FXbool notify=FALSE);

  // Calls the base class version of cascade()
  void _cascade(FXbool notify=FALSE);

  // Overrides the base class version of cascade()
  virtual void cascade(FXbool notify=FALSE);

  // Calls the base class version of horizontal()
  void _horizontal(FXbool notify=FALSE);

  // Overrides the base class version of horizontal()
  virtual void horizontal(FXbool notify=FALSE);

  // Calls the base class version of vertical()
  void _vertical(FXbool notify=FALSE);

  // Overrides the base class version of vertical()
  virtual void vertical(FXbool notify=FALSE);

Index: FXRbDCVirtuals.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbDCVirtuals.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXRbDCVirtuals.h	11 Jul 2002 18:00:23 -0000	1.4
--- FXRbDCVirtuals.h	12 Jul 2002 16:34:46 -0000	1.5
***************
*** 91,98 ****
  
    // Calls the base class version of fillChords()
!   void _fillChords(const FXChord* chords,FXuint nchords);
  
    // Overrides the base class version of fillChords()
!   virtual void fillChords(const FXChord* chords,FXuint nchords);
  
    // Calls the base class version of fillArc()
--- 91,98 ----
  
    // Calls the base class version of fillChords()
!   void _fillChords(const FXArc* chords,FXuint nchords);
  
    // Overrides the base class version of fillChords()
!   virtual void fillChords(const FXArc* chords,FXuint nchords);
  
    // Calls the base class version of fillArc()

Index: FXRbGIFCursor.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbGIFCursor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXRbGIFCursor.h	11 Jul 2002 13:33:12 -0000	1.2
--- FXRbGIFCursor.h	12 Jul 2002 16:34:46 -0000	1.3
***************
*** 37,41 ****
  public:
    /// Construct a cursor from memory stream formatted as CompuServe GIF format
!   FXRbGIFCursor(FXApp* a,const void* pix,FXint hx,FXint hy):FXGIFCursor(a,pix,hx,hy){
      FXRbRegisterAppSensitiveObject(this);
      }
--- 37,41 ----
  public:
    /// Construct a cursor from memory stream formatted as CompuServe GIF format
!   FXRbGIFCursor(FXApp* a,const void* pix,FXint hx=0,FXint hy=0):FXGIFCursor(a,pix,hx,hy){
      FXRbRegisterAppSensitiveObject(this);
      }

Index: FXRbMDIChild.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbMDIChild.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbMDIChild.h	12 Jul 2001 19:44:18 -0000	1.1
--- FXRbMDIChild.h	12 Jul 2002 16:34:46 -0000	1.2
***************
*** 29,49 ****
  
  #define IMPLEMENT_FXMDICHILD_STUBS(cls,baseclass) \
!   void cls::_minimize(FXbool notify){ \
!     baseclass::minimize(notify); \
      } \
!   void cls::minimize(FXbool notify){ \
!     FXRbCallVoidMethod(this,"minimize",notify); \
      } \
!   void cls::_maximize(FXbool notify){ \
!     baseclass::maximize(notify); \
      } \
!   void cls::maximize(FXbool notify){ \
!     FXRbCallVoidMethod(this,"maximize",notify); \
      } \
!   void cls::_restore(FXbool notify){ \
!     baseclass::restore(notify); \
      } \
!   void cls::restore(FXbool notify){ \
!     FXRbCallVoidMethod(this,"restore",notify); \
      }
  
--- 29,55 ----
  
  #define IMPLEMENT_FXMDICHILD_STUBS(cls,baseclass) \
!   FXbool cls::_minimize(FXbool notify){ \
!     return baseclass::minimize(notify); \
      } \
!   FXbool cls::minimize(FXbool notify){ \
!     return FXRbCallBoolMethod(this,"minimize",notify); \
      } \
!   FXbool cls::_maximize(FXbool notify){ \
!     return baseclass::maximize(notify); \
      } \
!   FXbool cls::maximize(FXbool notify){ \
!     return FXRbCallBoolMethod(this,"maximize",notify); \
      } \
!   FXbool cls::_restore(FXbool notify){ \
!     return baseclass::restore(notify); \
      } \
!   FXbool cls::restore(FXbool notify){ \
!     return FXRbCallBoolMethod(this,"restore",notify); \
!     } \
!   FXbool cls::_close(FXbool notify){ \
!     return baseclass::close(notify); \
!     } \
!   FXbool cls::close(FXbool notify){ \
!     return FXRbCallBoolMethod(this,"restore",notify); \
      }
  

Index: FXRbMDIClient.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbMDIClient.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbMDIClient.h	12 Jul 2001 19:44:18 -0000	1.1
--- FXRbMDIClient.h	12 Jul 2002 16:34:46 -0000	1.2
***************
*** 28,31 ****
--- 28,57 ----
  #define FXRBMDICLIENT_H
  
+ #define IMPLEMENT_FXMDICLIENT_STUBS(cls,baseclass) \
+   FXbool cls::_setActiveChild(FXMDIChild* child,FXbool notify){ \
+     return baseclass::setActiveChild(child,notify); \
+     } \
+   FXbool cls::setActiveChild(FXMDIChild* child,FXbool notify){ \
+     return FXRbCallBoolMethod(this,"setActiveChild",child,notify); \
+     } \
+   void cls::_cascade(FXbool notify){ \
+     baseclass::cascade(notify); \
+     } \
+   void cls::cascade(FXbool notify){ \
+     FXRbCallVoidMethod(this,"cascade",notify); \
+     } \
+   void cls::_horizontal(FXbool notify){ \
+     baseclass::horizontal(notify); \
+     } \
+   void cls::horizontal(FXbool notify){ \
+     FXRbCallVoidMethod(this,"horizontal",notify); \
+     } \
+   void cls::_vertical(FXbool notify){ \
+     baseclass::vertical(notify); \
+     } \
+   void cls::vertical(FXbool notify){ \
+     FXRbCallVoidMethod(this,"vertical",notify); \
+     }
+ 
  class FXRbMDIClient : public FXMDIClient {
    FXDECLARE(FXRbMDIClient)
***************
*** 36,40 ****
  #include "FXRbDrawableVirtuals.h"
  #include "FXRbWindowVirtuals.h"
! #include "FXRbScrollAreaVirtuals.h"
  public:
    /// Construct MDI Client window
--- 62,66 ----
  #include "FXRbDrawableVirtuals.h"
  #include "FXRbWindowVirtuals.h"
! #include "FXRbMDIClientVirtuals.h"
  public:
    /// Construct MDI Client window

Index: FXRbMenuBar.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbMenuBar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbMenuBar.h	4 Apr 2002 02:10:48 -0000	1.1
--- FXRbMenuBar.h	12 Jul 2002 16:34:46 -0000	1.2
***************
*** 36,40 ****
  #include "FXRbDrawableVirtuals.h"
  #include "FXRbWindowVirtuals.h"
! #include "FXRbToolbarVirtuals.h"
  public:
    /**
--- 36,40 ----
  #include "FXRbDrawableVirtuals.h"
  #include "FXRbWindowVirtuals.h"
! #include "FXRbToolBarVirtuals.h"
  public:
    /**

Index: FXRbSeparator.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbSeparator.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbSeparator.h	12 Jul 2001 19:44:18 -0000	1.1
--- FXRbSeparator.h	12 Jul 2002 16:34:46 -0000	1.2
***************
*** 28,31 ****
--- 28,53 ----
  #define FXRBSEPARATOR_H
  
+ class FXRbSeparator : public FXSeparator {
+   FXDECLARE(FXRbSeparator)
+ protected:
+   FXRbSeparator(){}
+ #include "FXRbObjectVirtuals.h"
+ #include "FXRbIdVirtuals.h"
+ #include "FXRbDrawableVirtuals.h"
+ #include "FXRbWindowVirtuals.h"
+ public:
+   /// Constructor
+   FXRbSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=1,FXint pr=1,FXint pt=0,FXint pb=0) : FXSeparator(p,opts,x,y,w,h,pl,pr,pt,pb){}
+ 
+   // Destructor
+   virtual ~FXRbSeparator(){
+     FXRbUnregisterRubyObj(this);
+     }
+ 
+   // Mark dependencies for the GC
+   static void markfunc(FXSeparator* self);
+   };
+   
+   
  class FXRbHorizontalSeparator : public FXHorizontalSeparator {
    FXDECLARE(FXRbHorizontalSeparator)

Index: FXRbToolBarGrip.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbToolBarGrip.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbToolBarGrip.h	4 Apr 2002 02:10:48 -0000	1.1
--- FXRbToolBarGrip.h	12 Jul 2002 16:34:46 -0000	1.2
***************
*** 38,42 ****
  public:
    /// Construct toolbar grip 
!   FXRbToolBarGrip(FXToolbar* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=TOOLBARGRIP_SINGLE,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXToolBarGrip(p,tgt,sel,opts,x,y,w,h){}
  
    // Destructor
--- 38,42 ----
  public:
    /// Construct toolbar grip 
!   FXRbToolBarGrip(FXToolBar* p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=TOOLBARGRIP_SINGLE,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXToolBarGrip(p,tgt,sel,opts,x,y,w,h){}
  
    // Destructor

Index: FXRbTopWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbTopWindow.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXRbTopWindow.h	11 Jul 2002 13:33:12 -0000	1.2
--- FXRbTopWindow.h	12 Jul 2002 16:34:47 -0000	1.3
***************
*** 35,49 ****
      FXRbCallVoidMethod(this,"show",placement); \
      } \
!   void cls::_iconify(){ \
!     baseclass::iconify(); \
      } \
!   void cls::iconify(){ \
!     FXRbCallVoidMethod(this,"iconify"); \
      } \
!   void cls::_deiconify(){ \
!     baseclass::deiconify(); \
      } \
!   void cls::deiconify(){ \
!     FXRbCallVoidMethod(this,"deiconify"); \
      }
  
--- 35,61 ----
      FXRbCallVoidMethod(this,"show",placement); \
      } \
!   FXbool cls::_maximize(FXbool notify){ \
!     return baseclass::maximize(notify); \
      } \
!   FXbool cls::maximize(FXbool notify){ \
!     return FXRbCallBoolMethod(this,"maximize",notify); \
      } \
!   FXbool cls::_minimize(FXbool notify){ \
!     return baseclass::minimize(notify); \
      } \
!   FXbool cls::minimize(FXbool notify){ \
!     return FXRbCallBoolMethod(this,"minimize",notify); \
!     } \
!   FXbool cls::_restore(FXbool notify){ \
!     return baseclass::restore(notify); \
!     } \
!   FXbool cls::restore(FXbool notify){ \
!     return FXRbCallBoolMethod(this,"restore",notify); \
!     } \
!   FXbool cls::_close(FXbool notify){ \
!     return baseclass::close(notify); \
!     } \
!   FXbool cls::close(FXbool notify){ \
!     return FXRbCallBoolMethod(this,"close",notify); \
      }
  

Index: FXRbTopWindowVirtuals.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/include/FXRbTopWindowVirtuals.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXRbTopWindowVirtuals.h	12 Jul 2001 19:44:19 -0000	1.1
--- FXRbTopWindowVirtuals.h	12 Jul 2002 16:34:47 -0000	1.2
***************
*** 6,18 ****
    virtual void show(FXuint placement);
  
!   // Calls the base class version of iconify()
!   void _iconify();
  
!   // Overrides the base class version of iconify()
!   virtual void iconify();
  
!   // Calls the base class version of deiconify()
!   void _deiconify();
  
!   // Overrides the base class version of deiconify()
!   virtual void deiconify();
--- 6,30 ----
    virtual void show(FXuint placement);
  
!   // Calls the base class version of maximize()
!   FXbool _maximize(FXbool notify=FALSE);
  
!   // Overrides the base class version of maximize()
!   virtual FXbool maximize(FXbool notify=FALSE);
  
!   // Calls the base class version of minimize()
!   FXbool _minimize(FXbool notify=FALSE);
  
!   // Overrides the base class version of minimize()
!   virtual FXbool minimize(FXbool notify=FALSE);
! 
!   // Calls the base class version of restore()
!   FXbool _restore(FXbool notify=FALSE);
! 
!   // Overrides the base class version of restore()
!   virtual FXbool restore(FXbool notify=FALSE);
! 
!   // Calls the base class version of close()
!   FXbool _close(FXbool notify=FALSE);
! 
!   // Overrides the base class version of close()
!   virtual FXbool close(FXbool notify=FALSE);