added conversion to and from std::string and std::wstring (if wxUSE_STD_STRING)

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

diff --git a/include/wx/button.h b/include/wx/button.h
index b1a05acf0cdefbda9c3623004c3d6107851b11e6..89bef2b6b5b3a5bc0da5f5c94bb37dff98e45665 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -64,9 +64,10 @@ public:
     // 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
@@ -86,8 +87,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__)