Remove all private or protected sections from interface files.

They are ignored for wrapper method generation, but prevent
procedural wrapper generation per %extend .

This fixes method overloading in Ruby space.

swig-interfaces/FX4Splitter.i

@@ -39,12 +39,6 @@ enum {
 * proportionally resized, maintaining the same split-percentage.
 */
 class FX4Splitter : public FXComposite {
-protected:
-  FX4Splitter();
-  FXuchar getMode(FXint x,FXint y);
-  void moveSplit(FXint x,FXint y);
-  void drawSplit(FXint x,FXint y);
-  void adjustLayout();
 public:
   long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);
   long onLeftBtnRelease(FXObject*,FXSelector,void* PTR_EVENT);

swig-interfaces/FX7Segment.i

@@ -50,14 +50,6 @@ enum {
 * display widget can also display some letters and punctuations.
 */
 class FX7Segment : public FXFrame {
-protected:
-  FXString label;       // Text being shown
-  FXColor  textColor;   // Text color
-  FXint    thickness;   // Segment thickness
-  FXint    cellwidth;   // Width of cell
-  FXint    cellheight;  // height of cell
-protected:
-  FX7Segment();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onCmdSetValue(FXObject*,FXSelector,void*); // FIXME

swig-interfaces/FXAccelTable.i

@@ -27,13 +27,6 @@
  */
 
 class FXAccelTable : public FXObject {
-protected:
-  struct FXAccelKey {
-    FXObject    *target;    // Target object of message
-    FXSelector   messagedn; // Message being sent
-    FXSelector   messageup; // Message being sent
-    FXHotKey     code;      // Keysym and modifier mask to match
-    };
 public:
   long onKeyPress(FXObject*,FXSelector,void* PTR_EVENT);
   long onKeyRelease(FXObject*,FXSelector,void* PTR_EVENT);

swig-interfaces/FXApp.i

@@ -133,14 +133,6 @@ struct FXTimer {
 
 /// Application Object
 class FXApp : public FXObject {
-protected:
-
-  /// Return TRUE when new raw event is available
-  virtual bool getNextEvent(FXRawEvent& ev,FXbool blocking=TRUE);
-
-  /// Dispatch raw event
-  virtual bool dispatchEvent(FXRawEvent& ev);
-
 public:
   long onCmdQuit(FXObject*,FXSelector,void* PTR_IGNORE);
   long onCmdDump(FXObject*,FXSelector,void* PTR_IGNORE);
@@ -178,7 +170,7 @@ public:
         return 0;
         }
       else{
-	      return FXRbApp::constructAndInit(name,vendor);
+        return FXRbApp::constructAndInit(name,vendor);
         }
       }
   }
@@ -368,15 +360,15 @@ public:
       FXuint m;
       if(mode&INPUT_READ){
         m=INPUT_READ;
-	if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
         fd=FXRbGetReadFileHandle(obj);
-	self->addInput(fd,m,tgt,sel);
+        self->addInput(fd,m,tgt,sel);
         }
       if(mode&INPUT_WRITE){
         m=INPUT_WRITE;
-	if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
         fd=FXRbGetWriteFileHandle(obj);
-	self->addInput(fd,m,tgt,sel);
+        self->addInput(fd,m,tgt,sel);
         }
       return true;
       }
@@ -390,15 +382,15 @@ public:
       FXuint m;
       if(mode&INPUT_READ){
         m=INPUT_READ;
-	if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
         fd=FXRbGetReadFileHandle(obj);
-	self->removeInput(fd,m);
+        self->removeInput(fd,m);
         }
       if(mode&INPUT_WRITE){
         m=INPUT_WRITE;
-	if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
+        if(mode&INPUT_EXCEPT) m|=INPUT_EXCEPT;
         fd=FXRbGetWriteFileHandle(obj);
-	self->removeInput(fd,m);
+        self->removeInput(fd,m);
         }
       return true;
       }
@@ -557,13 +549,13 @@ public:
       FXASSERT(cur);
       if(cur->isMemberOf(FXMETACLASS(FXRbCursor))){
         dynamic_cast<FXRbCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       else if(cur->isMemberOf(FXMETACLASS(FXRbCURCursor))){
         dynamic_cast<FXRbCURCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       else if(cur->isMemberOf(FXMETACLASS(FXRbGIFCursor))){
         dynamic_cast<FXRbGIFCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       self->setWaitCursor(cur);
       }
   }
@@ -580,13 +572,13 @@ public:
       FXASSERT(cur);
       if(cur->isMemberOf(FXMETACLASS(FXRbCursor))){
         dynamic_cast<FXRbCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       else if(cur->isMemberOf(FXMETACLASS(FXRbCURCursor))){
         dynamic_cast<FXRbCURCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       else if(cur->isMemberOf(FXMETACLASS(FXRbGIFCursor))){
         dynamic_cast<FXRbGIFCursor*>(cur)->ownedByApp=TRUE;
-	}
+        }
       self->setDefaultCursor(which,cur);
       }
   }

swig-interfaces/FXArrowButton.i

@@ -38,16 +38,6 @@ enum {
 
 /// Button with an arrow
 class FXArrowButton : public FXFrame {
-protected:
-  FXColor   arrowColor;     // Arrow color
-  FXint     arrowSize;      // Arrow size
-  FXTimer  *repeater;       // Timer for auto-repeat
-  FXString  tip;            // Tooltip value
-  FXString  help;           // Help value
-  FXbool    state;          // State of button
-  FXbool    fired;          // Timer has fired
-protected:
-  FXArrowButton();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onUpdate(FXObject*,FXSelector,void* PTR_NULL);

swig-interfaces/FXBMPIcon.i

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

swig-interfaces/FXBMPImage.i

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

swig-interfaces/FXBitmap.i

@@ -41,12 +41,6 @@ enum {
 * words 8 pixels packed into a single byte, starting at bit 0 on the left.
 */
 class FXBitmap : public FXDrawable {
-protected:
-  FXuchar *data;                // Pixel data
-  FXint    bytewidth;   // Number of bytes across
-  FXuint   options;             // Options
-protected:
-  FXBitmap();
 public:
   %extend {
      /**

swig-interfaces/FXButton.i

@@ -41,10 +41,6 @@ enum {
 
 /// FXButton provides a push button. Buttons can have icons and/or labels.
 class FXButton : public FXLabel {
-protected:
-  FXuchar  state;
-protected:
-  FXButton();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onUpdate(FXObject*,FXSelector,void* PTR_NULL);

swig-interfaces/FXCURCursor.i

@@ -23,8 +23,6 @@
 
 /// CUR Cursor class
 class FXCURCursor : public FXCursor {
-protected:
-  FXCURCursor(){}
 public:
   %extend {
     static VALUE fileExt() {

swig-interfaces/FXCanvas.i

@@ -23,8 +23,6 @@
 
 /// Canvas, an area drawn by another object
 class FXCanvas : public FXWindow {
-protected:
-  FXCanvas();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
 public:

swig-interfaces/FXCheckButton.i

@@ -31,13 +31,6 @@ enum {
 
 /// Check button
 class FXCheckButton : public FXLabel {
-protected:
-  FXColor  checkColor;  // Color of check mark
-  FXColor  boxColor;    // Color of check box
-  FXbool   check;       // Check state
-  FXbool   oldcheck;    // Old check state
-protected:
-  FXCheckButton();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onUpdate(FXObject*,FXSelector,void* PTR_NULL);

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

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

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

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

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

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

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

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