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 8277c66ebc84227facf470e0b28f0af42e57cffd..a88d7176149abaabaf625846866db218d79ee0e9 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -34,9 +34,11 @@
 // wxButton specific flags
 // ----------------------------------------------------------------------------
 
 // wxButton specific flags
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_8

 // These two flags are obsolete
 #define wxBU_NOAUTODRAW      0x0000
 #define wxBU_AUTODRAW        0x0004
 // 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
 
 // 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"
 
 
 #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
 
 // ----------------------------------------------------------------------------
 // wxButton: a push button


@@ -64,9 +66,10 @@ public:
     // set the margins around the image
     virtual void SetImageMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { }
 
     // set the margins around the image
     virtual void SetImageMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { }
 

-    // this wxButton method is called when the button becomes the default one
-    // on its panel
-    virtual void SetDefault() { }
+    // make this button the default button in its top level window
+    //
+    // returns the old default item (possibly NULL)
+    virtual wxWindow *SetDefault();

 
     // Buttons on MSW can look bad if they are not native colours, because
     // then they become owner-drawn and not theme-drawn.  Disable it here
 
     // Buttons on MSW can look bad if they are not native colours, because
     // then they become owner-drawn and not theme-drawn.  Disable it here


@@ -77,6 +80,9 @@ public:
     static wxSize GetDefaultSize();
 
 protected:
     static wxSize GetDefaultSize();
 
 protected:

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };
 


@@ -86,8 +92,10 @@ protected:
     #include "wx/msw/button.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/button.h"
     #include "wx/msw/button.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/button.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/button.h"
     #include "wx/gtk/button.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/button.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/button.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/button.h"
 #elif defined(__WXCOCOA__)