X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d57be459406c2830f6abc9d99ae99166c6d133b..b052a864e9d5270fd40f9ee6021133d2c3cd3173:/include/wx/motif/button.h

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index bbfbb3bed2..58fa70b3c6 100644
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -1,55 +1,57 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        button.h
+// Name:        wx/motif/button.h
 // Purpose:     wxButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
-#ifdef __GNUG__
-#pragma interface "button.h"
-#endif
-
-#include "wx/control.h"
-#include "wx/gdicmn.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-
 // Pushbutton
-class WXDLLEXPORT wxButton: public wxControl
+class WXDLLEXPORT wxButton: public wxButtonBase
 {
-  DECLARE_DYNAMIC_CLASS(wxButton)
- public:
-  inline wxButton() {}
-  inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
-
-  virtual void SetDefault();
-  virtual void Command(wxCommandEvent& event);
-
-// Implementation
-  virtual void ChangeFont();
-  virtual void ChangeBackgroundColour();
-  virtual void ChangeForegroundColour();
+public:
+    wxButton() { }
+    wxButton(wxWindow *parent,
+        wxWindowID id,
+        const wxString& label = wxEmptyString,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxButtonNameStr)
+    {
+        Create(parent, id, label, pos, size, style, validator, name);
+    }
+
+    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 wxString& name = wxButtonNameStr);
+
+    virtual wxWindow *SetDefault();
+    virtual void Command(wxCommandEvent& event);
+
+    static wxSize GetDefaultSize();
+
+    // Implementation
+    virtual wxSize GetMinSize() const;
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    wxSize OldGetBestSize() const;
+    wxSize OldGetMinSize() const;
+    void SetDefaultShadowThicknessAndResize();
+
+    DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
-#endif
-    // _WX_BUTTON_H_
+#endif // _WX_BUTTON_H_