projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce ambiguity of selection functions in wxPropertyGridManager, make them better...
[wxWidgets.git]
/
include
/
wx
/
checkbox.h
diff --git
a/include/wx/checkbox.h
b/include/wx/checkbox.h
index 9f9b5e83d9c072b1b7369923bf0200dabc60e7c0..e471358b21d0c8f8a7db90695bf6c7cb8c63fee3 100644
(file)
--- a/
include/wx/checkbox.h
+++ b/
include/wx/checkbox.h
@@
-49,13
+49,13
@@
enum wxCheckBoxState
};
};
-extern WXDLL
EXPORT_DATA(const wxChar *) wxCheckBoxNameStr
;
+extern WXDLL
IMPEXP_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 WXDLL
EXPORT
wxCheckBoxBase : public wxControl
+class WXDLL
IMPEXP_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
@@
-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(__WXGTK
20
__)
#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__)