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 dc1aec766ff185df933da77dc220a15b45795e1a..a0034575bcc8cf3c9d5522447ab0c2b2c1a47ac9 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -12,16 +12,8 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

-#ifdef __GNUG__
-#pragma interface "button.h"
-#endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-

 // Pushbutton
 // Pushbutton

-class WXDLLEXPORT wxButton: public wxControl
+class WXDLLEXPORT wxButton: public wxButtonBase

 {
     DECLARE_DYNAMIC_CLASS(wxButton)
         
 {
     DECLARE_DYNAMIC_CLASS(wxButton)
         


@@ -29,7 +21,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,


@@ -38,7 +30,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,


@@ -52,6 +45,9 @@ public:
     // Implementation
 private:
     virtual wxSize DoGetBestSize() const;
     // Implementation
 private:
     virtual wxSize DoGetBestSize() const;

+    virtual wxSize GetMinSize() const;
+    wxSize OldGetBestSize() const;
+    wxSize OldGetMinSize() const;

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