fxruby 1.6.28 → 1.6.29

data/swig-interfaces/FXLabel.i

@@ -51,22 +51,6 @@ class FXFont;
 * and/or help string.
 */
 class FXLabel : public FXFrame {
-protected:
-  FXString label;
-  FXIcon*  icon;
-  FXFont*  font;
-  FXHotKey hotkey;
-  FXint    hotoff;
-  FXColor  textColor;
-  FXString tip;
-  FXString help;
-protected:
-  FXLabel();
-  FXint labelHeight(const FXString& text) const;
-  FXint labelWidth(const FXString& text) const;
-  void drawLabel(FXDCWindow& dc,const FXString& text,FXint hot,FXint tx,FXint ty,FXint tw,FXint th);
-  void just_x(FXint& tx,FXint& ix,FXint tw,FXint iw);
-  void just_y(FXint& ty,FXint& iy,FXint th,FXint ih);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onHotKeyPress(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXList.i

@@ -39,16 +39,6 @@ class FXList;
 
 /// List item
 class FXListItem : public FXObject {
-protected:
-  FXString  label;
-  FXIcon   *icon;
-  void     *data;
-  FXuint    state;
-  FXint     x,y;
-protected:
-  FXListItem();
-  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:
   enum {
     SELECTED  = 1,
@@ -127,29 +117,6 @@ DYNAMIC_CAST(SWIGTYPE_p_FXListItem, FXListItem_dynamic_cast);
 * 3rd argument of the message.
 */
 class FXList : public FXScrollArea {
-protected:
-  FXListItemList items;             // Item list
-  FXint          anchor;            // Anchor item
-  FXint          current;           // Current item
-  FXint          extent;            // Extent item
-  FXint          cursor;            // Cursor item
-  FXint          viewable;          // Viewable item
-  FXFont        *font;              // Font
-  FXColor        textColor;         // Text color
-  FXColor        selbackColor;      // Selected back color
-  FXColor        seltextColor;      // Selected text color
-  FXint          listWidth;         // List width
-  FXint          listHeight;        // List height
-  FXint          visible;           // Number of rows high
-  FXString       help;              // Help text
-  FXint          grabx;             // Grab point x
-  FXint          graby;             // Grab point y
-  FXString       lookup;            // Lookup string
-  FXbool         state;             // State of item
-protected:
-  FXList();
-  void recompute();
-  virtual FXListItem *createItem(const FXString& text,FXIcon* icon,void* ptr);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onEnter(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXListBox.i

@@ -42,13 +42,6 @@ class FXPopup;
 
 /// List Box
 class FXListBox : public FXPacker {
-protected:
-  FXButton      *field;
-  FXMenuButton  *button;
-  FXList        *list;
-  FXPopup       *pane;
-protected:
-  FXListBox(){}
 public:
   long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
   long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXMDIButton.i

@@ -25,8 +25,6 @@ class FXIcon;
 
 /// MDI Delete button
 class FXMDIDeleteButton : public FXButton {
-protected:
-  FXMDIDeleteButton(){}
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
 public:
@@ -50,8 +48,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXMDIDeleteButton)
 
 /// MDI Restore button
 class FXMDIRestoreButton : public FXButton {
-protected:
-  FXMDIRestoreButton(){}
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
 public:
@@ -75,8 +71,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXMDIRestoreButton)
 
 /// MDI Maximize button
 class FXMDIMaximizeButton : public FXButton {
-protected:
-  FXMDIMaximizeButton(){}
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
 public:
@@ -100,8 +94,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXMDIMaximizeButton)
 
 /// MDI Minimize button
 class FXMDIMinimizeButton : public FXButton {
-protected:
-  FXMDIMinimizeButton(){}
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
 public:
@@ -125,8 +117,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXMDIMinimizeButton)
 
 /// MDI Window button
 class FXMDIWindowButton : public FXMenuButton {
-protected:
-  FXMDIWindowButton(){}
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
 public:
@@ -150,8 +140,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXMDIWindowButton)
 
 /// MDI Window Menu
 class FXMDIMenu : public FXMenuPane {
-protected:
-  FXMDIMenu(){}
 public:
   %extend {
     /// Construct MDI menu

data/swig-interfaces/FXMDIChild.i

@@ -60,57 +60,6 @@ enum {
 * ID_SETSTRINGVALUE), and window icon (via ID_SETICONVALUE).
 */
 class FXMDIChild : public FXComposite {
-protected:
-  FXString      title;                  // Window title
-  FXMenuButton *windowbtn;              // Window button
-  FXButton     *minimizebtn;            // Minimize button
-  FXButton     *restorebtn;             // Restore button
-  FXButton     *maximizebtn;            // Maximize buton
-  FXButton     *deletebtn;              // Close button
-  FXFont       *font;                   // Title font
-  FXColor       baseColor;              // Colors
-  FXColor       hiliteColor;
-  FXColor       shadowColor;
-  FXColor       borderColor;
-  FXColor       titleColor;
-  FXColor       titleBackColor;
-  FXint         iconPosX;               // Saved icon position
-  FXint         iconPosY;
-  FXint         iconWidth;
-  FXint         iconHeight;
-  FXint         normalPosX;             // Saved normal position
-  FXint         normalPosY;
-  FXint         normalWidth;
-  FXint         normalHeight;
-  FXint         spotx;                  // Grab-spot of mouse on window
-  FXint         spoty;
-  FXint         xoff;                   // Mouse offset to add
-  FXint         newx;                   // New location of window
-  FXint         newy;
-  FXint         neww;
-  FXint         newh;
-  FXuchar       mode;                   // Dragging mode
-protected:
-  FXMDIChild();
-  void drawRubberBox(FXint x,FXint y,FXint w,FXint h);
-  void animateRectangles(FXint ox,FXint oy,FXint ow,FXint oh,FXint nx,FXint ny,FXint nw,FXint nh);
-  FXuchar where(FXint x,FXint y);
-  void changeCursor(FXint x,FXint y);
-  void revertCursor();
-protected:
-  enum {
-    DRAG_NONE        = 0,
-    DRAG_TOP         = 1,
-    DRAG_BOTTOM      = 2,
-    DRAG_LEFT        = 4,
-    DRAG_RIGHT       = 8,
-    DRAG_TOPLEFT     = (DRAG_TOP|DRAG_LEFT),
-    DRAG_TOPRIGHT    = (DRAG_TOP|DRAG_RIGHT),
-    DRAG_BOTTOMLEFT  = (DRAG_BOTTOM|DRAG_LEFT),
-    DRAG_BOTTOMRIGHT = (DRAG_BOTTOM|DRAG_RIGHT),
-    DRAG_INVERTED    = 16,
-    DRAG_TITLE       = 32
-    };
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onFocusSelf(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXMDIClient.i

@@ -41,12 +41,6 @@ class FXMDIChild;
 * automatically grayed out if there are less than X MDI child windows.
 */
 class FXMDIClient : public FXComposite {
-protected:
-  FXMDIChild *active;             // Active child
-  FXint       cascadex;           // Cascade offset X
-  FXint       cascadey;           // Cascade offset Y
-protected:
-  FXMDIClient();
 public:
   long onCmdActivateNext(FXObject*,FXSelector,void* PTR_IGNORE);
   long onCmdActivatePrev(FXObject*,FXSelector,void* PTR_IGNORE);

data/swig-interfaces/FXMainWindow.i

@@ -30,8 +30,6 @@
 * raised, the MainWindow will delete itself.
 */
 class FXMainWindow : public FXTopWindow {
-protected:
-  FXMainWindow(){}
 public:
   %extend {
     /// Construct a main window

data/swig-interfaces/FXMat3d.i

@@ -22,8 +22,6 @@
 
 /// Double-precision 3x3 matrix
 class FXMat3d {
-protected:
-  FXVec3d m[3];
 public:
 
   /// Default constructor

data/swig-interfaces/FXMat3f.i

@@ -22,8 +22,6 @@
 
 /// Single-precision 3x3 matrix
 class FXMat3f {
-protected:
-  FXVec3f m[3];
 public:
 
   /// Default constructor

data/swig-interfaces/FXMat4d.i

@@ -22,8 +22,6 @@
 
 /// Double-precision 4x4 matrix
 class FXMat4d {
-protected:
-  FXVec4d m[4];
 public:
   /// Constructors
   FXMat4d();

data/swig-interfaces/FXMat4f.i

@@ -23,8 +23,6 @@
 
 // Single-precision 4x4 matrix
 class FXMat4f {
-protected:
-  FXVec4f m[4];
 public:
   /// Constructors
   FXMat4f();

data/swig-interfaces/FXMatrix.i

@@ -45,10 +45,6 @@ enum {
 * as a space-holder.
 */
 class FXMatrix : public FXPacker {
-protected:
-  FXint  num;
-protected:
-  FXMatrix(){}
 public:
   long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);
   long onFocusDown(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXMemoryStream.i

@@ -22,7 +22,6 @@
 
 /// Memory Store Definition
 class FXMemoryStream : public FXStream {
-protected:
 public:
 
   /// Create memory store

data/swig-interfaces/FXMenuBar.i

@@ -22,8 +22,6 @@
 
 /// Menu bar
 class FXMenuBar : public FXToolBar {
-protected:
-  FXMenuBar(){}
 public:
   long onFocusLeft(FXObject*,FXSelector,void* PTR_EVENT);
   long onFocusRight(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXMenuButton.i

@@ -58,13 +58,6 @@ enum {
 * MENUBUTTON_NOARROWS.
 */
 class FXMenuButton : public FXLabel {
-protected:
-  FXPopup *pane;                  // Pane to pop up
-  FXint    offsetx;               // Shift attachment point x
-  FXint    offsety;               // Shift attachment point y
-  FXbool   state;                 // Pane was popped
-protected:
-  FXMenuButton();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onUpdate(FXObject*,FXSelector,void* PTR_IGNORE);

data/swig-interfaces/FXMenuCaption.i

@@ -38,21 +38,6 @@ class FXFont;
 * above a number of menu commands in a menu.
 */
 class FXMenuCaption : public FXWindow {
-protected:
-  FXString     label;
-  FXString     help;
-  FXString     tip;
-  FXIcon      *icon;
-  FXFont      *font;
-  FXint        hotoff;
-  FXHotKey     hotkey;
-  FXColor      textColor;
-  FXColor      selbackColor;
-  FXColor      seltextColor;
-  FXColor      hiliteColor;
-  FXColor      shadowColor;
-protected:
-  FXMenuCaption();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onUpdate(FXObject*,FXSelector,void* PTR_IGNORE);

data/swig-interfaces/FXMenuCascade.i

@@ -28,11 +28,6 @@ class FXPopup;
 * pull down menu.
 */
 class FXMenuCascade : public FXMenuCaption {
-protected:
-  FXPopup *pane;
-protected:
-  FXMenuCascade(){}
-  void drawTriangle(FXDCWindow& dc,FXint l,FXint t,FXint r,FXint b);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onEnter(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXMenuCheck.i

@@ -29,14 +29,6 @@
 * the void* argument of the message contains the new state.
 */
 class FXMenuCheck : public FXMenuCommand {
-protected:
-  FXuchar check;        // State of menu
-  FXColor boxColor;     // Box color
-protected:
-  FXMenuCheck();
-private:
-  FXMenuCheck(const FXMenuCheck&);
-  FXMenuCheck &operator=(const FXMenuCheck&);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onButtonPress(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXMenuCommand.i

@@ -27,11 +27,6 @@
 * When activated, a menu command sends a SEL_COMMAND to its target.
 */
 class FXMenuCommand : public FXMenuCaption {
-protected:
-  FXString     accel;       // Accelerator string
-  FXHotKey     acckey;      // Accelerator key
-protected:
-  FXMenuCommand(){}
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onEnter(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXMenuPane.i

@@ -23,8 +23,6 @@
 
 /// Popup menu pane
 class FXMenuPane : public FXPopup {
-protected:
-  FXMenuPane(){}
 public:
   %extend {
     /// Construct menu pane

data/swig-interfaces/FXMenuRadio.i

@@ -32,14 +32,6 @@
 * properly maintain the state between them.
 */
 class FXMenuRadio : public FXMenuCommand {
-protected:
-  FXuchar check;        // State of menu
-  FXColor radioColor;   // Color of the radio
-protected:
-  FXMenuRadio();
-private:
-  FXMenuRadio(const FXMenuRadio&);
-  FXMenuRadio &operator=(const FXMenuRadio&);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onButtonPress(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXMenuSeparator.i

@@ -26,11 +26,6 @@
 * used to delineate items in a popup menu.
 */
 class FXMenuSeparator : public FXWindow {
-protected:
-  FXColor hiliteColor;
-  FXColor shadowColor;
-protected:
-  FXMenuSeparator();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
 public:

data/swig-interfaces/FXMenuTitle.i

@@ -28,10 +28,6 @@ class FXPopup;
 * for popping up a pulldown menu.
 */
 class FXMenuTitle : public FXMenuCaption {
-protected:
-  FXPopup *pane;
-protected:
-  FXMenuTitle(){}
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onEnter(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXMessageBox.i

@@ -60,8 +60,6 @@ enum {
 * before the program may continue.
 */
 class FXMessageBox : public FXDialogBox {
-protected:
-  FXMessageBox(){}
 public:
   long onCmdClicked(FXObject*,FXSelector,void* PTR_IGNORE);
   long onCmdCancel(FXObject*,FXSelector,void* PTR_IGNORE);
@@ -90,29 +88,34 @@ public:
       }
     }
 
+  %typemap(in) (const char* message_format, const char* message_string) {
+    $1 = (char*)"%s";
+    $2 = RSTRING_PTR($input);
+  }
+
   /// Show a modal error message
-  static FXuint error(FXWindow* owner,FXuint opts,const char* caption,const char* message);
+  static FXuint error(FXWindow* owner,FXuint opts,const char* caption,const char* message_format, const char* message_string);
 
   // Show modal error message, in free floating window.
-  static FXuint error(FXApp* app,FXuint opts,const char* caption,const char* message);
+  static FXuint error(FXApp* app,FXuint opts,const char* caption,const char* message_format, const char* message_string);
 
   /// Show a modal warning message
-  static FXuint warning(FXWindow* owner,FXuint opts,const char* caption,const char* message);
+  static FXuint warning(FXWindow* owner,FXuint opts,const char* caption,const char* message_format, const char* message_string);
 
   /// Show a modal warning message, in a free-floating window
-  static FXuint warning(FXApp* app,FXuint opts,const char* caption,const char* message);
+  static FXuint warning(FXApp* app,FXuint opts,const char* caption,const char* message_format, const char* message_string);
 
   /// Show a modal question dialog
-  static FXuint question(FXWindow* owner,FXuint opts,const char* caption,const char* message);
+  static FXuint question(FXWindow* owner,FXuint opts,const char* caption,const char* message_format, const char* message_string);
 
   /// Show a modal question dialog, in a free-floating window
-  static FXuint question(FXApp* app,FXuint opts,const char* caption,const char* message);
+  static FXuint question(FXApp* app,FXuint opts,const char* caption,const char* message_format, const char* message_string);
 
   /// Show a modal information dialog
-  static FXuint information(FXWindow* owner,FXuint opts,const char* caption,const char* message);
+  static FXuint information(FXWindow* owner,FXuint opts,const char* caption,const char* message_format, const char* message_string);
 
   /// Show a modal information dialog, in a free-floating window
-  static FXuint information(FXApp* app,FXuint opts,const char* caption,const char* message);
+  static FXuint information(FXApp* app,FXuint opts,const char* caption,const char* message_format, const char* message_string);
 
   // Destructor
   virtual ~FXMessageBox();