diff --git a/include/wx/anybutton.h b/include/wx/anybutton.h
index ff41ce999c..828ce7d690 100644
--- a/include/wx/anybutton.h
+++ b/include/wx/anybutton.h
@@ -25,7 +25,7 @@
 #define wxBU_BOTTOM          0x0200
 #define wxBU_ALIGN_MASK      ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM )
 
-// These two flags are obsolete
+// These two flags are obsolete and have no effect any longer.
 #define wxBU_NOAUTODRAW      0x0000
 #define wxBU_AUTODRAW        0x0004
 
diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index c521d454bc..a1b0e53a6e 100644
--- a/include/wx/cshelp.h
+++ b/include/wx/cshelp.h
@@ -73,7 +73,7 @@ public:
                         wxWindowID id = wxID_CONTEXT_HELP,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
-                        long style = wxBU_AUTODRAW)
+                        long style = 0)
     {
         Create(parent, id, pos, size, style);
     }
@@ -83,7 +83,7 @@ public:
                 wxWindowID id = wxID_CONTEXT_HELP,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxBU_AUTODRAW);
+                long style = 0);
 
 
     void OnContextHelp(wxCommandEvent& event);
diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index 8c08f3d575..d1674e5813 100644
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -24,7 +24,7 @@ public:
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
-                   long style = wxBU_AUTODRAW,
+                   long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {
@@ -38,7 +38,7 @@ public:
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxBU_AUTODRAW,
+                long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h
index 9fc399a7fb..3ef6ea7865 100644
--- a/include/wx/motif/bmpbuttn.h
+++ b/include/wx/motif/bmpbuttn.h
@@ -22,7 +22,7 @@ public:
     virtual ~wxBitmapButton();
     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
         const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+        const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxButtonNameStr)
     {
@@ -31,7 +31,7 @@ public:
 
     bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
         const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+        const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxButtonNameStr);
 
diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 066c0f4f4f..ce4e20fed2 100644
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -25,7 +25,7 @@ public:
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
-                   long style = wxBU_AUTODRAW,
+                   long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
     {
@@ -37,7 +37,7 @@ public:
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxBU_AUTODRAW,
+                long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index 2a269d356c..33253d5613 100644
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -24,7 +24,7 @@ public:
 
     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+                   const wxSize& size = wxDefaultSize, long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr)
         {
@@ -33,7 +33,7 @@ public:
 
     bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+                const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
diff --git a/interface/wx/anybutton.h b/interface/wx/anybutton.h
index f4e2c2446a..5887f8ffd6 100644
--- a/interface/wx/anybutton.h
+++ b/interface/wx/anybutton.h
@@ -13,7 +13,7 @@
 
 #define wxBU_EXACTFIT        0x0001
 #define wxBU_NOTEXT          0x0002
-#define wxBU_AUTODRAW        0x0004
+#define wxBU_AUTODRAW        0x0004 ///< Obsolete, has no effect.
 
 
 /**
diff --git a/interface/wx/bmpbuttn.h b/interface/wx/bmpbuttn.h
index f8e8c3fed5..9c04bc2993 100644
--- a/interface/wx/bmpbuttn.h
+++ b/interface/wx/bmpbuttn.h
@@ -83,7 +83,7 @@ public:
                    const wxBitmap& bitmap,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
-                   long style = wxBU_AUTODRAW,
+                   long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxButtonNameStr);
 
@@ -95,7 +95,7 @@ public:
                 const wxBitmap& bitmap,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxBU_AUTODRAW,
+                long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
diff --git a/interface/wx/cshelp.h b/interface/wx/cshelp.h
index 123a7bbc05..e7f80d4c6b 100644
--- a/interface/wx/cshelp.h
+++ b/interface/wx/cshelp.h
@@ -271,7 +271,7 @@ public:
                         wxWindowID id = wxID_CONTEXT_HELP,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
-                        long style = wxBU_AUTODRAW);
+                        long style = 0);
 };
 
 
diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp
index c67ddd4d16..38848cd30b 100644
--- a/src/generic/buttonbar.cpp
+++ b/src/generic/buttonbar.cpp
@@ -389,7 +389,7 @@ void wxButtonToolBar::DoLayout()
             if (!tool->GetButton())
             {
                 wxBitmapButton* bmpButton = new wxBitmapButton(this, tool->GetId(), tool->GetNormalBitmap(), wxPoint(tool->m_x, tool->m_y), wxDefaultSize,
-                                                               wxBU_AUTODRAW|wxBORDER_NONE);
+                                                               wxBORDER_NONE);
                 if (!tool->GetShortHelp().empty())
                     bmpButton->SetLabel(tool->GetShortHelp());
 
diff --git a/src/generic/clrpickerg.cpp b/src/generic/clrpickerg.cpp
index 5bb576a3c2..58cd06ab8a 100644
--- a/src/generic/clrpickerg.cpp
+++ b/src/generic/clrpickerg.cpp
@@ -50,7 +50,7 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
 
     // create this button
     if (!wxBitmapButton::Create( parent, id, m_bitmap, pos,
-                           size, style | wxBU_AUTODRAW, validator, name ))
+                           size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxGenericColourButton creation failed") );
         return false;
diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index c82857977c..53af4880e7 100644
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -44,7 +44,7 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
                    GetID(),
                    GetBitmap(wxT("bitmap"), wxART_BUTTON),
                    GetPosition(), GetSize(),
-                   GetStyle(wxT("style"), wxBU_AUTODRAW),
+                   GetStyle(wxT("style")),
                    wxDefaultValidator,
                    GetName());
     if (GetBool(wxT("default"), 0))
diff --git a/utils/screenshotgen/src/guiframe.cpp b/utils/screenshotgen/src/guiframe.cpp
index 050902b0c9..216760bebd 100644
--- a/utils/screenshotgen/src/guiframe.cpp
+++ b/utils/screenshotgen/src/guiframe.cpp
@@ -148,7 +148,7 @@ void GUIFrame::AddPanel_1()
     m_radioBtn2->SetToolTip( _("wxRadioButton") );
     fgSizer1->Add( m_radioBtn2, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 );
 
-    m_bpButton1 = new wxBitmapButton( m_panel1, wxID_ANY, wxBitmap( wxT("bitmaps/wxwin32x32.png"), wxBITMAP_TYPE_ANY ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+    m_bpButton1 = new wxBitmapButton( m_panel1, wxID_ANY, wxBitmap( wxT("bitmaps/wxwin32x32.png"), wxBITMAP_TYPE_ANY ), wxDefaultPosition, wxDefaultSize, 0 );
     m_bpButton1->SetToolTip( _("wxBitmapButton") );
     m_bpButton1->SetToolTip( _("wxBitmapButton") );
     fgSizer1->Add( m_bpButton1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 );