fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 47a4e356d503f5da57a9c7d4d7bed5ed7cefe0a4..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
@@ -99,19 +99,16 @@ public:
         DoSet3StateValue(state);
     }
 
-    bool Is3State() const
-    {
-        return (m_style & wxCHK_3STATE) != 0;
-    }
+    bool Is3State() const { return HasFlag(wxCHK_3STATE); }
 
     bool Is3rdStateAllowedForUser() const
     {
-        return (m_style & wxCHK_ALLOW_3RD_STATE_FOR_USER) != 0;
+        return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);
     }
 
-protected:
-    int m_style;
+    virtual bool HasTransparentBackground() { return true; }
 
+protected:
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
     virtual wxCheckBoxState DoGet3StateValue() const
@@ -138,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