move wxWindowGTK::DoPopupMenu back to window.cpp

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

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index a4f928b20318f5ff715033f95e84663cd7be62d9..8b0348fe374dd609f5376a94dd6a8635f573897b 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -6,7 +6,7 @@
 // Created:     07.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_BASE_
@@ -49,7 +49,7 @@ enum wxCheckBoxState
 };
 
 
-WXDLLEXPORT_DATA(extern const wxChar *) wxCheckBoxNameStr;
+extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxCheckBox: a control which shows a label and a box which may be checked
@@ -106,10 +106,21 @@ public:
         return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);
     }
 
-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
+    virtual bool HasTransparentBackground() { return true; }
+
+    // wxCheckBox-specific processing after processing the update event
+    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event)
+    {
+        wxControl::DoUpdateWindowUI(event);
+
+        if ( event.GetSetChecked() )
+            SetValue(event.GetChecked());
+    }
 
 protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
     virtual wxCheckBoxState DoGet3StateValue() const
@@ -128,14 +139,18 @@ private:
     #include "wx/msw/checkbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/checkbox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #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(__WXPALMOS__)
+    #include "wx/palmos/checkbox.h"
 #endif
 
 #endif // wxUSE_CHECKBOX