keep the old wxFont::Create() signature (changed by font size in pixels patch) to...

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

diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index 3a55ddec52e9ae6d5e996178d0f456b172529934..0d1c3110c7613e0a21d1d300e776dbd8c5c9f6a2 100644 (file)
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -35,21 +35,24 @@ extern const wxChar *wxButtonNameStr;
 // wxButton
 //-----------------------------------------------------------------------------
 
 // wxButton
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxButton();
 {
 public:
     wxButton();

-    wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
+    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)
     {
            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);
+        Create(parent, id, label, pos, size, style, validator, name);

     }
     }

+

     virtual ~wxButton();
 
     virtual ~wxButton();
 

-    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,


@@ -59,12 +62,10 @@ public:
     virtual void SetLabel( const wxString &label );
     virtual bool Enable( bool enable = TRUE );
 
     virtual void SetLabel( const wxString &label );
     virtual bool Enable( bool enable = TRUE );
 

-    static wxSize GetDefaultSize();
-

     // implementation
     // --------------
 
     // implementation
     // --------------
 

-    void ApplyWidgetStyle();
+    void DoApplyWidgetStyle(GtkRcStyle *style);

     bool IsOwnGtkWindow( GdkWindow *window );
 
     // Since this wxButton doesn't derive from wxButtonBase (why?) we need
     bool IsOwnGtkWindow( GdkWindow *window );
 
     // Since this wxButton doesn't derive from wxButtonBase (why?) we need