fxruby 1.2.6 → 1.4.0

data/ext/{fox12 → fox14}/include/FXRbFont.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbFont.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbFont.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBFONT_H

data/ext/{fox12 → fox14}/include/FXRbFontDialog.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbFontDialog.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbFontDialog.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBFONTDIALOG_H

data/ext/{fox12 → fox14}/include/FXRbFontSelector.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbFontSelector.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbFontSelector.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBFONTSELECTOR_H

data/ext/{fox12 → fox14}/include/FXRbFrame.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbFrame.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbFrame.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBFRAME_H

data/ext/{fox12 → fox14}/include/FXRbGIFCursor.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGIFCursor.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGIFCursor.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBGIFCURSOR_H

data/ext/{fox12 → fox14}/include/FXRbGIFIcon.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGIFIcon.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGIFIcon.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBGIFICON_H

data/ext/{fox12 → fox14}/include/FXRbGIFImage.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGIFImage.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGIFImage.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBGIFIMAGE_H

data/ext/{fox12 → fox14}/include/FXRbGLCanvas.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGLCanvas.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGLCanvas.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBGLCANVAS_H

data/ext/{fox12 → fox14}/include/FXRbGLContext.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGLContext.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGLContext.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBGLCONTEXT_H

data/ext/{fox12 → fox14}/include/FXRbGLObject.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGLObject.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGLObject.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBGLOBJECT_H

data/ext/{fox12 → fox14}/include/FXRbGLShape.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGLShape.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGLShape.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBGLSHAPE_H

data/ext/{fox12 → fox14}/include/FXRbGLViewer.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGLViewer.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGLViewer.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBGLVIEWER_H
@@ -34,6 +34,9 @@ inline FXGLObject** klass ## _select(klass* self,FXint x,FXint y,FXint w,FXint h
   } \
 inline FXGLObject* klass ## _pick(klass *self,FXint x,FXint y){ \
   return self->klass::pick(x,y); \
+  } \
+inline FXbool klass ## _setBounds(klass *self,const FXRangef& box){ \
+  return self->klass::setBounds(box); \
   }
 
 
@@ -43,6 +46,9 @@ inline FXGLObject* klass ## _pick(klass *self,FXint x,FXint y){ \
     } \
   FXGLObject* cls::pick(FXint x,FXint y){ \
     return FXRbCallGLObjectMethod(this,rb_intern("pick"),x,y); \
+    } \
+  FXbool cls::setBounds(const FXRangef& box){ \
+    return FXRbCallBoolMethod(this,rb_intern("setBounds"),box); \
     }
 
 

data/ext/{fox12 → fox14}/include/FXRbGLViewerVirtuals.h

@@ -4,3 +4,7 @@ public:
   
   // Overrides the base class version of pick()
   virtual FXGLObject* pick(FXint x,FXint y);
+  
+  // Overrides the base class version of setBounds()
+  virtual FXbool setBounds(const FXRangef& box);
+

data/ext/{fox12 → fox14}/include/FXRbGLVisual.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGLVisual.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGLVisual.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBGLVISUAL_H

data/ext/{fox12 → fox14}/include/FXRbGradientBar.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGradientBar.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGradientBar.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBGRADIENTBAR_H

data/ext/{fox12 → fox14}/include/FXRbGroupBox.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbGroupBox.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbGroupBox.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBGROUPBOX_H

data/ext/{fox12 → fox14}/include/FXRbHeader.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbHeader.h,v 1.2 2005/02/27 21:05:22 lyle Exp $
+ * $Id: FXRbHeader.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBHEADER_H

data/ext/{fox12 → fox14}/include/FXRbHorizontalFrame.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbHorizontalFrame.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbHorizontalFrame.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBHORIZONTALFRAME_H

data/ext/{fox12 → fox14}/include/FXRbICOIcon.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbICOIcon.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbICOIcon.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBICOICON_H

data/ext/{fox12 → fox14}/include/FXRbICOImage.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbICOImage.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbICOImage.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBICOIMAGE_H

data/ext/{fox12 → fox14}/include/FXRbIcon.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbIcon.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbIcon.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBICON_H

data/ext/{fox12 → fox14}/include/FXRbIconItemVirtuals.h

@@ -35,10 +35,10 @@ public:
   virtual void setText(const FXString& txt);
 
   // Overrides the base class version of setBigIcon()
-  virtual void setBigIcon(FXIcon* icn);
+  virtual void setBigIcon(FXIcon* icn,FXbool owned=FALSE);
 
   // Overrides the base class version of setMiniIcon()
-  virtual void setMiniIcon(FXIcon* icn);
+  virtual void setMiniIcon(FXIcon* icn,FXbool owned=FALSE);
 
   // Overrides the base class version of setFocus()
   virtual void setFocus(FXbool focus);
@@ -52,9 +52,6 @@ public:
   // Overrides the base class version of setDraggable()
   virtual void setDraggable(FXbool draggable);
 
-  // Overrides the base class version of setIconOwned()
-  virtual void setIconOwned(FXuint owned);
-
   // Overrides the base class version of getWidth()
   virtual FXint getWidth(const FXIconList* list) const;
 

data/ext/{fox12 → fox14}/include/FXRbIconList.h

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbIconList.h,v 1.2 2005/02/27 21:05:22 lyle Exp $
+ * $Id: FXRbIconList.h,v 1.2 2005/08/16 03:27:22 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBICONLIST_H
@@ -51,11 +51,11 @@ inline void klass ## _drawDetails(const klass* self,const FXIconList* list,FXDC&
 inline void klass ## _setText(klass* self,const FXString& text){ \
   self->klass::setText(text); \
   } \
-inline void klass ## _setBigIcon(klass* self,FXIcon* icn){ \
-  self->klass::setBigIcon(icn); \
+inline void klass ## _setBigIcon(klass* self,FXIcon* icn,FXbool owned){ \
+  self->klass::setBigIcon(icn,owned); \
   } \
-inline void klass ## _setMiniIcon(klass* self,FXIcon* icn){ \
-  self->klass::setMiniIcon(icn); \
+inline void klass ## _setMiniIcon(klass* self,FXIcon* icn,FXbool owned){ \
+  self->klass::setMiniIcon(icn,owned); \
   } \
 inline void klass ## _setFocus(klass* self,FXbool focus){ \
   self->klass::setFocus(focus); \
@@ -69,9 +69,6 @@ inline void klass ## _setEnabled(klass* self,FXbool enabled){ \
 inline void klass ## _setDraggable(klass* self,FXbool draggable){ \
   self->klass::setDraggable(draggable); \
   } \
-inline void klass ## _setIconOwned(klass* self,FXuint owned){ \
-  self->klass::setIconOwned(owned); \
-  } \
 inline FXint klass ## _getWidth(const klass* self,const FXIconList* list){ \
   return self->klass::getWidth(list); \
   } \
@@ -123,11 +120,11 @@ inline void klass ## _destroy(klass* self){ \
   void klass::setText(const FXString& txt){ \
     FXRbCallVoidMethod(this,rb_intern("setText"),txt); \
     } \
-  void klass::setBigIcon(FXIcon* icn){ \
-    FXRbCallVoidMethod(this,rb_intern("setBigIcon"),icn); \
+  void klass::setBigIcon(FXIcon* icn,FXbool owned){ \
+    FXRbCallVoidMethod(this,rb_intern("setBigIcon"),icn,owned); \
     } \
-  void klass::setMiniIcon(FXIcon* icn){ \
-    FXRbCallVoidMethod(this,rb_intern("setMiniIcon"),icn); \
+  void klass::setMiniIcon(FXIcon* icn,FXbool owned){ \
+    FXRbCallVoidMethod(this,rb_intern("setMiniIcon"),icn,owned); \
     } \
   void klass::setFocus(FXbool focus){ \
     FXRbCallVoidMethod(this,rb_intern("setFocus"),focus); \
@@ -141,9 +138,6 @@ inline void klass ## _destroy(klass* self){ \
   void klass::setDraggable(FXbool draggable){ \
     FXRbCallVoidMethod(this,rb_intern("setDraggable"),draggable); \
     } \
-  void klass::setIconOwned(FXuint owned){ \
-    FXRbCallVoidMethod(this,rb_intern("setIconOwned"),owned); \
-    } \
   FXint klass::getWidth(const FXIconList* list) const { \
     return FXRbCallIntMethod(this,rb_intern("getWidth"),list); \
     } \
@@ -208,6 +202,18 @@ inline FXbool klass ## _killSelection(klass* self,FXbool notify){ \
   } \
 inline void klass ## _setCurrentItem(klass* self,FXint index,FXbool notify){ \
   self->klass::setCurrentItem(index,notify); \
+  } \
+inline FXint klass ## _getItemAt(const klass* self,FXint x,FXint y){ \
+  return self->klass::getItemAt(x,y); \
+  } \
+inline void klass ## _makeItemVisible(klass* self,FXint index){ \
+  self->klass::makeItemVisible(index); \
+  } \
+inline FXbool klass ## _enableItem(klass* self,FXint index){ \
+  return self->klass::enableItem(index); \
+  } \
+inline FXbool klass ## _disableItem(klass* self,FXint index){ \
+  return self->klass::disableItem(index); \
   }
 
 
@@ -232,6 +238,18 @@ inline void klass ## _setCurrentItem(klass* self,FXint index,FXbool notify){ \
     } \
   void cls::setCurrentItem(FXint index,FXbool notify){ \
     FXRbCallVoidMethod(this,rb_intern("setCurrentItem"),index,notify); \
+    } \
+  FXint cls::getItemAt(FXint x,FXint y) const { \
+    return FXRbCallIntMethod(this,rb_intern("getItemAt"),x,y); \
+    } \
+  void cls::makeItemVisible(FXint index){ \
+    FXRbCallVoidMethod(this,rb_intern("makeItemVisible"),index); \
+    } \
+  FXbool cls::enableItem(FXint index){ \
+    return FXRbCallBoolMethod(this,rb_intern("enableItem"),index); \
+    } \
+  FXbool cls::disableItem(FXint index){ \
+    return FXRbCallBoolMethod(this,rb_intern("disableItem"),index); \
     }
 
 

data/ext/{fox12 → fox14}/include/FXRbIconListVirtuals.h

@@ -19,3 +19,17 @@ public:
 
   /// Overrides the base class version of setCurrentItem()
   virtual void setCurrentItem(FXint index,FXbool notify=FALSE);
+  
+  /// Overrides the base class version of getItemAt()
+  virtual FXint getItemAt(FXint x,FXint y) const;
+  
+  /// Overrides the base class version of makeItemVisible()
+  virtual void makeItemVisible(FXint index);
+  
+  /// Overrides the base class version of enableItem()
+  virtual FXbool enableItem(FXint index);
+  
+  /// Overrides the base class version of disableItem()
+  virtual FXbool disableItem(FXint index);
+  
+

data/ext/fox14/include/FXRbIconSource.h

@@ -0,0 +1,127 @@
+/***********************************************************************
+ * 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: FXRbIconSource.h,v 1.2 2005/08/19 02:08:05 lyle Exp $
+ ***********************************************************************/
+
+#ifndef FXRBICONSOURCE_H
+#define FXRBICONSOURCE_H
+
+#define DECLARE_FXICONSOURCE_STUBS(cls) \
+inline FXIcon* cls ## _loadIcon(const cls* self,const FXString& filename,const FXString& type){ \
+  return self->cls::loadIcon(filename,type); \
+  } \
+inline FXIcon* cls ## _loadIcon(const cls* self,const void* pixels,const FXString& type){ \
+  return self->cls::loadIcon(pixels,type); \
+  } \
+inline FXIcon* cls ## _loadIcon(const cls* self,FXStream& store,const FXString& type){ \
+  return self->cls::loadIcon(store,type); \
+  } \
+inline FXImage* cls ## _loadImage(const cls* self,const FXString& filename,const FXString& type){ \
+  return self->cls::loadImage(filename,type); \
+  } \
+inline FXIcon* cls ## _loadImage(const cls* self,const void* pixels,const FXString& type){ \
+  return NULL; \
+  } \
+inline FXImage* cls ## _loadImage(const cls* self,FXStream& store,const FXString& type){ \
+  return self->cls::loadImage(store,type); \
+  } \
+inline FXIcon* cls ## _loadScaledIcon(const cls* self,const FXString& filename,FXint size,FXint qual,const FXString& type){ \
+  return self->cls::loadScaledIcon(filename,size,qual,type); \
+  } \
+inline FXIcon* cls ## _loadScaledIcon(const cls* self,const void* pixels,FXint size,FXint qual,const FXString& type){ \
+  return self->cls::loadScaledIcon(pixels,size,qual,type); \
+  } \
+inline FXIcon* cls ## _loadScaledIcon(const cls* self,FXStream& store,FXint size,FXint qual,const FXString& type){ \
+  return self->cls::loadScaledIcon(store,size,qual,type); \
+  } \
+inline FXImage* cls ## _loadScaledImage(const cls* self,const FXString& filename,FXint size,FXint qual,const FXString& type){ \
+  return self->cls::loadScaledImage(filename,size,qual,type); \
+  } \
+inline FXImage* cls ## _loadScaledImage(const cls* self,const void* pixels,FXint size,FXint qual,const FXString& type){ \
+  return self->cls::loadScaledImage(pixels,size,qual,type); \
+  } \
+inline FXImage* cls ## _loadScaledImage(const cls* self,FXStream& store,FXint size,FXint qual,const FXString& type){ \
+  return self->cls::loadScaledImage(store,size,qual,type); \
+  }
+
+
+#define IMPLEMENT_FXICONSOURCE_STUBS(cls) \
+  FXIcon* cls::loadIcon(const FXString& filename,const FXString& type) const { \
+    FXRbCallIconMethod(this,rb_intern("loadIcon"),filename,type); \
+    } \
+  FXIcon* cls::loadIcon(const void* pixels,const FXString& type) const { \
+    FXRbCallIconMethod(this,rb_intern("loadIcon"),pixels,type); \
+    } \
+  FXIcon* cls::loadIcon(FXStream& store,const FXString& type) const { \
+    FXRbCallIconMethod(this,rb_intern("loadIcon"),store,type); \
+    } \
+  FXImage* cls::loadImage(const FXString& filename,const FXString& type) const { \
+    FXRbCallImageMethod(this,rb_intern("loadImage"),filename,type); \
+    } \
+  FXIcon* cls::loadImage(const void* pixels,const FXString& type) const { \
+    FXRbCallIconMethod(this,rb_intern("loadImage"),pixels,type); \
+    } \
+  FXImage* cls::loadImage(FXStream& store,const FXString& type) const { \
+    FXRbCallImageMethod(this,rb_intern("loadImage"),store,type); \
+    } \
+  FXIcon* cls::loadScaledIcon(const FXString& filename,FXint size,FXint qual,const FXString& type) const { \
+    FXRbCallIconMethod(this,rb_intern("loadScaledIcon"),filename,size,qual,type); \
+    } \
+  FXIcon* cls::loadScaledIcon(const void* pixels,FXint size,FXint qual,const FXString& type) const { \
+    FXRbCallIconMethod(this,rb_intern("loadScaledIcon"),pixels,size,qual,type); \
+    } \
+  FXIcon* cls::loadScaledIcon(FXStream& store,FXint size,FXint qual,const FXString& type) const { \
+    FXRbCallIconMethod(this,rb_intern("loadScaledIcon"),store,size,qual,type); \
+    } \
+  FXImage* cls::loadScaledImage(const FXString& filename,FXint size,FXint qual,const FXString& type) const { \
+    FXRbCallImageMethod(this,rb_intern("loadScaledImage"),filename,size,qual,type); \
+    } \
+  FXImage* cls::loadScaledImage(const void* pixels,FXint size,FXint qual,const FXString& type) const { \
+    FXRbCallImageMethod(this,rb_intern("loadScaledImage"),pixels,size,qual,type); \
+    } \
+  FXImage* cls::loadScaledImage(FXStream& store,FXint size,FXint qual,const FXString& type) const { \
+    FXRbCallImageMethod(this,rb_intern("loadScaledImage"),store,size,qual,type); \
+    }
+
+
+class FXRbIconSource : public FXIconSource {
+  FXDECLARE(FXRbIconSource)
+protected:
+  FXRbIconSource(){}
+#include "FXRbObjectVirtuals.h"
+#include "FXRbIconSourceVirtuals.h"
+public:
+  // Constructor
+  FXRbIconSource(FXApp* app) : FXIconSource(app){}
+
+  // Mark dependencies for the GC
+  static void markfunc(FXIconSource* self);
+
+  // Destructor
+  virtual ~FXRbIconSource(){
+    FXRbUnregisterRubyObj(this);
+    }
+  };
+
+#endif