Do not reintroduce #pragma interface/implementation for html/helpdlg and mediactrl...

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

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index bb97f9d5ca1bef70fa9db3f7a0ebfc82aa807a72..8eea49bcaba0015c4b02b900b0d6c3d3ba135f41 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$
 // Modified by:
 // Created:     07.09.00
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 // ----------------------------------------------------------------------------
 // wxCheckBox: a control which shows a label and a box which may be checked


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

-    virtual bool CanApplyParentThemeBackground() const { return true; }
+    virtual bool HasTransparentBackground() { return true; }

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


@@ -127,14 +127,18 @@ private:
     #include "wx/msw/checkbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/checkbox.h"
     #include "wx/msw/checkbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/checkbox.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/checkbox.h"
     #include "wx/gtk/checkbox.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/checkbox.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/checkbox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/checkbox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/checkbox.h"
 #elif defined(__WXCOCOA__)
     #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