get rid of wxClientDC::m_oldFont, it wasn't really used (this fixes crash introduced...

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

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index 8a5044d68b2693da67348797ccba5685b6c575e9..20978e6ae0a6595118af1a73ec90b3ed7ad1acd7 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -25,7 +25,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,


@@ -34,7 +34,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,


@@ -48,6 +49,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();
 };