X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/401e3b6e5f50f15571b86297b5d1e3f55c473f6f..a9e8bf2dd9bccb38eb39fba955125aaf23d6f500:/include/wx/gtk/button.h

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index fd2f1ef02b..a395a617ca 100644
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -10,10 +10,6 @@
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/list.h"
@@ -23,23 +19,24 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxButton;
+class WXDLLIMPEXP_CORE wxButton;
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
-extern const wxChar *wxButtonNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxButton
 //-----------------------------------------------------------------------------
 
-class wxButton: public wxButtonBase
+class WXDLLIMPEXP_CORE wxButton: public wxButtonBase
 {
 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,
@@ -47,31 +44,15 @@ public:
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
-    
-    wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock,
-           const wxString& descriptiveLabel = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-    {
-        Create(parent, id, stock, descriptiveLabel, pos, style, validator, name);
-    }
 
     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 wxString& name = wxButtonNameStr);
-    
-    bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock,
-           const wxString& descriptiveLabel = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
 
     virtual void SetDefault();
     virtual void SetLabel( const wxString &label );
@@ -80,7 +61,6 @@ public:
     // implementation
     // --------------
 
-    void DoApplyWidgetStyle(GtkRcStyle *style);
     bool IsOwnGtkWindow( GdkWindow *window );
 
     // Since this wxButton doesn't derive from wxButtonBase (why?) we need
@@ -90,8 +70,12 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
+    // helper to allow access to protected member from GTK callback
+    void MoveWindow(int x, int y, int width, int height) { DoMoveWindow(x, y, width, height); }
+
 protected:
     virtual wxSize DoGetBestSize() const;
+    void DoApplyWidgetStyle(GtkRcStyle *style);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxButton)