X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..7e548f6b13a27eee6f2740d922cab636f0b305e0:/include/wx/button.h

diff --git a/include/wx/button.h b/include/wx/button.h
index d4032a3b6c..a419b7df39 100644
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -14,15 +14,11 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_BUTTON
-
 // ----------------------------------------------------------------------------
-// wxButton flags
+// wxButton flags shared with other classes
 // ----------------------------------------------------------------------------
 
-// These two flags are obsolete
-#define wxBU_NOAUTODRAW      0x0000
-#define wxBU_AUTODRAW        0x0004
+#if wxUSE_TOGGLEBTN || wxUSE_BUTTON
 
 // These flags affect label alignment
 #define wxBU_LEFT            0x0040
@@ -30,6 +26,18 @@
 #define wxBU_RIGHT           0x0100
 #define wxBU_BOTTOM          0x0200
 
+#endif
+
+#if wxUSE_BUTTON
+
+// ----------------------------------------------------------------------------
+// wxButton specific flags
+// ----------------------------------------------------------------------------
+
+// These two flags are obsolete
+#define wxBU_NOAUTODRAW      0x0000
+#define wxBU_AUTODRAW        0x0004
+
 // by default, the buttons will be created with some (system dependent)
 // minimal size to make them look nicer, giving this style will make them as
 // small as possible
@@ -60,9 +68,15 @@ public:
     // 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();
 
+protected:
     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };