X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/997176a34641a870b1f6c6102e30f64f86b4122a..5687a67ce1e365d010c6282aa57b4f99f7f5ea29:/include/wx/button.h

diff --git a/include/wx/button.h b/include/wx/button.h
index 443402f23a..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
@@ -48,6 +56,8 @@ 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& WXUNUSED(bitmap)) { }
 
@@ -58,8 +68,16 @@ 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)
 };
 
 #if defined(__WXUNIVERSAL__)