X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db101bd35296e100d490d3c033c0fdee32747e85..5d605a6995d8f1a647934e30089468cc598c951d:/include/wx/button.h

diff --git a/include/wx/button.h b/include/wx/button.h
index 8277c66ebc..ee53cf704d 100644
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -47,7 +47,7 @@
 
 class WXDLLEXPORT wxBitmap;
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxButton: a push button
@@ -86,8 +86,10 @@ protected:
     #include "wx/msw/button.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/button.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/button.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/button.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/button.h"
 #elif defined(__WXCOCOA__)