fxruby 1.6.28-x86-mingw32 → 1.6.29-x86-mingw32

data/swig-interfaces/FXDirDialog.i

@@ -32,11 +32,6 @@ class FXDirSelector;
 
 /// Directory selection dialog
 class FXDirDialog : public FXDialogBox {
-protected:
-  FXDirSelector *dirbox;          // Directory selection widget
-protected:
-  FXDirDialog(){}
-  void initdialog();
 public:
   %extend {
     /// Construct Directory Dialog Box

data/swig-interfaces/FXDirList.i

@@ -35,14 +35,6 @@ enum {
 
 /// Directory item
 class FXDirItem : public FXTreeItem {
-protected:
-  FXFileAssoc  *assoc;                // File association
-  FXDirItem    *link;                 // Link to next item
-  FXDirItem    *list;                 // List of child items
-  FXlong	size;                 // File size (if a file)
-  FXTime        date;                 // Time of item
-protected:
-  FXDirItem():assoc(NULL),link(NULL),list(NULL),size(0L),date(0){}
 public:
   enum {
     FOLDER      = 512,                // Directory item
@@ -118,29 +110,6 @@ DECLARE_FXTREEITEM_VIRTUALS(FXDirItem)
 * The Directory list widget supports drags and drops of files.
 */
 class FXDirList : public FXTreeList {
-protected:
-  FXFileDict   *associations;         // Association table
-  FXDirItem    *list;                 // Root item list
-  FXString      dropdirectory;        // Drop directory
-  FXDragAction  dropaction;           // Drop action
-  FXString      dragfiles;            // Dragged files
-  FXString      pattern;              // Pattern of file names
-  FXuint        matchmode;            // File wildcard match mode
-  FXuint        counter;              // Refresh counter
-  FXIcon       *open_folder;          // Open folder icon
-  FXIcon       *closed_folder;        // Closed folder icon
-  FXIcon       *mini_doc;             // Document icon
-  FXIcon       *mini_app;             // Application icon
-  FXIcon       *cdromicon;
-  FXIcon       *harddiskicon;
-  FXIcon       *networkicon;
-  FXIcon       *floppyicon;
-  FXIcon       *zipdiskicon;
-protected:
-  FXDirList();
-  void listRootItems();
-  void listChildItems(FXDirItem *par);
-  virtual FXTreeItem* createItem(const FXString& text,FXIcon* oi,FXIcon* ci,void* ptr);
 public:
   long onRefreshTimer(FXObject*,FXSelector,void* PTR_IGNORE);
   long onBeginDrag(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXDirSelector.i

@@ -35,25 +35,6 @@ class FXDriveBox;
 
 /// Directory selection widget
 class FXDirSelector : public FXPacker {
-protected:
-  FXDirList     *dirbox;          // Directory list widget
-  FXDriveBox    *drivebox;        // Drive selection widget
-  FXTextField   *dirname;         // Directory name entry field
-  FXButton      *accept;          // Accept button
-  FXButton      *cancel;          // Cancel button
-  FXIcon        *updiricon;     // Up directory icon
-  FXIcon        *homeicon;      // Go home icon
-  FXIcon        *workicon;      // Go home icon
-  FXIcon        *markicon;      // Book mark icon
-  FXIcon        *clearicon;     // Book clear icon
-  FXIcon        *newicon;       // New directory icon
-  FXIcon        *deleteicon;    // Delete file icon
-  FXIcon        *moveicon;      // Rename file icon
-  FXIcon        *copyicon;      // Copy file icon
-  FXIcon        *linkicon;      // Link file icon
-  FXRecentFiles  mrufiles;      // Recently visited places
-protected:
-  FXDirSelector(){}
 public:
   long onCmdName(FXObject*,FXSelector,void* PTR_IGNORE);
   long onCmdOpened(FXObject*,FXSelector,void* PTR_TREEITEM);

data/swig-interfaces/FXDockBar.i

@@ -37,14 +37,6 @@
 * in the void* pointer argument of the message.
 */
 class FXDockBar : public FXPacker {
-protected:
-  FXComposite *drydock;	        // Parent when docked
-  FXComposite *wetdock;	        // Parent when floating
-  FXint        gripx;           // Grip offset x
-  FXint        gripy;           // Grip offset y
-  FXuchar      allowed;         // Where we're allowed to dock
-protected:
-  FXDockBar();
 public:
   long onCmdUndock(FXObject*,FXSelector,void* PTR_IGNORE);
   long onUpdUndock(FXObject*,FXSelector,void* PTR_IGNORE);

data/swig-interfaces/FXDockHandler.i

@@ -30,14 +30,6 @@
 * and dock title.
 */
 class FXDockHandler : public FXFrame {
-protected:
-  FXString  tip;        // Tool tip
-  FXString  help;       // Help string
-protected:
-  FXDockHandler();
-private:
-  FXDockHandler(const FXDockHandler&);
-  FXDockHandler& operator=(const FXDockHandler&);
 public:
   long onLeftBtnPress(FXObject*,FXSelector,void*);
   long onLeftBtnRelease(FXObject*,FXSelector,void*);
@@ -50,8 +42,6 @@ public:
   long onCmdGetTip(FXObject*,FXSelector,void*);
   long onCmdSetHelp(FXObject*,FXSelector,void*);
   long onCmdGetHelp(FXObject*,FXSelector,void*);
-protected:
-  FXDockHandler(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb);
 public:
 
   /// Set the status line help text for grip

data/swig-interfaces/FXDockSite.i

@@ -53,13 +53,6 @@ enum {
 * vertically oriented if placed with LAYOUT_SIDE_LEFT or LAYOUT_SIDE_RIGHT.
 */
 class FXDockSite : public FXPacker {
-protected:
-  FXDockSite(){}
-protected:
-  void moveVerBar(FXWindow* bar,FXWindow *begin,FXWindow* end,FXint bx,FXint by);
-  void moveHorBar(FXWindow* bar,FXWindow *begin,FXWindow* end,FXint bx,FXint by);
-  FXint galleyWidth(FXWindow *begin,FXWindow*& end,FXint space,FXint& require,FXint& expand) const;
-  FXint galleyHeight(FXWindow *begin,FXWindow*& end,FXint space,FXint& require,FXint& expand) const;
 public:
 
   %extend {

data/swig-interfaces/FXDockTitle.i

@@ -35,12 +35,6 @@
 * caption above the dock bar.
 */
 class FXDockTitle : public FXDockHandler {
-protected:
-  FXString  caption;            // Caption text
-  FXFont   *font;               // Caption font
-  FXColor   captionColor;       // Caption color
-protected:
-  FXDockTitle();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onCmdSetValue(FXObject*,FXSelector,void*); // FIXME

data/swig-interfaces/FXDragCorner.i

@@ -26,15 +26,6 @@
 * so as to allow the window to be resized more easily.
 */
 class FXDragCorner : public FXWindow {
-protected:
-  FXColor hiliteColor;
-  FXColor shadowColor;
-  FXint   oldw;
-  FXint   oldh;
-  FXint   xoff;
-  FXint   yoff;
-protected:
-  FXDragCorner();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXDrawable.i

@@ -28,13 +28,6 @@ class FXVisual;
 * drawn upon, such as a FXWindow, or FXImage.
 */
 class FXDrawable : public FXId {
-protected:
-  FXVisual     *visual;                 // Visual for this window
-  FXint         width;                  // Width
-  FXint         height;                 // Height
-protected:
-  FXDrawable();
-  FXDrawable(FXApp* a,FXint w,FXint h);
 public:
   %extend {
     // Construct with this width and height

data/swig-interfaces/FXFileDialog.i

@@ -38,11 +38,6 @@ class FXFileSelector;
 
 /// File selection dialog
 class FXFileDialog : public FXDialogBox {
-protected:
-  FXFileSelector *filebox;
-protected:
-  FXFileDialog(){}
-  void initdialog();
 public:
   %extend {
     /// Construct file dialog box

data/swig-interfaces/FXFileDict.i

@@ -38,11 +38,6 @@ struct FXFileAssoc {
 
 /// File Association dictionary
 class FXFileDict : public FXDict {
-protected:
-  FXFileDict(){}
-  virtual void *createData(const void*);
-  virtual void deleteData(void*);
-
 public:
   %extend {
     /// Registry key used to find fallback executable icons

data/swig-interfaces/FXFileList.i

@@ -126,29 +126,6 @@ DECLARE_FXICONITEM_VIRTUALS(FXFileItem)
 * The File list widget supports drags and drops of files.
 */
 class FXFileList : public FXIconList {
-protected:
-  FXString     directory;             // Current directory
-  FXString     orgdirectory;          // Original directory
-  FXString     dropdirectory;         // Drop directory
-  FXDragAction dropaction;            // Drop action
-  FXString     dragfiles;             // Dragged files
-  FXFileDict  *associations;          // Association table
-  FXFileItem  *list;                  // File item list
-  FXString     pattern;               // Pattern of file names
-  FXuint       matchmode;             // File wildcard match mode
-  FXuint       counter;               // Refresh counter
-  FXint         imagesize;      // Image size
-  FXTime       timestamp;             // Time when last refreshed
-  FXIcon      *big_folder;            // Big folder icon
-  FXIcon      *mini_folder;           // Mini folder icon
-  FXIcon      *big_doc;               // Big document icon
-  FXIcon      *mini_doc;              // Mini document icon
-  FXIcon      *big_app;               // Big application icon
-  FXIcon      *mini_app;              // Mini application icon
-protected:
-  FXFileList();
-  virtual FXIconItem *createItem(const FXString& text,FXIcon *big,FXIcon* mini,void* ptr);
-  void listItems(FXbool force);
 public:
   long onOpenTimer(FXObject*,FXSelector,void* PTR_IGNORE);
   long onRefreshTimer(FXObject*,FXSelector,void* PTR_IGNORE);

data/swig-interfaces/FXFileSelector.i

@@ -60,39 +60,6 @@ enum {
 
 /// File selection widget
 class FXFileSelector : public FXPacker {
-protected:
-  FXFileList    *filebox;         // File list widget
-  FXTextField   *filename;        // File name entry field
-  FXComboBox    *filefilter;      // Combobox for pattern list
-  FXMenuPane    *bookmarkmenu;       // Menu for bookmarks
-  FXHorizontalFrame *navbuttons;        // Navigation buttons
-  FXHorizontalFrame *fileboxframe;      // Frame around file list
-  FXMatrix          *entryblock;        // Entry block
-  FXCheckButton *readonly;        // Open file as read only
-  FXDirBox      *dirbox;          // Directory hierarchy list
-  FXButton      *accept;          // Accept button
-  FXButton      *cancel;          // Cancel button
-  FXIcon        *updiricon;       // Up directory icon
-  FXIcon        *listicon;        // List mode icon
-  FXIcon        *detailicon;      // Detail mode icon
-  FXIcon        *iconsicon;       // Icon mode icon
-  FXIcon        *homeicon;        // Go home icon
-  FXIcon        *workicon;        // Go home icon
-  FXIcon        *shownicon;       // Files shown icon
-  FXIcon        *hiddenicon;      // Files hidden icon
-  FXIcon        *markicon;        // Book mark icon
-  FXIcon        *clearicon;       // Book clear icon
-  FXIcon            *newicon;           // New directory icon
-  FXIcon        *deleteicon;      // Delete file icon
-  FXIcon        *moveicon;        // Rename file icon
-  FXIcon        *copyicon;        // Copy file icon
-  FXIcon        *linkicon;        // Link file icon
-  FXRecentFiles      bookmarks;         // Bookmarked places
-  FXuint         selectmode;      // Select mode
-protected:
-  FXFileSelector(){}
-  FXString *getSelectedFiles() const;
-  FXString *getSelectedFilesOnly() const;
 public:
   long onCmdAccept(FXObject*,FXSelector,void* PTR_IGNORE);
   long onCmdFilter(FXObject*,FXSelector,void* PTR_CSTRING);

data/swig-interfaces/FXFoldingList.i

@@ -38,10 +38,6 @@ enum {
 
 /// Tree list Item
 class FXFoldingItem : public FXObject {
-protected:
-  FXFoldingItem():parent(NULL),prev(NULL),next(NULL),first(NULL),last(NULL),openIcon(NULL),closedIcon(NULL),data(NULL),state(0),x(0),y(0){}
-  virtual void draw(const FXFoldingList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const;
-  virtual FXint hitItem(const FXFoldingList* list,FXint x,FXint y) const;
 public:
   enum{
     SELECTED        = 1,
@@ -168,15 +164,6 @@ DECLARE_FXFOLDINGITEM_VIRTUALS(FXFoldingItem)
 * 3rd argument of the message.
 */
 class FXFoldingList : public FXScrollArea {
-protected:
-  FXFoldingList();
-  void recompute();
-  void mergesort(FXFoldingItem*& list);
-  void sort(FXFoldingItem*& f1,FXFoldingItem*& t1,FXFoldingItem*& f2,FXFoldingItem*& t2,int n);
-  virtual void moveContents(FXint x,FXint y);
-  virtual FXFoldingItem* createItem(const FXString& text,FXIcon* oi,FXIcon* ci,void* ptr);
-  static FXint compareSection(const FXchar *p,const FXchar* q,FXint s);
-  static FXint compareSectionCase(const FXchar *p,const FXchar* q,FXint s);
 public:
   long onPaint(FXObject*,FXSelector,void*);
   long onEnter(FXObject*,FXSelector,void*);
@@ -233,11 +220,11 @@ public:
       if(FXMALLOC(&strings,FXchar*,len+1)){
         for(long i=0;i<len;i++){
           VALUE s=rb_ary_entry(stringArray,i);
-	  strings[i]=StringValuePtr(s);
+          strings[i]=StringValuePtr(s);
           }
-	strings[len]=0;
+        strings[len]=0;
         self->setHeaders(strings,size);
-	FXFREE(&strings);
+        FXFREE(&strings);
         }
       }
   }
@@ -296,7 +283,7 @@ public:
     FXFoldingItem* insertItem(FXFoldingItem* other,FXFoldingItem* father,FXFoldingItem* item,FXbool notify=FALSE){
       if(item->isMemberOf(FXMETACLASS(FXRbFoldingItem))){
         dynamic_cast<FXRbFoldingItem*>(item)->owned=TRUE;
-	}
+        }
       return self->insertItem(other,father,item,notify);
       }
   }
@@ -309,7 +296,7 @@ public:
     FXFoldingItem* appendItem(FXFoldingItem* father,FXFoldingItem* item,FXbool notify=FALSE){
       if(item->isMemberOf(FXMETACLASS(FXRbFoldingItem))){
         dynamic_cast<FXRbFoldingItem*>(item)->owned=TRUE;
-	}
+        }
       return self->appendItem(father,item,notify);
       }
   }
@@ -322,7 +309,7 @@ public:
     FXFoldingItem* prependItem(FXFoldingItem* father,FXFoldingItem* item,FXbool notify=FALSE){
       if(item->isMemberOf(FXMETACLASS(FXRbFoldingItem))){
         dynamic_cast<FXRbFoldingItem*>(item)->owned=TRUE;
-	}
+        }
       return self->prependItem(father,item,notify);
       }
   }

data/swig-interfaces/FXFont.i

@@ -125,26 +125,6 @@ struct FXFontDesc {
 
 /// Font class
 class FXFont : public FXId {
-protected:
-  FXString  wantedName;         // Desired font font name
-  FXString  actualName;         // Matched font font name
-  FXushort  wantedSize;         // Font size (points*10)
-  FXushort  actualSize;         // Actual size that was matched
-  FXushort  wantedWeight;       // Font weight
-  FXushort  actualWeight;       // Font weight
-  FXushort  wantedSlant;        // Font slant
-  FXushort  actualSlant;        // Font slant
-  FXushort  wantedSetwidth;     // Relative setwidth
-  FXushort  actualSetwidth;     // Relative setwidth
-  FXushort  wantedEncoding;     // Character set encoding
-  FXushort  actualEncoding;     // Character set encoding
-  FXushort  hints;              // Matching hint flags
-  FXushort  flags;              // Actual flags
-  FXshort   angle;              // Angle
-  void     *font;                 // Info about the font
-protected:
-  FXFont();
-  void* match(const FXString& wantfamily,const FXString& wantforge,FXuint wantsize,FXuint wantweight,FXuint wantslant,FXuint wantsetwidth,FXuint wantencoding,FXuint wanthints,FXint res);
 public:
 
   /// Font pitch hints

data/swig-interfaces/FXFontDialog.i

@@ -25,10 +25,6 @@ class FXFontSelector;
 
 /// Font selection dialog
 class FXFontDialog : public FXDialogBox {
-protected:
-  FXFontSelector *fontbox;
-protected:
-  FXFontDialog(){}
 public:
   %extend {
     /// Constructor
@@ -43,9 +39,9 @@ public:
   %extend {
     /// Get the current font selection
     FXFontDesc getFontSelection() const {
-	FXFontDesc fontdesc;
-	self->getFontSelection(fontdesc);
-	return fontdesc;
+      FXFontDesc fontdesc;
+      self->getFontSelection(fontdesc);
+      return fontdesc;
     }
   }
 

data/swig-interfaces/FXFontSelector.i

@@ -31,32 +31,6 @@ class FXFont;
 
 /// Font selection widget
 class FXFontSelector : public FXPacker {
-protected:
-  FXTextField   *family;
-  FXList        *familylist;
-  FXTextField   *weight;
-  FXList        *weightlist;
-  FXTextField   *style;
-  FXList        *stylelist;
-  FXTextField   *size;
-  FXList        *sizelist;
-  FXComboBox    *charset;
-  FXComboBox    *setwidth;
-  FXComboBox    *pitch;
-  FXCheckButton *scalable;
-  FXCheckButton *allfonts;
-  FXButton      *accept;
-  FXButton      *cancel;
-  FXLabel       *preview;
-  FXFont        *previewfont;
-  FXFontDesc     selected;
-protected:
-  FXFontSelector(){}
-  void listFontFaces();
-  void listWeights();
-  void listSlants();
-  void listFontSizes();
-  void previewFont();
 public:
   long onCmdFamily(FXObject*,FXSelector,void* PTR_INT);
   long onCmdWeight(FXObject*,FXSelector,void* PTR_INT);
@@ -109,9 +83,9 @@ public:
   %extend {
     /// Get font selection
     FXFontDesc getFontSelection() const {
-	FXFontDesc fontdesc;
-        self->getFontSelection(fontdesc);
-	return fontdesc;
+      FXFontDesc fontdesc;
+      self->getFontSelection(fontdesc);
+      return fontdesc;
     }
   }