X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ef8bfc4c75374ffd4de538cdeaa0f81b69bf61f..95561ddfc3c0c84c71316d40cb539135fa68b440:/include/wx/button.h

diff --git a/include/wx/button.h b/include/wx/button.h
index 3018394065..1e7f14a0f7 100644
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -12,15 +12,19 @@
 #ifndef _WX_BUTTON_H_BASE_
 #define _WX_BUTTON_H_BASE_
 
+#include "wx/defs.h"
+
 #if wxUSE_BUTTON
 
 // ----------------------------------------------------------------------------
 // wxButton flags
 // ----------------------------------------------------------------------------
 
-// all these flags are obsolete
+// These two flags are obsolete
 #define wxBU_NOAUTODRAW      0x0000
 #define wxBU_AUTODRAW        0x0004
+
+// These flags affect label alignment
 #define wxBU_LEFT            0x0040
 #define wxBU_TOP             0x0080
 #define wxBU_RIGHT           0x0100
@@ -44,18 +48,27 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
 class WXDLLEXPORT wxButtonBase : public wxControl
 {
 public:
+    wxButtonBase() { }
+
     // show the image in the button in addition to the label
-    virtual void SetImageLabel(const wxBitmap& bitmap) { }
+    virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { }
 
     // set the margins around the image
-    virtual void SetImageMargins(wxCoord x, wxCoord y) { }
+    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() { }
 
+    // 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
+    // in wxButtonBase to make it consistent.
+    virtual bool ShouldInheritColours() const { return false; }
+
     // returns the default button size for this platform
     static wxSize GetDefaultSize();
+
+    DECLARE_NO_COPY_CLASS(wxButtonBase)
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -66,14 +79,12 @@ public:
     #include "wx/motif/button.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/button.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/button.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/button.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/button.h"
 #elif defined(__WXPM__)
     #include "wx/os2/button.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/button.h"
 #endif
 
 #endif // wxUSE_BUTTON