BC++ 5.5 and later supports wxUSE_ON_FATAL_EXCEPTION

[wxWidgets.git] / include / wx / motif / button.h

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index d9bb8faedc4b63be1bac1368046e9e8ede362aae..dc2feeb89d1839730ea8f9be98083b45d5d68cb9 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -12,7 +12,7 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "button.h"
 #endif
 
 #pragma interface "button.h"
 #endif
 


@@ -25,7 +25,7 @@ public:
     wxButton() { }
     wxButton(wxWindow *parent,
         wxWindowID id,
     wxButton() { }
     wxButton(wxWindow *parent,
         wxWindowID id,

-        const wxString& label,
+        const wxString& label = wxEmptyString,

         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,


@@ -34,7 +34,8 @@ public:
         Create(parent, id, label, pos, size, style, validator, name);
     }
     
         Create(parent, id, label, pos, size, style, validator, name);
     }
     

-    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxString& label = wxEmptyString,

         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,


@@ -48,6 +49,7 @@ public:
     // Implementation
 private:
     virtual wxSize DoGetBestSize() const;
     // Implementation
 private:
     virtual wxSize DoGetBestSize() const;

+    wxSize OldGetBestSize() const;

     void SetDefaultShadowThicknessAndResize();
 };
 
     void SetDefaultShadowThicknessAndResize();
 };