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 cf0b7ed65103a0980f992d01ef6a4041bc2b54ee..a0034575bcc8cf3c9d5522447ab0c2b2c1a47ac9 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -6,16 +6,12 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "button.h"
-#endif
-
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
 {
@@ -25,7 +21,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,
@@ -34,7 +30,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,
@@ -48,7 +45,9 @@ public:
     // Implementation
 private:
     virtual wxSize DoGetBestSize() const;
+    virtual wxSize GetMinSize() const;
     wxSize OldGetBestSize() const;
+    wxSize OldGetMinSize() const;
     void SetDefaultShadowThicknessAndResize();
 };