don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 9f9b5e83d9c072b1b7369923bf0200dabc60e7c0..60a8189f24a2a272366f5d5b209bd9b9c2a2af80 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -49,13 +49,13 @@ enum wxCheckBoxState
 };
 
 
 };
 
 

-extern WXDLLEXPORT_DATA(const wxChar *) wxCheckBoxNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) 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
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCheckBoxBase : public wxControl
+class WXDLLIMPEXP_CORE wxCheckBoxBase : public wxControl

 {
 public:
     wxCheckBoxBase() { }
 {
 public:
     wxCheckBoxBase() { }


@@ -108,7 +108,19 @@ public:
 
     virtual bool HasTransparentBackground() { return true; }
 
 
     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:
 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
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
     virtual wxCheckBoxState DoGet3StateValue() const


@@ -118,7 +130,7 @@ protected:
     }
 
 private:
     }
 
 private:

-    DECLARE_NO_COPY_CLASS(wxCheckBoxBase)
+    wxDECLARE_NO_COPY_CLASS(wxCheckBoxBase);

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -127,10 +139,12 @@ 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__)
 #elif defined(__WXMAC__)

-    #include "wx/mac/checkbox.h"
+    #include "wx/osx/checkbox.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)