fxruby 1.4.7 → 1.6.0

data/ext/{fox14 → fox16}/impl.cpp

@@ -95,6 +95,24 @@ IMPLEMENT_FXWINDOW_STUBS(FXRbColorDialog)
 IMPLEMENT_FXTOPWINDOW_STUBS(FXRbColorDialog)
 IMPLEMENT_FXDIALOGBOX_STUBS(FXRbColorDialog)
 
+/* Start stub implementations for class FXRbColorItem */
+IMPLEMENT_FXOBJECT_STUBS(FXRbColorItem)
+IMPLEMENT_FXLISTITEM_STUBS(FXRbColorItem)
+
+/* Start stub implementations for class FXRbColorList */
+IMPLEMENT_FXOBJECT_STUBS(FXRbColorList)
+IMPLEMENT_FXID_STUBS(FXRbColorList)
+IMPLEMENT_FXDRAWABLE_STUBS(FXRbColorList)
+IMPLEMENT_FXWINDOW_STUBS(FXRbColorList)
+IMPLEMENT_FXSCROLLAREA_STUBS(FXRbColorList)
+IMPLEMENT_FXLIST_STUBS(FXRbColorList)
+
+/* Start stub implementations for class FXRbColorRing */
+IMPLEMENT_FXOBJECT_STUBS(FXRbColorRing)
+IMPLEMENT_FXID_STUBS(FXRbColorRing)
+IMPLEMENT_FXDRAWABLE_STUBS(FXRbColorRing)
+IMPLEMENT_FXWINDOW_STUBS(FXRbColorRing)
+
 /* Start stub implementations for class FXRbColorSelector */
 IMPLEMENT_FXOBJECT_STUBS(FXRbColorSelector)
 IMPLEMENT_FXID_STUBS(FXRbColorSelector)
@@ -293,6 +311,7 @@ IMPLEMENT_FXFOLDINGLIST_STUBS(FXRbFoldingList)
 /* Start stub implementations for class FXRbFont */
 IMPLEMENT_FXOBJECT_STUBS(FXRbFont)
 IMPLEMENT_FXID_STUBS(FXRbFont)
+IMPLEMENT_FXFONT_STUBS(FXRbFont)
 
 /* Start stub implementations for class FXRbFontDialog */
 IMPLEMENT_FXOBJECT_STUBS(FXRbFontDialog)
@@ -468,6 +487,12 @@ IMPLEMENT_FXID_STUBS(FXRbJPGImage)
 IMPLEMENT_FXDRAWABLE_STUBS(FXRbJPGImage)
 IMPLEMENT_FXIMAGE_STUBS(FXRbJPGImage)
 
+/* Start stub implementations for class FXRbKnob */
+IMPLEMENT_FXOBJECT_STUBS(FXRbKnob)
+IMPLEMENT_FXID_STUBS(FXRbKnob)
+IMPLEMENT_FXDRAWABLE_STUBS(FXRbKnob)
+IMPLEMENT_FXWINDOW_STUBS(FXRbKnob)
+
 /* Start stub implementations for class FXRbLabel */
 IMPLEMENT_FXOBJECT_STUBS(FXRbLabel)
 IMPLEMENT_FXID_STUBS(FXRbLabel)
@@ -1045,6 +1070,10 @@ IMPLEMENT_FXDRAWABLE_STUBS(FXRbTopWindow)
 IMPLEMENT_FXWINDOW_STUBS(FXRbTopWindow)
 IMPLEMENT_FXTOPWINDOW_STUBS(FXRbTopWindow)
 
+/* Start stub implementations for class FXRbTranslator */
+IMPLEMENT_FXOBJECT_STUBS(FXRbTranslator)
+IMPLEMENT_FXTRANSLATOR_STUBS(FXRbTranslator)
+
 /* Start stub implementations for class FXRbTreeItem */
 IMPLEMENT_FXOBJECT_STUBS(FXRbTreeItem)
 IMPLEMENT_FXTREEITEM_STUBS(FXRbTreeItem,FXTreeItem)

data/ext/{fox14 → fox16}/include/FXMemoryBuffer.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXMemoryBuffer.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXMemoryBuffer.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXMEMORYBUFFER_H

data/ext/{fox14 → fox16}/include/FXRb4Splitter.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRb4Splitter.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRb4Splitter.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRB4SPLITTER_H

data/ext/{fox14 → fox16}/include/FXRb7Segment.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRb7Segment.h 2147 2005-08-18 12:21:36Z lyle $
+ * $Id: FXRb7Segment.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRB7SEGMENT_H

data/ext/{fox14 → fox16}/include/FXRbAccelTable.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbAccelTable.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbAccelTable.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBACCELTABLE_H

data/ext/{fox14 → fox16}/include/FXRbApp.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbApp.h 2140 2005-08-16 03:27:22Z lyle $
+ * $Id: FXRbApp.h 2335 2006-01-28 02:33:03Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBAPP_H
@@ -38,7 +38,7 @@ inline void cls ## _detach(cls *self){ \
 inline void cls ## _create(cls *self){ \
   self->cls::create(); \
   } \
-static void cls ## _init(cls* self,VALUE ary,FXbool connect){ \
+static void cls ## _init(cls* self,VALUE ary,bool connect){ \
   int i; \
   char **argv; \
   int argc=1+RARRAY(ary)->len; \
@@ -90,7 +90,7 @@ inline void cls ## _exit(cls *self,FXint code){ \
   void cls::destroy(){ \
     FXRbCallVoidMethod(this,rb_intern("destroy")); \
     } \
-  void cls::init(int& argc,char** argv,FXbool connect){ \
+  void cls::init(int& argc,char** argv,bool connect){ \
     int i; \
     VALUE ary=rb_ary_new(); \
     for(i=1; i<argc; i++){ \

data/ext/{fox14 → fox16}/include/FXRbAppVirtuals.h

@@ -9,7 +9,7 @@ public:
   virtual void destroy();
 
   // Overrides the base class version of init()
-  virtual void init(int& argc, char** argv,FXbool connect=TRUE);
+  virtual void init(int& argc, char** argv,bool connect=true);
 
   // Overrides the base class version of exit()
   virtual void exit(FXint code=0);

data/ext/{fox14 → fox16}/include/FXRbArrowButton.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbArrowButton.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbArrowButton.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBARROWBUTTON_H

data/ext/{fox14 → fox16}/include/FXRbBMPIcon.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbBMPIcon.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbBMPIcon.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBBMPICON_H

data/ext/{fox14 → fox16}/include/FXRbBMPImage.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbBMPImage.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbBMPImage.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBBMPIMAGE_H

data/ext/{fox14 → fox16}/include/FXRbBitmap.h

@@ -21,23 +21,26 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbBitmap.h 2140 2005-08-16 03:27:22Z lyle $
+ * $Id: FXRbBitmap.h 2335 2006-01-28 02:33:03Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBBITMAP_H
 #define FXRBBITMAP_H
 
 #define DECLARE_FXBITMAP_STUBS(cls) \
+inline void cls ## _restore(cls* self){ \
+  self->cls::restore(); \
+  } \
 inline void cls ## _render(cls* self){ \
   self->cls::render(); \
   } \
 inline void cls ## _release(cls* self){ \
   self->cls::release(); \
   } \
-inline FXbool cls ## _savePixels(const cls* self,FXStream& store){ \
+inline bool cls ## _savePixels(const cls* self,FXStream& store){ \
   return self->cls::savePixels(store); \
   } \
-inline FXbool cls ## _loadPixels(cls* self,FXStream& store){ \
+inline bool cls ## _loadPixels(cls* self,FXStream& store){ \
   return self->cls::loadPixels(store); \
   } \
 inline void cls ## _scale(cls* self,FXint w,FXint h){ \
@@ -54,20 +57,29 @@ inline void cls ## _crop(cls* self,FXint x,FXint y,FXint w,FXint h,FXbool color)
   } \
 inline void cls ## _fill(cls* self,FXbool color){ \
   self->cls::fill(color); \
+  } \
+inline void cls ## _setData(cls* self,FXuchar* pix,FXuint opts){ \
+  self->cls::setData(pix,opts); \
+  } \
+inline void cls ## _setData(cls* self,FXuchar* pix,FXuint opts,FXint w,FXint h){ \
+  self->cls::setData(pix,opts,w,h); \
   }
 
 
 #define IMPLEMENT_FXBITMAP_STUBS(cls) \
+  void cls::restore(){ \
+    FXRbCallVoidMethod(this,rb_intern("restore")); \
+    } \
   void cls::render(){ \
     FXRbCallVoidMethod(this,rb_intern("render")); \
     } \
   void cls::release(){ \
     FXRbCallVoidMethod(this,rb_intern("release")); \
     } \
-  FXbool cls::savePixels(FXStream& store) const { \
+  bool cls::savePixels(FXStream& store) const { \
     return FXRbCallBoolMethod(this,rb_intern("savePixels"),store); \
     } \
-  FXbool cls::loadPixels(FXStream& store){ \
+  bool cls::loadPixels(FXStream& store){ \
     return FXRbCallBoolMethod(this,rb_intern("loadPixels"),store); \
     } \
   void cls::scale(FXint w,FXint h){ \
@@ -84,6 +96,12 @@ inline void cls ## _fill(cls* self,FXbool color){ \
     } \
   void cls::fill(FXbool color){ \
     FXRbCallVoidMethod(this,rb_intern("fill"),color); \
+    } \
+  void cls::setData(FXuchar* pix,FXuint opts){ \
+    FXRbCallVoidMethod(this,rb_intern("setData"),pix,opts); \
+    } \
+  void cls::setData(FXuchar* pix,FXuint opts,FXint w,FXint h){ \
+    FXRbCallVoidMethod(this,rb_intern("setData"),pix,opts,w,h); \
     }
   
 

data/ext/{fox14 → fox16}/include/FXRbBitmapFrame.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbBitmapFrame.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbBitmapFrame.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
  
 #ifndef FXRBBITMAPFRAME_H

data/ext/{fox14 → fox16}/include/FXRbBitmapView.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbBitmapView.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbBitmapView.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBBITMAPVIEW_H

data/ext/{fox14 → fox16}/include/FXRbBitmapVirtuals.h

@@ -1,4 +1,7 @@
 public:
+  // Overrides the base class version of restore()
+  virtual void restore();
+
   // Overrides the base class version of render()
   virtual void render();
   
@@ -6,10 +9,10 @@ public:
   virtual void release();
 
   // Overrides the base class version of savePixels()
-  virtual FXbool savePixels(FXStream& store) const;
+  virtual bool savePixels(FXStream& store) const;
 
   // Overrides the base class version of loadPixels()
-  virtual FXbool loadPixels(FXStream& store);
+  virtual bool loadPixels(FXStream& store);
 
   /// Rescale pixels to the specified width and height
   virtual void scale(FXint w,FXint h);
@@ -25,3 +28,10 @@ public:
 
   /// Fill bitmap with uniform value
   virtual void fill(FXbool color);
+ 
+  // Overrides the base class version of setData()
+  virtual void setData(FXuchar *pix,FXuint opts=0);
+
+  // Overrides the base class version of setData()
+  virtual void setData(FXuchar *pix,FXuint opts,FXint w,FXint h);
+

data/ext/{fox14 → fox16}/include/FXRbButton.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbButton.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbButton.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBBUTTON_H

data/ext/{fox14 → fox16}/include/FXRbCURCursor.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbCURCursor.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbCURCursor.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBCURCURSOR_H

data/ext/{fox14 → fox16}/include/FXRbCanvas.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbCanvas.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbCanvas.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBCANVAS_H

data/ext/{fox14 → fox16}/include/FXRbCheckButton.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbCheckButton.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbCheckButton.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBCHECKBUTTON_H

data/ext/{fox14 → fox16}/include/FXRbChoiceBox.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbChoiceBox.h 2140 2005-08-16 03:27:22Z lyle $
+ * $Id: FXRbChoiceBox.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBCHOICEBOX_H

data/ext/{fox14 → fox16}/include/FXRbColorBar.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbColorBar.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbColorBar.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBCOLORBAR_H

data/ext/{fox14 → fox16}/include/FXRbColorDialog.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbColorDialog.h 2137 2005-08-14 15:12:43Z lyle $
+ * $Id: FXRbColorDialog.h 2190 2005-08-24 07:58:47Z lyle $
  ***********************************************************************/
 
 #ifndef FXRBCOLORDIALOG_H

data/ext/fox16/include/FXRbColorList.h

@@ -0,0 +1,84 @@
+/***********************************************************************
+ * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
+ * Copyright (c) 2001-2003 by J. Lyle Johnson. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * For further information please contact the author by e-mail
+ * at "lyle@users.sourceforge.net".
+ ***********************************************************************/
+
+/***********************************************************************
+ * $Id: FXRbColorList.h 2303 2005-12-09 03:17:28Z lyle $
+ ***********************************************************************/
+
+#ifndef FXRBCOLORLIST_H
+#define FXRBCOLORLIST_H
+
+class FXRbColorItem : public FXColorItem {
+  FXDECLARE(FXRbColorItem)
+protected:
+  FXRbColorItem(){}
+#include "FXRbObjectVirtuals.h"
+#include "FXRbListItemVirtuals.h"
+public:
+  // Is this list item owned by an FXColorList yet?
+  FXbool owned;
+public:
+  // Constructor
+  FXRbColorItem(const FXString& text,FXColor clr,void* ptr=NULL) : FXColorItem(text,clr,ptr),owned(FALSE){}
+
+  // Mark dependencies for the GC
+  static void markfunc(FXColorItem* self);
+
+  // Destroy this object if it's not owned
+  static void freefunc(FXColorItem* self);
+
+  // Destructor
+  virtual ~FXRbColorItem(){
+    FXRbUnregisterRubyObj(this);
+    }
+  };
+
+
+class FXRbColorList : public FXColorList {
+  FXDECLARE(FXRbColorList)
+protected:
+  FXRbColorList(){}
+#include "FXRbObjectVirtuals.h"
+#include "FXRbIdVirtuals.h"
+#include "FXRbDrawableVirtuals.h"
+#include "FXRbWindowVirtuals.h"
+#include "FXRbScrollAreaVirtuals.h"
+#include "FXRbListVirtuals.h"
+public:
+  /// Construct a list with initially no items in it
+  FXRbColorList(FXComposite *p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=LIST_BROWSESELECT,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXColorList(p,tgt,sel,opts,x,y,w,h){
+    }
+
+  // Mark dependencies for the GC
+  static void markfunc(FXColorList* self);
+
+  // Unregister objects that this list owns and is about to destroy
+  static void unregisterOwnedObjects(FXColorList *pColorList);
+
+  // Destructor
+  virtual ~FXRbColorList(){
+    FXRbColorList::unregisterOwnedObjects(this);
+    FXRbUnregisterRubyObj(this);
+    }
+  };
+
+#endif