fxruby 1.2.6 → 1.4.0

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

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

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

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

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

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

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

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

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

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbStream.h,v 1.1 2004/08/07 10:55:26 lyle Exp $
+ * $Id: FXRbStream.h,v 1.1 2005/08/14 15:12:43 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBSTREAM_H
@@ -34,7 +34,7 @@ inline FXbool klass ## _close(klass* self){ \
 inline FXbool klass ## _flush(klass* self){ \
   return self->klass::flush(); \
   } \
-inline FXbool klass ## _position(klass* self,unsigned long p,FXWhence whence){ \
+inline FXbool klass ## _position(klass* self,FXlong p,FXWhence whence){ \
   return self->klass::position(p,whence); \
   }
 
@@ -46,7 +46,7 @@ inline FXbool klass ## _position(klass* self,unsigned long p,FXWhence whence){ \
   FXbool cls::flush(){ \
     return FXRbCallBoolMethod(this,rb_intern("flush")); \
     } \
-  FXbool cls::position(unsigned long p,FXWhence whence){ \
+  FXbool cls::position(FXlong p,FXWhence whence){ \
     return FXRbCallBoolMethod(this,rb_intern("setPosition"),p,whence); \
     }
 

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

@@ -6,4 +6,4 @@ public:
   virtual FXbool flush();
 
   // Overrides the base class version of position()
-  virtual FXbool position(unsigned long p,FXWhence whence=FXFromStart);
+  virtual FXbool position(FXlong p,FXWhence whence=FXFromStart);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbTable.h,v 1.7 2005/03/19 03:04:41 lyle Exp $
+ * $Id: FXRbTable.h,v 1.2 2005/08/16 03:27:22 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBTABLE_H
@@ -48,20 +48,17 @@ inline void klass ## _drawBackground(const klass* self,const FXTable* table,FXDC
   FXASSERT(self->isMemberOf(FXMETACLASS(subklass))); \
   dynamic_cast<const subklass*>(self)->public_drawBackground(table,dc,x,y,w,h); \
   } \
-inline void klass ## _create(klass* self){ \
-  self->klass::create(); \
-  } \
-inline void klass ## _detach(klass* self){ \
-  self->klass::detach(); \
-  } \
-inline void klass ## _destroy(klass* self){ \
-  self->klass::destroy(); \
-  } \
 inline void klass ## _setText(klass* self,const FXString& text){ \
   self->klass::setText(text); \
   } \
-inline void klass ## _setIcon(klass* self,FXIcon* icn){ \
-  self->klass::setIcon(icn); \
+inline FXString klass ## _getText(const klass* self){ \
+  return self->klass::getText(); \
+  } \
+inline void klass ## _setIcon(klass* self,FXIcon* icn,FXbool owned){ \
+  self->klass::setIcon(icn,owned); \
+  } \
+inline FXIcon* klass ## _getIcon(const klass* self){ \
+  return self->klass::getIcon(); \
   } \
 inline void klass ## _setFocus(klass* self,FXbool focus){ \
   self->klass::setFocus(focus); \
@@ -75,14 +72,38 @@ 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 void klass ## _setJustify(klass* self,FXuint justify){ \
+  self->klass::setJustify(justify); \
+  } \
+inline void klass ## _setIconPosition(klass* self,FXuint mode){ \
+  self->klass::setIconPosition(mode); \
+  } \
+inline void klass ## _setBorders(klass* self,FXuint borders){ \
+  self->klass::setBorders(borders); \
+  } \
+inline void klass ## _setStipple(klass* self,FXStipplePattern pattern){ \
+  self->klass::setStipple(pattern); \
+  } \
+inline FXWindow* klass ## _getControlFor(klass* self,FXTable* table){ \
+  return self->klass::getControlFor(table); \
+  } \
+inline void klass ## _setFromControl(klass* self,FXWindow* control){ \
+  self->klass::setFromControl(control); \
   } \
 inline FXint klass ## _getWidth(const klass* self,const FXTable* table){ \
   return self->klass::getWidth(table); \
   } \
 inline FXint klass ## _getHeight(const klass* self,const FXTable* table){ \
   return self->klass::getHeight(table); \
+  } \
+inline void klass ## _create(klass* self){ \
+  self->klass::create(); \
+  } \
+inline void klass ## _detach(klass* self){ \
+  self->klass::detach(); \
+  } \
+inline void klass ## _destroy(klass* self){ \
+  self->klass::destroy(); \
   }
 
 
@@ -120,8 +141,14 @@ inline FXint klass ## _getHeight(const klass* self,const FXTable* table){ \
   void klass::setText(const FXString& txt){ \
     FXRbCallVoidMethod(this,rb_intern("setText"),txt); \
     } \
-  void klass::setIcon(FXIcon* icn){ \
-    FXRbCallVoidMethod(this,rb_intern("setIcon"),icn); \
+  FXString klass::getText() const { \
+    return FXRbCallStringMethod(this,rb_intern("getText")); \
+    } \
+  void klass::setIcon(FXIcon* icn,FXbool owned){ \
+    FXRbCallVoidMethod(this,rb_intern("setIcon"),icn,owned); \
+    } \
+  FXIcon* klass::getIcon() const { \
+    return FXRbCallIconMethod(this,rb_intern("getIcon")); \
     } \
   void klass::setFocus(FXbool focus){ \
     FXRbCallVoidMethod(this,rb_intern("setFocus"),focus); \
@@ -135,8 +162,23 @@ inline FXint klass ## _getHeight(const klass* self,const FXTable* table){ \
   void klass::setDraggable(FXbool draggable){ \
     FXRbCallVoidMethod(this,rb_intern("setDraggable"),draggable); \
     } \
-  void klass::setIconOwned(FXuint owned){ \
-    FXRbCallVoidMethod(this,rb_intern("setIconOwned"),owned); \
+  void klass::setJustify(FXuint justify){ \
+    FXRbCallVoidMethod(this,rb_intern("setJustify"),justify); \
+    } \
+  void klass::setIconPosition(FXuint mode){ \
+    FXRbCallVoidMethod(this,rb_intern("setIconPosition"),mode); \
+    } \
+  void klass::setBorders(FXuint borders){ \
+    FXRbCallVoidMethod(this,rb_intern("setBorders"),borders); \
+    } \
+  void klass::setStipple(FXStipplePattern pattern){ \
+    FXRbCallVoidMethod(this,rb_intern("setStipple"),pattern); \
+    } \
+  FXWindow* klass::getControlFor(FXTable* table){ \
+    return FXRbCallWindowMethod(this,rb_intern("getControlFor"),table); \
+    } \
+  void klass::setFromControl(FXWindow* control){ \
+    FXRbCallVoidMethod(this,rb_intern("setFromControl"),control); \
     } \
   FXint klass::getWidth(const FXTable* table) const { \
     return FXRbCallIntMethod(this,rb_intern("getWidth"),table); \
@@ -286,18 +328,6 @@ inline void klass ## _setColumnWidth(klass* self,FXint col,FXint cwidth){ \
 inline void klass ## _setRowHeight(klass* self,FXint row,FXint rheight){ \
   self->klass::setRowHeight(row,rheight); \
   } \
-inline void klass ## _setColumnX(klass* self,FXint colEdge,FXint x){ \
-  if(colEdge<0 || colEdge>self->getNumColumns()){ \
-    rb_raise(rb_eIndexError,"table column out of bounds"); \
-    } \
-  self->klass::setColumnX(colEdge,x); \
-  } \
-inline void klass ## _setRowY(klass* self,FXint rowEdge,FXint y){ \
-  if(rowEdge<0 || rowEdge>self->getNumRows()){ \
-    rb_raise(rb_eIndexError,"table row out of bounds"); \
-    } \
-  self->klass::setRowY(rowEdge,y); \
-  } \
 inline void klass ## _setCurrentItem(klass* self,FXint r,FXint c,FXbool notify=FALSE){ \
   self->klass::setCurrentItem(r,c,notify); \
   } \
@@ -315,6 +345,24 @@ inline FXbool klass ## _extendSelection(klass* self,FXint r,FXint c,FXbool notif
   } \
 inline FXbool klass ## _killSelection(klass* self,FXbool notify){ \
   return self->klass::killSelection(notify); \
+  } \
+inline void klass ## _startInput(klass* self,FXint row,FXint col){ \
+  self->klass::startInput(row,col); \
+  } \
+inline void klass ## _cancelInput(klass* self){ \
+  self->klass::cancelInput(); \
+  } \
+inline void klass ## _acceptInput(klass* self,FXbool notify){ \
+  self->klass::acceptInput(notify); \
+  } \
+inline void klass ## _makePositionVisible(klass* self,FXint r,FXint c){ \
+  self->klass::makePositionVisible(r,c); \
+  } \
+inline FXbool klass ## _enableItem(klass* self,FXint r,FXint c){ \
+  return self->klass::enableItem(r,c); \
+  } \
+inline FXbool klass ## _disableItem(klass* self,FXint r,FXint c){ \
+  return self->klass::disableItem(r,c); \
   }
 
 
@@ -385,12 +433,6 @@ inline FXbool klass ## _killSelection(klass* self,FXbool notify){ \
   void klass::setRowHeight(FXint row,FXint rheight){ \
     FXRbCallVoidMethod(this,rb_intern("setRowHeight"),row,rheight); \
     } \
-  void klass::setColumnX(FXint colEdge,FXint x){ \
-    FXRbCallVoidMethod(this,rb_intern("setColumnX"),colEdge,x); \
-    } \
-  void klass::setRowY(FXint rowEdge,FXint y){ \
-    FXRbCallVoidMethod(this,rb_intern("setRowY"),rowEdge,y); \
-    } \
   void klass::setCurrentItem(FXint r,FXint c,FXbool notify){ \
     FXRbCallVoidMethod(this,rb_intern("setCurrentItem"),r,c,notify); \
     } \
@@ -408,6 +450,24 @@ inline FXbool klass ## _killSelection(klass* self,FXbool notify){ \
     } \
   FXbool klass::killSelection(FXbool notify){ \
     return FXRbCallBoolMethod(this,rb_intern("killSelection"),notify); \
+    } \
+  void klass::startInput(FXint row,FXint col){ \
+    FXRbCallVoidMethod(this,rb_intern("startInput"),row,col); \
+    } \
+  void klass::cancelInput(){ \
+    FXRbCallVoidMethod(this,rb_intern("cancelInput")); \
+    } \
+  void klass::acceptInput(FXbool notify){ \
+    FXRbCallVoidMethod(this,rb_intern("acceptInput"),notify); \
+    } \
+  void klass::makePositionVisible(FXint r,FXint c){ \
+    FXRbCallVoidMethod(this,rb_intern("makePositionVisible"),r,c); \
+    } \
+  FXbool klass::enableItem(FXint r,FXint c){ \
+    return FXRbCallBoolMethod(this,rb_intern("enableItem"),r,c); \
+    } \
+  FXbool klass::disableItem(FXint r,FXint c){ \
+    return FXRbCallBoolMethod(this,rb_intern("disableItem"),r,c); \
     }
 
 class FXRbTable : public FXTable {

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

@@ -34,8 +34,14 @@ public:
   // Overrides the base class version of setText()
   virtual void setText(const FXString& txt);
   
+  // Overrides the base class of getText()
+  virtual FXString getText() const;
+  
   // Overrides the base class version of setIcon()
-  virtual void setIcon(FXIcon* icn);
+  virtual void setIcon(FXIcon* icn,FXbool owned=FALSE);
+  
+  // Overrides the base class version of getIcon()
+  virtual FXIcon* getIcon() const;
   
   // Overrides the base class version of setFocus()
   virtual void setFocus(FXbool focus);
@@ -48,9 +54,24 @@ public:
 
   // Overrides the base class version of setDraggable()
   virtual void setDraggable(FXbool draggable);
+  
+  // Overrides the base class version of setJustify()
+  virtual void setJustify(FXuint justify=RIGHT|CENTER_Y);
+  
+  // Overrides the base class version of setIconPosition()
+  virtual void setIconPosition(FXuint mode);
+  
+  // Overrides the base class version of setBorders()
+  virtual void setBorders(FXuint borders=0);
+  
+  // Overrides the base class version of setStipple()
+  virtual void setStipple(FXStipplePattern pattern);
+
+  /// Overrides the base class version of getControlFor()
+  virtual FXWindow *getControlFor(FXTable* table);
 
-  // Overrides the base class version of setIconOwned()
-  virtual void setIconOwned(FXuint owned);
+  /// Overrides the base class version of setFromControl()
+  virtual void setFromControl(FXWindow *control);
 
   // Overrides the base class version of getWidth()
   virtual FXint getWidth(const FXTable* table) const;

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

@@ -47,12 +47,6 @@ public:
   // Overrides the base class version of setRowHeight()
   virtual void setRowHeight(FXint row,FXint rheight);
 
-  // Overrides the base class version of setColumnX()
-  virtual void setColumnX(FXint colEdge,FXint x);
-
-  // Overrides the base class version of setRowY()
-  virtual void setRowY(FXint rowEdge,FXint y);
-
   // Overrides the base class version of setCurrentItem()
   virtual void setCurrentItem(FXint r,FXint c,FXbool notify=FALSE);
 
@@ -70,4 +64,23 @@ public:
 
   // Overrides the base class version of killSelection()
   virtual FXbool killSelection(FXbool notify=FALSE);
+  
+  // Overrides base class version of startInput()
+  virtual void startInput(FXint row,FXint col);
+  
+  // Overrides base class version of cancelInput()
+  virtual void cancelInput();
+  
+  // Overrides base class version of acceptInput()
+  virtual void acceptInput(FXbool notify=FALSE);
+  
+  // Overrides the base class version of makePositionVisible()
+  virtual void makePositionVisible(FXint r,FXint c);
+  
+  // Overrides the base class version of enableItem()
+  virtual FXbool enableItem(FXint r,FXint c);
+  
+  // Overrides the base class version of disableItem()
+  virtual FXbool disableItem(FXint r,FXint c);
+  
 

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

@@ -21,7 +21,7 @@
  ***********************************************************************/
 
 /***********************************************************************
- * $Id: FXRbText.h,v 1.2 2005/02/27 21:05:22 lyle Exp $
+ * $Id: FXRbText.h,v 1.2 2005/08/16 22:12:12 lyle Exp $
  ***********************************************************************/
 
 #ifndef FXRBTEXT_H
@@ -63,7 +63,7 @@ protected:
 #include "FXRbTextVirtuals.h"
 public:
   /// Construct multi-line text widget
-  FXRbText(FXComposite *p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0) : FXText(p,tgt,sel,opts,x,y,w,h){
+  FXRbText(FXComposite *p,FXObject* tgt=NULL,FXSelector sel=0,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=3,FXint pr=3,FXint pt=2,FXint pb=2) : FXText(p,tgt,sel,opts,x,y,w,h,pl,pr,pt,pb){
     numStyles=0;
     styles=0;
     }