X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16cba29d3a5a0a95b367382311a4a7a9a9833210..20bdddadd5659e9fd150477384a4852ee24f37ff:/include/wx/checkbox.h?ds=sidebyside

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 93e59fa1a3..8b0348fe37 100644
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -49,7 +49,7 @@ enum wxCheckBoxState
 };
 
 
-extern WXDLLEXPORT_DATA(const wxChar *) wxCheckBoxNameStr;
+extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxCheckBox: a control which shows a label and a box which may be checked
@@ -108,7 +108,19 @@ public:
 
     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
@@ -127,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