applied part of patch 1169925: fix errors with multibyte <-> wx conversions

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

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 0d7301d705ff3f626199c0738f4e0fd6200683d4..9f9b5e83d9c072b1b7369923bf0200dabc60e7c0 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     07.09.00
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -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
@@ -58,7 +58,7 @@ WXDLLEXPORT_DATA(extern const wxChar *) wxCheckBoxNameStr;
 class WXDLLEXPORT wxCheckBoxBase : public wxControl
 {
 public:
-    wxCheckBoxBase();
+    wxCheckBoxBase() { }
 
     // set/get the checked status of the listbox
     virtual void SetValue(bool value) = 0;
@@ -106,6 +106,8 @@ public:
         return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);
     }
 
+    virtual bool HasTransparentBackground() { return true; }
+
 protected:
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
@@ -133,6 +135,8 @@ private:
     #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