X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/401e3b6e5f50f15571b86297b5d1e3f55c473f6f..73302af6dddd667af4ebec69c800bc9de106f28e:/include/wx/button.h?ds=sidebyside

diff --git a/include/wx/button.h b/include/wx/button.h
index 1143afed78..8277c66ebc 100644
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -12,10 +12,6 @@
 #ifndef _WX_BUTTON_H_BASE_
 #define _WX_BUTTON_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "buttonbase.h"
-#endif
-
 #include "wx/defs.h"
 
 // ----------------------------------------------------------------------------
@@ -29,7 +25,7 @@
 #define wxBU_TOP             0x0080
 #define wxBU_RIGHT           0x0100
 #define wxBU_BOTTOM          0x0200
-
+#define wxBU_ALIGN_MASK      ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM )
 #endif
 
 #if wxUSE_BUTTON
@@ -48,11 +44,10 @@
 #define wxBU_EXACTFIT        0x0001
 
 #include "wx/control.h"
-#include "wx/stockitem.h"
 
 class WXDLLEXPORT wxBitmap;
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxButtonNameStr;
 
 // ----------------------------------------------------------------------------
 // wxButton: a push button
@@ -82,16 +77,6 @@ public:
     static wxSize GetDefaultSize();
 
 protected:
-#ifndef __WXGTK20__
-    // create stock button (generic implementation)
-    bool CreateStock(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);
-#endif
-
     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };
 
@@ -109,6 +94,8 @@ protected:
     #include "wx/cocoa/button.h"
 #elif defined(__WXPM__)
     #include "wx/os2/button.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/button.h"
 #endif
 
 #endif // wxUSE_BUTTON