fixes for Unicode build with CodeWarrior under OS X 10.2 (patch 1373217)

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

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index dc333f37e8dc44df95ee5a710fbc161ad1bf7ec2..9f9b5e83d9c072b1b7369923bf0200dabc60e7c0 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -49,7 +49,7 @@ enum wxCheckBoxState
 };
 
 
 };
 
 

-WXDLLEXPORT_DATA(extern const wxChar *) wxCheckBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar *) wxCheckBoxNameStr;

 
 // ----------------------------------------------------------------------------
 // wxCheckBox: a control which shows a label and a box which may be checked
 
 // ----------------------------------------------------------------------------
 // wxCheckBox: a control which shows a label and a box which may be checked


@@ -106,8 +106,7 @@ public:
         return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);
     }
 
         return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);
     }
 

-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
+    virtual bool HasTransparentBackground() { return true; }

 
 protected:
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
 protected:
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }


@@ -136,6 +135,8 @@ private:
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/checkbox.h"
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/checkbox.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/checkbox.h"

 #endif
 
 #endif // wxUSE_CHECKBOX
 #endif
 
 #endif // wxUSE_CHECKBOX