implemented UTF-16/32 using To/FromWChar() instead of MB2WC/WC2MB for sizeof(wchar_t...

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

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index e0d5e0d0eefa2888f0540789106a0ff349092223..a395a617ca8e34a25264092482778af38240e64f 100644 (file)
--- 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"
@@ -29,7 +25,7 @@ class WXDLLIMPEXP_CORE wxButton;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar *wxButtonNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxButton
@@ -65,7 +61,6 @@ public:
     // implementation
     // --------------
 
-    void DoApplyWidgetStyle(GtkRcStyle *style);
     bool IsOwnGtkWindow( GdkWindow *window );
 
     // Since this wxButton doesn't derive from wxButtonBase (why?) we need
@@ -75,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)