added missing header to fix !USE_PCH compilation

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

diff --git a/include/wx/button.h b/include/wx/button.h
index 3eee1463c23541a951621fd11769299821d3d620..a419b7df3936d894380bcabe777fcdb63482729f 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -12,15 +12,13 @@
 #ifndef _WX_BUTTON_H_BASE_
 #define _WX_BUTTON_H_BASE_
 
 #ifndef _WX_BUTTON_H_BASE_
 #define _WX_BUTTON_H_BASE_
 

-#if wxUSE_BUTTON
+#include "wx/defs.h"

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// 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
 
 // These flags affect label alignment
 #define wxBU_LEFT            0x0040


@@ -28,6 +26,18 @@
 #define wxBU_RIGHT           0x0100
 #define wxBU_BOTTOM          0x0200
 
 #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
 // 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


@@ -46,6 +56,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
 class WXDLLEXPORT wxButtonBase : public wxControl
 {
 public:
 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)) { }
 
     // show the image in the button in addition to the label
     virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { }
 


@@ -56,8 +68,16 @@ 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)

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -70,6 +90,8 @@ public:
     #include "wx/gtk/button.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/button.h"
     #include "wx/gtk/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"
 #endif
 #elif defined(__WXPM__)
     #include "wx/os2/button.h"
 #endif