X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/458ca8c1fdad48cf05476338b946634eec03fe16..b4626104e5a68430c5c7c4f3a0b79425be9945e8:/include/wx/motif/button.h?ds=inline

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index dc1aec766f..dc2feeb89d 100644
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -12,16 +12,12 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "button.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-
 // Pushbutton
-class WXDLLEXPORT wxButton: public wxControl
+class WXDLLEXPORT wxButton: public wxButtonBase
 {
     DECLARE_DYNAMIC_CLASS(wxButton)
         
@@ -29,7 +25,7 @@ public:
     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,
@@ -38,7 +34,8 @@ public:
         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,
@@ -52,6 +49,7 @@ public:
     // Implementation
 private:
     virtual wxSize DoGetBestSize() const;
+    wxSize OldGetBestSize() const;
     void SetDefaultShadowThicknessAndResize();
 };