Implemented Mac-style button toggling within wxButtonToolBar, and line

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

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index 13fe4ecf90e88dfaa33857fe9ad13c2ecd2de0ae..a0034575bcc8cf3c9d5522447ab0c2b2c1a47ac9 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -12,47 +12,44 @@
 #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:
     wxButton() { }
     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)
+        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,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxButtonNameStr);
-
+    
+    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 void SetDefault();
     virtual void Command(wxCommandEvent& event);
-
+    
+    static wxSize GetDefaultSize();
+    
     // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
+private:
+    virtual wxSize DoGetBestSize() const;
+    virtual wxSize GetMinSize() const;
+    wxSize OldGetBestSize() const;
+    wxSize OldGetMinSize() const;
+    void SetDefaultShadowThicknessAndResize();
 };
 
 #endif
-    // _WX_BUTTON_H_
+// _WX_BUTTON_H_