revert removal of wxBU_AUTODRAW, now that it is again available with WXWIN_COMPATIBIL...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index 66fa99a317b92a04c82e88e6f258f9e6cf910019..e80c2d0ab48b1892682ae62883bd4a8d6c97f660 100644 (file)
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -72,7 +72,7 @@ public:
                         wxWindowID id = wxID_CONTEXT_HELP,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         wxWindowID id = wxID_CONTEXT_HELP,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,

-                        long style = 0);
+                        long style = wxBU_AUTODRAW);

 
     void OnContextHelp(wxCommandEvent& event);
 
 
     void OnContextHelp(wxCommandEvent& event);
 

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 8af6ef8881c832f9c443671600729148f7560738..a8a396b8c542049f0b276cf99ad6afe523f62e77 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -24,7 +24,7 @@ public:
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,

-                   long style = 0,
+                   long style = wxBU_AUTODRAW,

                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {


@@ -38,14 +38,14 @@ public:
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = 0,
+                long style = wxBU_AUTODRAW,

                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
     void SetLabel( const wxString &label );
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
     void SetLabel( const wxString &label );
     virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
 

-    virtual bool Enable(bool enable = TRUE);
+    virtual bool Enable(bool enable = true);

 
     // implementation
     // --------------
 
     // implementation
     // --------------