wxEncodingConverter should and can be compiled

[wxWidgets.git] / include / wx / button.h

diff --git a/include/wx/button.h b/include/wx/button.h
index d4032a3b6c3e0f85fa0ccccbce61eaabeffe02e0..66c31c5a479350bcae7e01d8c7615e2e1f08b1c8 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -14,21 +14,29 @@
 
 #include "wx/defs.h"
 
 
 #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
 #define wxBU_TOP             0x0080
 #define wxBU_RIGHT           0x0100
 #define wxBU_BOTTOM          0x0200
 
 // These flags affect label alignment
 #define wxBU_LEFT            0x0040
 #define wxBU_TOP             0x0080
 #define wxBU_RIGHT           0x0100
 #define wxBU_BOTTOM          0x0200

+#define wxBU_ALIGN_MASK      ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM )
+#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
 
 // 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


@@ -60,9 +68,15 @@ public:
     // on its panel
     virtual void SetDefault() { }
 
     // 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();
 
     // returns the default button size for this platform
     static wxSize GetDefaultSize();
 

+protected:

     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };