simplify wxEVT_MENU_OPEN/CLOSE generation

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

diff --git a/include/wx/button.h b/include/wx/button.h
index 89bef2b6b5b3a5bc0da5f5c94bb37dff98e45665..a88d7176149abaabaf625846866db218d79ee0e9 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -34,9 +34,11 @@
 // wxButton specific flags
 // ----------------------------------------------------------------------------
 
+#if WXWIN_COMPATIBILITY_2_8
 // These two flags are obsolete
 #define wxBU_NOAUTODRAW      0x0000
 #define wxBU_AUTODRAW        0x0004
+#endif
 
 // by default, the buttons will be created with some (system dependent)
 // minimal size to make them look nicer, giving this style will make them as
@@ -45,9 +47,9 @@
 
 #include "wx/control.h"
 
-class WXDLLEXPORT wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
-extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxButton: a push button
@@ -78,6 +80,9 @@ public:
     static wxSize GetDefaultSize();
 
 protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };