fxruby 1.6.28 → 1.6.29

data/swig-interfaces/FXTopWindow.i

@@ -78,23 +78,6 @@ class FXToolBar;
 * the owner.
 */
 class FXTopWindow : public FXShell {
-protected:
-  FXString  title;                    // Window title
-  FXIcon   *icon;                     // Window icon (big)
-  FXIcon   *miniIcon;                 // Window icon (small)
-  FXint     padtop;                   // Top margin
-  FXint     padbottom;                // Bottom margin
-  FXint     padleft;                  // Left margin
-  FXint     padright;                 // Right margin
-  FXint     hspacing;                 // Horizontal child spacing
-  FXint     vspacing;                 // Vertical child spacing
-protected:
-  FXTopWindow();
-  void settitle();
-  void seticons();
-  void setdecorations();
-  FXTopWindow(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(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);
 public:
   long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
   long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXTranslator.i

@@ -28,8 +28,6 @@
 * The translator class translates a message to another language.
 */
 class FXTranslator : public FXObject {
-protected:
-  FXTranslator();
 public:
 
   %extend {

data/swig-interfaces/FXTreeList.i

@@ -42,22 +42,6 @@ class FXTreeList;
 %rename("hasItems=") FXTreeItem::setHasItems(FXbool);
 
 class FXTreeItem : public FXObject {
-protected:
-  FXTreeItem *parent;           // Parent item
-  FXTreeItem *prev;             // Previous item
-  FXTreeItem *next;             // Next item
-  FXTreeItem *first;            // First child item
-  FXTreeItem *last;             // Last child item
-  FXString    label;            // Text of item
-  FXIcon     *openIcon;         // Icon of item
-  FXIcon     *closedIcon;       // Icon of item
-  void       *data;             // Item user data pointer
-  FXuint      state;            // Item state flags
-  FXint       x,y;
-protected:
-  FXTreeItem();
-  virtual void draw(const FXTreeList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-  virtual FXint hitItem(const FXTreeList* list,FXint x,FXint y) const;
 public:
   enum{
     SELECTED        = 1,        /// Selected
@@ -169,33 +153,6 @@ DYNAMIC_CAST(SWIGTYPE_p_FXTreeItem, FXTreeItem_dynamic_cast);
 * 3rd argument of the message.
 */
 class FXTreeList : public FXScrollArea {
-protected:
-  FXTreeItem        *firstitem;         // First root item
-  FXTreeItem        *lastitem;          // Last root item
-  FXTreeItem        *anchoritem;        // Selection anchor item
-  FXTreeItem        *currentitem;       // Current item
-  FXTreeItem        *extentitem;        // Selection extent
-  FXTreeItem        *cursoritem;        // Item under cursor
-  FXTreeItem        *viewableitem;      // Visible item
-  FXFont            *font;              // Font
-  FXColor            textColor;         // Text color
-  FXColor            selbackColor;      // Selected background color
-  FXColor            seltextColor;      // Selected text color
-  FXColor            lineColor;         // Line color
-  FXint              treeWidth;         // Tree width
-  FXint              treeHeight;        // Tree height
-  FXint              visible;           // Number of visible items
-  FXint              indent;            // Parent to child indentation
-  FXint              grabx;             // Grab point x
-  FXint              graby;             // Grab point y
-  FXString           lookup;            // Lookup string
-  FXString           help;              // Help string
-  FXbool             state;             // State of item
-protected:
-  FXTreeList();
-  virtual FXTreeItem* createItem(const FXString& text,FXIcon* oi,FXIcon* ci,void* ptr);
-  // void sort(FXTreeItem*& f1,FXTreeItem*& t1,FXTreeItem*& f2,FXTreeItem*& t2,int n); FIXME
-  void recompute();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
@@ -260,55 +217,41 @@ public:
     /// Insert [possibly subclassed] item under father before other item
     FXTreeItem* insertItem(FXTreeItem* other,FXTreeItem* father,FXTreeItem* item,FXbool notify=FALSE){
       if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
+        dynamic_cast<FXRbTreeItem*>(item)->owned=TRUE;
+        }
       return self->insertItem(other,father,item,notify);
       }
+  }
 
-    /// Insert item with given text and optional icons, and user-data pointer under father before other item
-    FXTreeItem* insertItem(FXTreeItem* other,FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE){
-      FXTreeItem* item=self->insertItem(other,father,text,oi,ci,ITEMDATA,notify);
-      if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
-      return item;
-      }
+  /// Insert item with given text and optional icons, and user-data pointer under father before other item
+  FXTreeItem* insertItem(FXTreeItem* other,FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
 
+  %extend {
     /// Append [possibly subclassed] item as last child of father
     FXTreeItem* appendItem(FXTreeItem* father,FXTreeItem* item,FXbool notify=FALSE){
       if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
+        dynamic_cast<FXRbTreeItem*>(item)->owned=TRUE;
+        }
       return self->appendItem(father,item,notify);
       }
+  }
 
-    /// Append item with given text and optional icons, and user-data pointer as last child of father
-    FXTreeItem* appendItem(FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE){
-      FXTreeItem* item=self->appendItem(father,text,oi,ci,ITEMDATA,notify);
-      if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
-      return item;
-      }
+  /// Append item with given text and optional icons, and user-data pointer as last child of father
+  FXTreeItem* appendItem(FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
 
+  %extend {
     /// Prepend [possibly subclassed] item as first child of father
     FXTreeItem* prependItem(FXTreeItem* father,FXTreeItem* item,FXbool notify=FALSE){
       if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
+        dynamic_cast<FXRbTreeItem*>(item)->owned=TRUE;
+        }
       return self->prependItem(father,item,notify);
       }
-
-    /// Prepend item with given text and optional icons, and user-data pointer as first child of father
-    FXTreeItem* prependItem(FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE){
-      FXTreeItem* item=self->prependItem(father,text,oi,ci,ITEMDATA,notify);
-      if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
-      return item;
-      }
   }
 
+  /// Prepend item with given text and optional icons, and user-data pointer as first child of father
+  FXTreeItem* prependItem(FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL,FXbool notify=FALSE);
+
   /// Move item under father before other item
   FXTreeItem *moveItem(FXTreeItem* other,FXTreeItem* father,FXTreeItem* item);
 
@@ -360,7 +303,7 @@ public:
         FXRbUnregisterRubyObj(items[i]);
         }
       }
-  }
+    }
 
   /// Return item width
   FXint getItemWidth(const FXTreeItem* item) const;

data/swig-interfaces/FXTreeListBox.i

@@ -40,13 +40,6 @@ class FXPopup;
 * SEL_CHANGED messages to indicate which item the cursor is hovering over.
 */
 class FXTreeListBox : public FXPacker {
-protected:
-  FXButton      *field;
-  FXMenuButton  *button;
-  FXTreeList    *tree;
-  FXPopup       *pane;
-protected:
-  FXTreeListBox(){}
 public:
   long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
   long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);
@@ -93,55 +86,42 @@ public:
     /// Insert [possibly subclassed] item under father before other item
     FXTreeItem* insertItem(FXTreeItem* other,FXTreeItem* father,FXTreeItem* item){
       if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
+        dynamic_cast<FXRbTreeItem*>(item)->owned=TRUE;
+        }
       return self->insertItem(other,father,item);
       }
+  }
 
+  /// Insert item with given text and optional icons, and user-data pointer under father before other item
+  FXTreeItem* insertItem(FXTreeItem* other,FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL);
 
-    /// Insert item with given text and optional icons, and user-data pointer under father before other item
-    FXTreeItem* insertItem(FXTreeItem* other,FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL){
-      FXTreeItem* item=self->insertItem(other,father,text,oi,ci,ITEMDATA);
-      if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
-      return item;
-      }
-
+  %extend {
     /// Append [possibly subclassed] item as last child of father
     FXTreeItem* appendItem(FXTreeItem* father,FXTreeItem* item){
       if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
+        dynamic_cast<FXRbTreeItem*>(item)->owned=TRUE;
+        }
       return self->appendItem(father,item);
       }
+  }
 
-    /// Append item with given text and optional icons, and user-data pointer as last child of father
-    FXTreeItem* appendItem(FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL){
-      FXTreeItem* item=self->appendItem(father,text,oi,ci,ITEMDATA);
-      if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
-      return item;
-      }
+  /// Append item with given text and optional icons, and user-data pointer as last child of father
+  FXTreeItem* appendItem(FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL);
 
+  %extend {
     /// Prepend [possibly subclassed] item as first child of father
     FXTreeItem* prependItem(FXTreeItem* father,FXTreeItem* item){
       if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
+        dynamic_cast<FXRbTreeItem*>(item)->owned=TRUE;
+        }
       return self->prependItem(father,item);
       }
+  }
 
-    /// Prepend item with given text and optional icons, and user-data pointer as first child of father
-    FXTreeItem* prependItem(FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL){
-      FXTreeItem* item=self->prependItem(father,text,oi,ci,ITEMDATA);
-      if(item->isMemberOf(FXMETACLASS(FXRbTreeItem))){
-        dynamic_cast<FXRbTreeItem*>(item)->owner=self;
-	}
-      return item;
-      }
+  /// Prepend item with given text and optional icons, and user-data pointer as first child of father
+  FXTreeItem* prependItem(FXTreeItem* father,const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ITEMDATA=NULL);
 
+  %extend {
     /// Remove item
     void removeItem(FXTreeItem* item){
       // Save pointer(s) to the soon-to-be-destroyed items

data/swig-interfaces/FXVerticalFrame.i

@@ -27,8 +27,6 @@
 * depending on the child window's layout hints.
 */
 class FXVerticalFrame : public FXPacker {
-protected:
-  FXVerticalFrame(){}
 public:
 
   /// Construct a vertical frame layout manager

data/swig-interfaces/FXVisual.i

@@ -52,44 +52,6 @@ enum FXVisualType {
 
 /// Visual describes pixel format of a drawable
 class FXVisual : public FXId {
-protected:
-  FXuint        flags;                  // Visual flags
-  FXuint        hint;                   // Depth Hint
-  FXuint        depth;                  // Visual depth, significant bits/pixel
-  FXuint        numred;                 // Number of reds
-  FXuint        numgreen;               // Number of greens
-  FXuint        numblue;                // Number of blues
-  FXuint        numcolors;              // Total number of colors
-  FXuint        maxcolors;              // Maximum number of colors
-  FXVisualType  type;                   // Visual type
-  void         *info;                   // Opaque data
-  FXID          colormap;               // Color map, if any
-  FXbool        freemap;                // We allocated the map
-#ifndef WIN32
-protected:
-  void         *visual;                 // Application visual [Visual]
-  void*         gc;                     // Drawing GC
-  void*         scrollgc;               // Scrolling GC
-  FXPixel       rpix[16][256];          // Mapping from red -> pixel
-  FXPixel       gpix[16][256];          // Mapping from green -> pixel
-  FXPixel       bpix[16][256];          // Mapping from blue -> pixel
-  FXPixel       lut[256];               // Color lookup table
-protected:
-  void* setupgc(FXbool);
-  void setuptruecolor();
-  void setupdirectcolor();
-  void setuppseudocolor();
-  void setupstaticcolor();
-  void setupgrayscale();
-  void setupstaticgray();
-  void setuppixmapmono();
-  void setupcolormap();
-#else
-protected:
-  int           pixelformat;            // PIXELFORMAT number
-#endif
-protected:
-  FXVisual();
 public:
 
   /// Construct default visual

data/swig-interfaces/FXWindow.i

@@ -99,19 +99,6 @@ class FXComposite;
 
 /// Base class for all windows
 class FXWindow : public FXDrawable {
-protected:
-  FXComposeContext *composeContext;     // Compose context
-  FXCursor     *defaultCursor;          // Normal Cursor
-  FXCursor     *dragCursor;             // Cursor during drag
-  FXAccelTable *accelTable;             // Accelerator table
-  FXObject     *target;                 // Target object
-  FXSelector    message;                // Message ID
-  FXint         xpos;                   // Window X Position
-  FXint         ypos;                   // Window Y Position
-  FXColor       backColor;              // Window background color
-  FXString      tag;                    // Help tag
-  FXuint        flags;                  // Window state flags
-  FXuint        options;                // Window options
 public:
 
   // Common DND types
@@ -125,43 +112,6 @@ public:
   static const FXDragType stringType;   // Clipboard text type (pre-registered)
   static const FXDragType imageType;    // Clipboard image type (pre-registered)
 
-protected:
-  FXWindow();
-  FXWindow(FXApp* a,FXVisual *vis);
-  FXWindow(FXApp* a,FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h);
-  static FXWindow* findDefault(FXWindow* window);
-  static FXWindow* findInitial(FXWindow* window);
-  virtual FXbool doesOverrideRedirect() const;
-
-protected:
-
-  // Window state flags
-  enum {
-    FLAG_SHOWN        = 0x00000001,     // Is shown
-    FLAG_ENABLED      = 0x00000002,     // Able to receive input
-    FLAG_UPDATE       = 0x00000004,     // Is subject to GUI update
-    FLAG_DROPTARGET   = 0x00000008,     // Drop target
-    FLAG_FOCUSED      = 0x00000010,     // Has focus
-    FLAG_DIRTY        = 0x00000020,     // Needs layout
-    FLAG_RECALC       = 0x00000040,     // Needs recalculation
-    FLAG_TIP          = 0x00000080,     // Show tip
-    FLAG_HELP         = 0x00000100,     // Show help
-    FLAG_DEFAULT      = 0x00000200,     // Default widget
-    FLAG_INITIAL      = 0x00000400,     // Initial widget
-    FLAG_SHELL        = 0x00000800,     // Shell window
-    FLAG_ACTIVE       = 0x00001000,     // Window is active
-    FLAG_PRESSED      = 0x00002000,     // Button has been pressed
-    FLAG_KEY          = 0x00004000,     // Keyboard key pressed
-    FLAG_CARET        = 0x00008000,     // Caret is on
-    FLAG_CHANGED      = 0x00010000,     // Window data changed
-    FLAG_LASSO        = 0x00020000,     // Lasso mode
-    FLAG_TRYDRAG      = 0x00040000,     // Tentative drag mode
-    FLAG_DODRAG       = 0x00080000,     // Doing drag mode
-    FLAG_SCROLLINSIDE = 0x00100000,     // Scroll only when inside
-    FLAG_SCROLLING    = 0x00200000,     // Right mouse scrolling
-    FLAG_OWNED        = 0x00400000
-    };
-
 public:
 
   // Message handlers
@@ -599,7 +549,7 @@ public:
       if(numtypes>0){
         types=new FXDragType[numtypes];
         for(FXuint i=0;i<numtypes;i++){
-          types[i]=(FXDragType) NUM2USHRT(rb_ary_entry(typesArray,i));
+          types[i]=(FXDragType) NUM2UINT(rb_ary_entry(typesArray,i));
           }
       }
       bool result=self->acquireSelection(types,numtypes);
@@ -623,7 +573,7 @@ public:
       if(numtypes>0){
         types=new FXDragType[numtypes];
         for(FXuint i=0;i<numtypes;i++){
-          types[i]=(FXDragType) NUM2USHRT(rb_ary_entry(typesArray,i));
+          types[i]=(FXDragType) NUM2UINT(rb_ary_entry(typesArray,i));
           }
       }
       bool result=self->acquireClipboard(types,numtypes);
@@ -650,7 +600,7 @@ public:
       if(numtypes>0){
         types=new FXDragType[numtypes];
         for(FXuint i=0;i<numtypes;i++){
-          types[i]=(FXDragType) NUM2USHRT(rb_ary_entry(typesArray,i));
+          types[i]=(FXDragType) NUM2UINT(rb_ary_entry(typesArray,i));
           }
       }
       bool result=self->beginDrag(types,numtypes);

data/swig-interfaces/FXWizard.i

@@ -28,23 +28,6 @@
 * and ask various questions at each step in the installation.
 */
 class FXWizard : public FXDialogBox {
-protected:
-  FXHorizontalFrame *buttons;           // Button frame
-  FXImageFrame      *sidebar;           // Sidebar comprising image
-  FXButton          *advance;           // Advance to next stage
-  FXButton          *retreat;           // Retreat to last stage
-  FXButton          *finish;            // Finish panel
-  FXButton          *cancel;            // Cancel button
-  FXSwitcher        *panels;            // Sub panels
-  FXIcon            *finishicon;
-  FXIcon            *nexticon;
-  FXIcon            *backicon;
-protected:
-  FXWizard(){}
-  void construct();
-private:
-  FXWizard(const FXWizard&);
-  FXWizard &operator=(const FXWizard&);
 public:
   long onUpdFinish(FXObject*,FXSelector,void* PTR_IGNORE);
   long onCmdNext(FXObject*,FXSelector,void* PTR_IGNORE);

data/swig-interfaces/FXXBMIcon.i

@@ -23,8 +23,6 @@
 
 /// X Bitmap icon
 class FXXBMIcon : public FXIcon {
-protected:
-  FXXBMIcon(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXXBMImage.i

@@ -23,8 +23,6 @@
 
 /// X Bitmap image
 class FXXBMImage : public FXImage {
-protected:
-  FXXBMImage(){}
 public:
   %extend {
     static VALUE fileExt() {