projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added assert to verify that operands are initialized in compatibility_iterator::opera...
[wxWidgets.git]
/
include
/
wx
/
control.h
diff --git
a/include/wx/control.h
b/include/wx/control.h
index b6136bd44950d80aac5c12d601cf5f37a5025140..1432d67e5cf14169993ddac808546f18b19bac71 100644
(file)
--- a/
include/wx/control.h
+++ b/
include/wx/control.h
@@
-16,17
+16,13
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "controlbase.h"
-#endif
-
#include "wx/defs.h"
#if wxUSE_CONTROLS
#include "wx/window.h" // base class
#include "wx/defs.h"
#if wxUSE_CONTROLS
#include "wx/window.h" // base class
-
WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr
;
+
extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[]
;
// ----------------------------------------------------------------------------
// wxControl is the base class for all controls
// ----------------------------------------------------------------------------
// wxControl is the base class for all controls
@@
-66,6
+62,9
@@
public:
virtual void SetLabel( const wxString &label );
virtual bool SetFont(const wxFont& font);
virtual void SetLabel( const wxString &label );
virtual bool SetFont(const wxFont& font);
+ // wxControl-specific processing after processing the update event
+ virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
+
protected:
// creates the control (calls wxWindowBase::CreateBase inside) and adds it
// to the list of parents children
protected:
// creates the control (calls wxWindowBase::CreateBase inside) and adds it
// to the list of parents children
@@
-100,12
+99,16
@@
protected:
#if defined(__WXUNIVERSAL__)
#include "wx/univ/control.h"
#if defined(__WXUNIVERSAL__)
#include "wx/univ/control.h"
+#elif defined(__WXPALMOS__)
+ #include "wx/palmos/control.h"
#elif defined(__WXMSW__)
#include "wx/msw/control.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/control.h"
#elif defined(__WXMSW__)
#include "wx/msw/control.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/control.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK
20
__)
#include "wx/gtk/control.h"
#include "wx/gtk/control.h"
+#elif defined(__WXGTK__)
+ #include "wx/gtk1/control.h"
#elif defined(__WXMAC__)
#include "wx/mac/control.h"
#elif defined(__WXCOCOA__)
#elif defined(__WXMAC__)
#include "wx/mac/control.h"
#elif defined(__WXCOCOA__)