X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b4f47a319cfaa434e00025aa779e407fbacee23..bc07ab17bf5370f452e899128bf89cc7ca7b98f0:/include/wx/button.h?ds=inline diff --git a/include/wx/button.h b/include/wx/button.h index 428e6e0611..ee53cf704d 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -25,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 @@ -47,7 +47,7 @@ class WXDLLEXPORT wxBitmap; -WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxButton: a push button @@ -76,6 +76,7 @@ public: // returns the default button size for this platform static wxSize GetDefaultSize(); +protected: DECLARE_NO_COPY_CLASS(wxButtonBase) }; @@ -85,14 +86,18 @@ public: #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__) #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