From 60854f1ae227028a17da845443e3fcb71fdd9e50 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 18 Mar 2008 16:25:48 +0000 Subject: [PATCH] revert removal of wxBU_AUTODRAW, now that it is again available with WXWIN_COMPATIBILITY_2_8==0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cshelp.h | 2 +- include/wx/gtk/bmpbuttn.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h index 66fa99a317..e80c2d0ab4 100644 --- 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, - long style = 0); + long style = wxBU_AUTODRAW); void OnContextHelp(wxCommandEvent& event); diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h index 8af6ef8881..a8a396b8c5 100644 --- 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, - long style = 0, + long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr) { @@ -38,14 +38,14 @@ public: 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); } - virtual bool Enable(bool enable = TRUE); + virtual bool Enable(bool enable = true); // implementation // -------------- -- 2.45.2