fxruby 1.6.28-x64-mingw32 → 1.6.29-x64-mingw32

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

data/swig-interfaces/FXOptionMenu.i

@@ -30,8 +30,6 @@ class FXPopup;
 
 /// Option Menu Button
 class FXOption : public FXLabel {
-protected:
-  FXOption();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onEnter(FXObject*,FXSelector,void* PTR_EVENT);
@@ -75,11 +73,6 @@ DECLARE_FXWINDOW_VIRTUALS(FXOption)
 
 /// Option Menu
 class FXOptionMenu : public FXLabel {
-protected:
-  FXPopup  *pane;
-  FXOption *current;
-protected:
-  FXOptionMenu();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXPCXIcon.i

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

data/swig-interfaces/FXPCXImage.i

@@ -23,8 +23,6 @@
 
 ///  PCX graphics file
 class FXPCXImage : public FXImage {
-protected:
-  FXPCXImage(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXPNGIcon.i

@@ -24,8 +24,6 @@
 
 /// Portable Network Graphics (PNG) Icon
 class FXPNGIcon : public FXIcon {
-protected:
-  FXPNGIcon(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXPNGImage.i

@@ -24,8 +24,6 @@
 
 /// Portable Network Graphics (PNG) Image
 class FXPNGImage : public FXImage {
-protected:
-  FXPNGImage(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXPPMIcon.i

@@ -23,8 +23,6 @@
 
 /// Portable Pixmap icon
 class FXPPMIcon : public FXIcon {
-protected:
-  FXPPMIcon(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXPPMImage.i

@@ -23,8 +23,6 @@
 
 /// Portable Pixmap Image
 class FXPPMImage : public FXImage {
-protected:
-  FXPPMImage(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXPacker.i

@@ -37,29 +37,6 @@ enum { DEFAULT_SPACING = 4 };
 * case it will be placed to take all remaining space.
 */
 class FXPacker : public FXComposite {
-protected:
-  FXColor baseColor;        // Base color
-  FXColor hiliteColor;      // Highlight color
-  FXColor shadowColor;      // Shadow color
-  FXColor borderColor;      // Border color
-  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
-  FXint   border;           // Border width
-protected:
-  FXPacker();
-  void drawBorderRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawRidgeRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawGrooveRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawDoubleRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawDoubleSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawFocusRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawFrame(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXPicker.i

@@ -26,8 +26,6 @@
 * location on the screen.
 */
 class FXPicker : public FXButton {
-protected:
-  FXPicker(){}
 public:
   long onMotion(FXObject*,FXSelector,void* PTR_EVENT);
   long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXPopup.i

@@ -30,24 +30,6 @@ enum {
 
 /// Popup window
 class FXPopup : public FXShell {
-protected:
-  FXWindow *grabowner;                // Window which will get grabbed when outside
-  FXColor   baseColor;
-  FXColor   hiliteColor;
-  FXColor   shadowColor;
-  FXColor   borderColor;
-  FXint     border;
-protected:
-  FXPopup();
-  virtual FXbool doesOverrideRedirect() const;
-  void drawBorderRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawRidgeRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawGrooveRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawDoubleRaisedRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawDoubleSunkenRectangle(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
-  void drawFrame(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onFocusUp(FXObject*,FXSelector,void* PTR_EVENT);

data/swig-interfaces/FXPrintDialog.i

@@ -30,37 +30,6 @@ class FXIcon;
 
 /// Printer selection dialog
 class FXPrintDialog : public FXDialogBox {
-protected:
-  FXRadioButton *sendtoprinter;
-  FXComboBox    *printername;
-  FXRadioButton *sendtofile;
-  FXTextField   *filename;
-  FXRadioButton *printall;
-  FXRadioButton *printeven;
-  FXRadioButton *printodd;
-  FXRadioButton *printrange;
-  FXRadioButton *firstpagefirst;
-  FXRadioButton *lastpagefirst;
-  FXRadioButton *printincolor;
-  FXRadioButton *printinblacknwhite;
-  FXRadioButton *orientportrait;
-  FXRadioButton *orientlanscape;
-  FXListBox     *media;
-  FXRadioButton *sizeletter;
-  FXRadioButton *sizelegal;
-  FXRadioButton *sizeA4;
-  FXRadioButton *sizeenvelope;
-  FXRadioButton *sizecustom;
-  FXTextField   *sizewidth;
-  FXTextField   *sizeheight;
-  FXSpinner     *firstpage;
-  FXSpinner     *lastpage;
-  FXSpinner     *numberofcopies;
-  FXIcon        *landscapeIcon;
-  FXIcon        *portraitIcon;
-  FXPrinter      printer;
-protected:
-  FXPrintDialog(){}
 public:
   long onCmdToPrinter(FXObject*,FXSelector,void* PTR_IGNORE);
   long onUpdToPrinter(FXObject*,FXSelector,void* PTR_IGNORE);

data/swig-interfaces/FXProgressBar.i

@@ -32,18 +32,6 @@ enum {
 
 /// Progress bar widget
 class FXProgressBar : public FXFrame {
-protected:
-  FXuint   progress;                      // Integer percentage number
-  FXuint   total;                         // Amount for completion
-  FXint    barsize;                       // Bar size
-  FXFont*  font;
-  FXColor  barBGColor;
-  FXColor  barColor;
-  FXColor  textNumColor;
-  FXColor  textAltColor;
-protected:
-  FXProgressBar(){}
-  void drawInterior(FXDCWindow& dc);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onCmdSetValue(FXObject*,FXSelector,void* PTR_UINT);

data/swig-interfaces/FXProgressDialog.i

@@ -34,14 +34,6 @@ enum {
 * in a program and that the program is in fact still working.
 */
 class FXProgressDialog : public FXDialogBox {
-protected:
-  FXProgressBar         *progress;    // Progress bar
-  FXLabel               *message;     // Message
-  FXHorizontalSeparator *separator;   // Separator
-  FXButton              *cancel;      // Cancel button
-  FXbool                 cancelled;   // User hit cancel
-protected:
-  FXProgressDialog();
 public:
   long onCmdSetValue(FXObject*,FXSelector,void* PTR_INT);
   long onCmdSetIntValue(FXObject*,FXSelector,void* PTR_PINT);

data/swig-interfaces/FXRGBIcon.i

@@ -23,8 +23,6 @@
 
 /// IRIS RGB icon
 class FXRGBIcon : public FXIcon {
-protected:
-  FXRGBIcon(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXRGBImage.i

@@ -23,8 +23,6 @@
 
 /// IRIS RGB image
 class FXRGBImage : public FXImage {
-protected:
-  FXRGBImage(){}
 public:
   %extend {
     static VALUE fileExt() {

data/swig-interfaces/FXRadioButton.i

@@ -39,13 +39,6 @@ enum {
 * common SEL_UPDATED handler to check and uncheck radio buttons as appropriate.
 */
 class FXRadioButton : public FXLabel {
-protected:
-  FXColor  radioColor;  // Color of radio ball
-  FXColor  diskColor;   // Color of radio disk
-  FXbool   check;       // Radio state
-  FXbool   oldcheck;    // Old radio state
-protected:
-  FXRadioButton();
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onUpdate(FXObject*,FXSelector,void* PTR_NULL);

data/swig-interfaces/FXRecentFiles.i

@@ -27,12 +27,6 @@
 * means of the standard system registry.
 */
 class FXRecentFiles : public FXObject {
-protected:
-  FXObject   *target;         // Target object to send message
-  FXSelector  message;        // Message to send
-  FXint       maxfiles;       // Maximum number of files to track
-protected:
-  FXRecentFiles(const FXRecentFiles&);
 public:
   long onCmdClear(FXObject*,FXSelector,void* PTR_IGNORE);
   long onCmdFile(FXObject*,FXSelector,void* PTR_IGNORE);

data/swig-interfaces/FXRegion.i

@@ -29,8 +29,6 @@
 class FXRegion {
   friend class FXDC;
   friend class FXDCWindow;
-private:
-  void *region;
 public:
 
   /// Construct new empty region

data/swig-interfaces/FXRegistry.i

@@ -43,18 +43,6 @@
 * system when FXApp::exit() is called.
 */
 class FXRegistry : public FXSettings {
-protected:
-  FXString       applicationkey;  // Application key
-  FXString       vendorkey;       // Vendor key
-  bool	 ascii;		  // ASCII file-based registry
-protected:
-  bool readFromDir(const FXchar* dirname,FXbool mark);
-#ifdef WIN32
-  bool readFromRegistry(void* hRootKey,FXbool mark);
-  bool writeToRegistry(void* hRootKey);
-  bool readFromRegistryGroup(void* org,const char* groupname,FXbool mark=FALSE);
-  bool writeToRegistryGroup(void* org,const char* groupname);
-#endif
 public:
 
   /**

data/swig-interfaces/FXReplaceDialog.i

@@ -25,21 +25,6 @@ class FXTextField;
 
 /// Text replace dialog
 class FXReplaceDialog : public FXDialogBox {
-protected:
-  FXLabel           *searchlabel;
-  FXTextField       *searchtext;
-  FXHorizontalFrame *searchbox;
-  FXLabel           *replacelabel;
-  FXTextField       *replacetext;
-  FXHorizontalFrame *replacebox;
-  FXButton          *accept;
-  FXButton          *cancel;
-  FXButton          *every;
-  FXuint             searchmode;
-  FXuint             current;
-protected:
-  FXReplaceDialog(){}
-  void appendHistory(const FXString& search,const FXString& replace,FXuint mode);
 public:
   long onCmdAll(FXObject*,FXSelector,void* PTR_IGNORE);
   long onCmdNext(FXObject*,FXSelector,void* PTR_IGNORE);

data/swig-interfaces/FXRootWindow.i

@@ -23,12 +23,6 @@
 
 /// Root window
 class FXRootWindow : public FXComposite {
-protected:
-  FXRootWindow(){}
-#ifdef WIN32
-  virtual FXID GetDC() const;
-  virtual int ReleaseDC(FXID) const;
-#endif
 public:
 
   /// Construct root window

data/swig-interfaces/FXRuler.i

@@ -57,51 +57,6 @@ class FXFont;
 * and size of entities within the document.
 */
 class FXRuler : public FXFrame {
-protected:
-  FXFont  *font;                // Font for numbers
-  FXint    documentSize;        // Size of document
-  FXint    edgeSpacing;         // Edge spacing around document
-  FXint    marginLower;         // Lower margin
-  FXint    marginUpper;         // Upper margin
-  FXint    indentFirst;         // First line paragraph indent
-  FXint    indentLower;         // Lower paragraph indent
-  FXint    indentUpper;         // Upper paragraph indent
-  FXdouble pixelPerTick;        // Number of pixels per tick increment
-  FXint    numberTicks;         // Tick increments between numbers
-  FXint    majorTicks;          // Tick increments between major ticks
-  FXint    mediumTicks;         // Tick increments between medium ticks
-  FXint    tinyTicks;           // Tick increments between tiny ticks
-  FXint    arrowPos;            // Arrow position
-  FXColor  textColor;           // Color for numbers and ticks
-  FXint    shift;               // Left edge of content
-  FXint    pos;                 // Scroll position
-  FXint    off;                 // Offset item was grabbed
-  FXString tip;                 // Tooltip text
-  FXString help;                // Help text
-  FXuchar  mode;                // Mode widget is in
-protected:
-  FXRuler();
-  FXint picked(FXint x,FXint y);
-  void drawLeftArrow(FXDCWindow& dc,FXint x,FXint y);
-  void drawRightArrow(FXDCWindow& dc,FXint x,FXint y);
-  void drawUpArrow(FXDCWindow& dc,FXint x,FXint y);
-  void drawDownArrow(FXDCWindow& dc,FXint x,FXint y);
-  void drawLeftMarker(FXDCWindow& dc,FXint x,FXint y);
-  void drawRightMarker(FXDCWindow& dc,FXint x,FXint y);
-  void drawUpMarker(FXDCWindow& dc,FXint x,FXint y);
-  void drawDownMarker(FXDCWindow& dc,FXint x,FXint y);
-protected:
-  enum{
-    MOUSE_NONE,         // No mouse operation
-    MOUSE_MARG_LOWER,   // Drag lower margin
-    MOUSE_MARG_UPPER,   // Drag upper margin
-    MOUSE_PARA_FIRST,   // Drag first indent
-    MOUSE_PARA_LOWER,   // Drag lower indent
-    MOUSE_PARA_UPPER    // Drag upper indent
-    };
-private:
-  FXRuler(const FXRuler&);
-  FXRuler &operator=(const FXRuler&);
 public:
   long onPaint(FXObject*,FXSelector,void* PTR_EVENT);
   long onLeftBtnPress(FXObject*,FXSelector,void* PTR_EVENT);