projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a better compilation fix
[wxWidgets.git]
/
include
/
wx
/
checkbox.h
diff --git
a/include/wx/checkbox.h
b/include/wx/checkbox.h
index 7ed44aaefc093ceb42ad8b52c68283646bfc1bcb..0fa2516ca319152340b5ab1a2b63a904ca6f98a4 100644
(file)
--- a/
include/wx/checkbox.h
+++ b/
include/wx/checkbox.h
@@
-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
@@
-108,6
+108,15
@@
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:
virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
protected:
virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
@@
-127,14
+136,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(__WXGTK
20
__)
#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