fxruby 1.6.28 → 1.6.29

data/swig-interfaces/FXChoiceBox.i

@@ -29,14 +29,6 @@
 * while a -1 is returned if the dialog was canceled,
 */
 class FXChoiceBox : public FXDialogBox {
-protected:
-  FXList *list;
-protected:
-  FXChoiceBox(){}
-private:
-  FXChoiceBox(const FXChoiceBox&);
-  FXChoiceBox &operator=(const FXChoiceBox&);
-  void initialize(const FXString& text,FXIcon* icon);
 public:
   long onCmdClicked(FXObject*,FXSelector,void* PTR_IGNORE);
   long onCmdCancel(FXObject*,FXSelector,void* PTR_IGNORE);

data/swig-interfaces/FXColorBar.i

@@ -35,14 +35,6 @@ class FXImage;
 * color by means of the hue, saturation, value specification system.
 */
 class FXColorBar : public FXFrame {
-protected:
-  FXImage  *bar;          // Intensity bar
-  FXfloat   hsv[3];       // Hue, saturation, value
-  FXString  tip;          // Tooltip value
-  FXString  help;         // Help value
-protected:
-  FXColorBar();
-  void updatebar();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXColorDialog.i

@@ -33,10 +33,6 @@ class FXColorSelector;
 * automatically saved into the registry for future use.
 */
 class FXColorDialog : public FXDialogBox {
-protected:
-  FXColorSelector *colorbox;
-protected:
-  FXColorDialog(){}
 public:
   long onChgColor(FXObject*,FXSelector,void* PTR_COLOR);
   long onCmdColor(FXObject*,FXSelector,void* PTR_COLOR);

data/swig-interfaces/FXColorList.i

@@ -25,12 +25,6 @@
 
 /// Color item
 class FXColorItem : public FXListItem {
-protected:
-  FXColor  color;
-protected:
-  FXColorItem();
-  virtual void draw(const FXList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h);
-  virtual FXint hitItem(const FXList* list,FXint x,FXint y) const;
 public:
   %extend {
     /// Construct new item with given text, color, and user-data
@@ -56,9 +50,6 @@ DECLARE_FXLISTITEM_VIRTUALS(FXColorItem)
 * A ColorList Widget displays a list of colors.
 */
 class FXColorList : public FXList {
-protected:
-  FXColorList();
-  virtual FXListItem *createItem(const FXString& text,FXIcon* icon,void* ptr);
 public:
   %extend {
     /// Construct a list with initially no items in it

data/swig-interfaces/FXColorRing.i

@@ -42,46 +42,6 @@
 * the brightness goes from black to a bright color.
 */
 class FXColorRing : public FXFrame {
-protected:
-  FXImage  *dial;         // HSV dial image
-  FXfloat   hsv[3];       // Hue, saturation, value
-  FXint     ringwidth;    // Width of hue ring
-  FXint     ringouter;    // Outer radius
-  FXint     ringinner;    // Inner radius
-  FXint     dialx;        // Dial x location
-  FXint     dialy;        // Dial y location
-  FXint     satvalx;      // Saturation value x
-  FXint     satvaly;      // Saturation value y
-  FXint     huex;         // Hue x
-  FXint     huey;         // Hue y
-  FXint     clrx;         // Color corner of triangle
-  FXint     clry;
-  FXint     blkx;         // Black corner of triangle
-  FXint     blky;
-  FXint     whtx;         // White corner of triangle
-  FXint     whty;
-  FXString  tip;          // Tooltip value
-  FXString  help;         // Help value
-  FXuchar   mode;         // Mode widget is in
-protected:
-  FXColorRing();
-  void updatering();
-  FXfloat hueFromXY(FXint x,FXint y) const;
-  void hueToXY(FXint& x,FXint& y,FXfloat hue) const;
-  void satValToXY(FXint& x,FXint& y,FXfloat s,FXfloat v) const;
-  void satValFromXY(FXfloat& s,FXfloat& v,FXint x,FXint y) const;
-  FXbool inCorner(FXint x,FXint y) const;
-  FXbool inHueRing(FXint x,FXint y) const;
-  FXbool inTriangle(FXint x,FXint y) const;
-protected:
-  enum {
-    MOUSE_NONE,         // No mouse operation
-    MOUSE_HUE,          // Moving in hue-ring
-    MOUSE_SATVAL        // Moving in saturation/value triangle
-    };
-private:
-  FXColorRing(const FXColorRing&);
-  FXColorRing &operator=(const FXColorRing&);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXColorSelector.i

@@ -34,31 +34,6 @@ class FXLabel;
 
 /// Color selection widget
 class FXColorSelector : public FXPacker {
-protected:
-  FXTabBook   *panels;                // Color panes
-  FXColorWell *well;                  // Main well
-  FXColorList  *list;                 // List of color names
-  FXColorRing  *wheel;                // Color ring
-  FXSlider    *rgbaslider[4];         // RGBA sliders
-  FXTextField *rgbatext[4];           // RGBA text fields
-  FXSlider    *hsvaslider[4];         // HSVA sliders
-  FXTextField *hsvatext[4];           // HSVA text fields
-  FXSlider    *cmyslider[4];          // CMY sliders
-  FXTextField *cmytext[4];            // CMY text fields
-  FXColorWell *colorwells[24];        // Custom color wells
-  FXIcon       *eyedropicon;          // Icon for eye dropper
-  FXIcon       *dialmodeicon;         // Icon for dial mode
-  FXIcon      *rgbmodeicon;           // Icon for RGB mode
-  FXIcon      *hsvmodeicon;           // Icon for HSV mode
-  FXIcon      *cmymodeicon;           // Icon for CMY mode
-  FXIcon      *txtmodeicon;           // Icon for TEXT mode
-  FXButton    *accept;                // Accept button
-  FXButton    *cancel;                // Cancel button
-  FXfloat      rgba[4];               // Accurate RGBA color
-  FXfloat      hsva[4];               // Accurate HSVA color
-protected:
-  FXColorSelector(){}
-  void updateWell();
 public:
   long onCmdWell(FXObject*,FXSelector,void* PTR_IGNORE);
   long onChgWell(FXObject*,FXSelector,void* PTR_COLOR);

data/swig-interfaces/FXColorWell.i

@@ -38,16 +38,6 @@ enum {
 * you can highlight the word `red' and paste it into a color well.
 */
 class FXColorWell : public FXFrame {
-protected:
-  FXColor   wellColor[2];             // Pixel value of RGBA over black and white
-  FXColor   rgba;                     // Color with RGB and Alpha
-  FXColor   oldrgba;                  // Old color
-  FXString  tip;                      // Tooltip value
-  FXString  help;                     // Help value
-protected:
-  FXColorWell();
-  static FXColor rgbaoverblack(FXColor clr);
-  static FXColor rgbaoverwhite(FXColor clr);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXColorWheel.i

@@ -28,21 +28,6 @@ class FXImage;
 * of the hue, saturation, value color specification system.
 */
 class FXColorWheel : public FXFrame {
-protected:
-  FXImage  *dial;         // HSV dial image
-  FXfloat   hsv[3];       // Hue, saturation, value
-  FXint     dialx;        // Dial x location
-  FXint     dialy;        // Dial Y location
-  FXint     spotx;        // Spot x location
-  FXint     spoty;        // Spot Y location
-  FXString  tip;          // Tooltip value
-  FXString  help;         // Help value
-protected:
-  FXColorWheel();
-  void updatedial();
-  void movespot(FXint x,FXint y);
-  FXbool hstoxy(FXint& x,FXint& y,FXfloat h,FXfloat s) const;
-  FXbool xytohs(FXfloat& h,FXfloat& s,FXint x,FXint y) const;
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXComboBox.i

@@ -72,13 +72,6 @@ class FXPopup;
 * the value of the field.
 */
 class FXComboBox : public FXPacker {
-protected:
-  FXTextField   *field;
-  FXMenuButton  *button;
-  FXList        *list;
-  FXPopup       *pane;
-protected:
-  FXComboBox(){}
 public:
   long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
   long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXComposeContext.i

@@ -28,11 +28,6 @@
 * if input method support is enabled.
 */
 class FXComposeContext : public FXId {
-protected:
-  FXWindow  *window;            // Window we belong to
-  FXSelector message;           // Message to send it
-protected:
-  FXComposeContext();
 public:
 
   %extend {

data/swig-interfaces/FXComposite.i

@@ -23,10 +23,6 @@
 
 /// Base composite
 class FXComposite : public FXWindow {
-protected:
-  FXComposite(){}
-  FXComposite(FXApp* a,FXVisual *vis);
-  FXComposite(FXApp* a,FXWindow* own,FXuint opts,FXint x,FXint y,FXint w,FXint h);
 public:
   long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
   long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXCursor.i

@@ -42,15 +42,6 @@ enum {
 
 /// Cursor class
 class FXCursor : public FXId {
-protected:
-  FXColor *data;              // Source data
-  FXint    width;             // Width
-  FXint    height;            // Height
-  FXint    hotx;              // Hot spot x
-  FXint    hoty;              // Hot spot y
-  FXuint   options;           // Options
-protected:
-  FXCursor();
 public:
   %extend {
     /// Make stock cursor

data/swig-interfaces/FXDC.i

@@ -164,32 +164,6 @@ class FXDrawable;
 * application regardless of the actual device surface being utilized.
 */
 class FXDC {
-private:
-  FXApp           *app;       // Application
-protected:
-  void            *ctx;       // Context handle
-  FXFont          *font;      // Drawing font
-  FXStipplePattern pattern;   // Stipple pattern
-  FXBitmap        *stipple;   // Stipple bitmap
-  FXImage         *tile;      // Tile image
-  FXBitmap        *mask;      // Mask bitmap
-  FXRectangle      clip;      // Clip rectangle
-  FXColor          fg;        // Foreground color
-  FXColor          bg;        // Background color
-  FXuint           width;     // Line width
-  FXCapStyle       cap;       // Line cap style
-  FXJoinStyle      join;      // Line join style
-  FXLineStyle      style;     // Line style
-  FXFillStyle      fill;      // Fill style
-  FXFillRule       rule;      // Fill rule
-  FXFunction       rop;       // RasterOp
-  FXchar           dashpat[32]; // Line dash pattern data
-  FXuint           dashlen;     // Line dash pattern length
-  FXuint           dashoff;     // Line dash pattern offset
-  FXint            tx;        // Tile dx
-  FXint            ty;        // Tile dy
-  FXint            cx;        // Clip x
-  FXint            cy;        // Clip y
 public:
   %extend {
     /// Construct dummy DC

data/swig-interfaces/FXDCPrint.i

@@ -91,25 +91,6 @@ struct FXPrinter {
 
 /// Postscript Printer Device Context
 class FXDCPrint : public FXDC {
-protected:
-  void      *psout;                   // File Stream for PS output
-  FXFont    *font;
-  FXuint     flags;
-  FXint      Xr,Yr;
-  FXdouble   mediawidth;              // Media width
-  FXdouble   mediaheight;             // Media height
-  FXPSBounds mediabb;                 // Media bounding box
-  FXPSBounds docbb;                   // Document bounding box
-  FXPSBounds pagebb;                  // Page bounding box
-  FXint      pagecount;               // Number of pages printed
-  FXint      nchars;                  // Number of characters on a line
-  FXint      pxmin;                   // min X coord in content
-  FXint      pymin;                   // min Y coord in content
-  FXint      pxmax;                   // max X coord in content
-  FXint      pymax;                   // max Y coord in content
-protected:
-  void bbox(FXfloat x,FXfloat y);
-  void tfm(FXfloat& xo,FXfloat& yo,FXfloat xi,FXfloat yi);
 public:
   %extend {
     /// Construct

data/swig-interfaces/FXDataTarget.i

@@ -34,11 +34,6 @@
 * by subtracting ID_OPTION from the message ID.
 */
 class FXDataTarget : public FXObject {
-protected:
-  FXObject     *target;                 // Target object
-  void         *data;                   // Associated data
-  FXSelector    message;                // Message ID
-  FXuint        type;                   // Type of data
 public:
   long onCmdValue(FXObject*,FXSelector,void* PTR_IGNORE);
   long onUpdValue(FXObject*,FXSelector,void* PTR_IGNORE);

data/swig-interfaces/FXDebugTarget.i

@@ -27,10 +27,6 @@
 * whose messages you want to see,
 */
 class FXDebugTarget : public FXObject {
-protected:
-  FXObject   *lastsender;
-  FXSelector  lastsel;
-  FXuint      count;
 public:
 #ifdef SWIGRUBY
   %extend {

data/swig-interfaces/FXDelegator.i

@@ -31,8 +31,6 @@
 * new target.
 */
 class FXDelegator : public FXObject {
-protected:
-  FXObject   *delegate;
 public:
   %extend {
     /// Construct a delegator

data/swig-interfaces/FXDial.i

@@ -32,20 +32,6 @@ enum {
 
 /// Dial
 class FXDial : public FXFrame {
-protected:
-  FXint         range[2];                         // Reported data range
-  FXColor       notchColor;                       // Main notch color
-  FXint         notchangle;                       // Angle of main notch
-  FXint         notchspacing;                     // Angle between notches
-  FXint         notchoffset;                      // Notch offset
-  FXint         dragpoint;                        // Place where clicked
-  FXint         dragpos;                          // Value where clicked
-  FXint         incr;                             // Rate of change/revolution
-  FXint         pos;                              // Reported data position
-  FXString      help;                             // Help string
-  FXString      tip;                              // Tip string
-protected:
-  FXDial(){}
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onMotion(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXDialogBox.i

@@ -27,8 +27,6 @@
 * To close the DialogBox when not running modally, simply send it ID_HIDE.
 */
 class FXDialogBox : public FXTopWindow {
-protected:
-  FXDialogBox(){}
 public:
   long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
   long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXDict.i

@@ -37,33 +37,6 @@
 * be indexed by strings.
 */
 class FXDict : public FXObject {
-protected:
-  struct FXDictEntry {
-    FXchar *key;              // Key string
-    void   *data;             // Data
-    FXint   hash;             // Hash value of key
-    bool  mark;             // Entry is marked
-    };
-protected:
-  FXDictEntry *dict;          // Dictionary
-  FXint        total;         // Dictionary size
-  FXint        number;        // Number of entries
-protected:
-
-  /**
-  * Overload this function in a derived class to return the
-  * data pointer given an input pointer; the default implementation
-  * just returns the input pointer.
-  */
-  virtual void *createData(const void*);
-
-  /**
-  * Overload this function in a derived class to delete the pointer
-  * previously returned by createData(); the default implementation
-  * does nothing.
-  */
-  virtual void deleteData(void*);
-
 public:
   %extend {
     /**

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);