projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed the bug with the order of 2 size events when the scrollbar[s] (dis)appear in...
[wxWidgets.git]
/
include
/
wx
/
spinctrl.h
diff --git
a/include/wx/spinctrl.h
b/include/wx/spinctrl.h
index db8ddd129f7376d0c0e7691df2b16a9f5a6fb365..453175ebbb8f16219ad68c74de48c8cb3a9d3588 100644
(file)
--- a/
include/wx/spinctrl.h
+++ b/
include/wx/spinctrl.h
@@
-12,8
+12,7
@@
#ifndef _WX_SPINCTRL_H_
#define _WX_SPINCTRL_H_
#ifndef _WX_SPINCTRL_H_
#define _WX_SPINCTRL_H_
-#include "wx/control.h"
-#include "wx/event.h"
+#include "wx/spinbutt.h" // should make wxSpinEvent visible to the app
// ----------------------------------------------------------------------------
// a spin ctrl is a text control with a spin button which is usually used to
// ----------------------------------------------------------------------------
// a spin ctrl is a text control with a spin button which is usually used to
@@
-34,6
+33,7
@@
public:
virtual int GetMax() const { return m_max; }
// operations
virtual int GetMax() const { return m_max; }
// operations
+ virtual void SetValue(const wxString& value) = 0;
virtual void SetValue(int val) = 0;
virtual void SetRange(int minVal, int maxVal) = 0;
virtual void SetValue(int val) = 0;
virtual void SetRange(int minVal, int maxVal) = 0;
@@
-50,15
+50,24
@@
protected:
// include the platform-dependent class implementation
// ----------------------------------------------------------------------------
// include the platform-dependent class implementation
// ----------------------------------------------------------------------------
-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXUNIVERSAL__)
+ #include "wx/generic/spinctlg.h"
+#elif defined(__WXMSW__) && defined(__WIN32__)
#include "wx/msw/spinctrl.h"
#elif defined(__WXPM__)
#include "wx/os2/spinctrl.h"
#elif defined(__WXGTK__)
#include "wx/gtk/spinctrl.h"
#include "wx/msw/spinctrl.h"
#elif defined(__WXPM__)
#include "wx/os2/spinctrl.h"
#elif defined(__WXGTK__)
#include "wx/gtk/spinctrl.h"
+#elif defined(__WXMOTIF__)
+ #include "wx/generic/spinctlg.h"
+#elif defined(__WXMAC__)
+ #include "wx/generic/spinctlg.h"
#else // Win16 || !Win
#else // Win16 || !Win
- #include "wx/generic/spinct
rl
.h"
+ #include "wx/generic/spinct
lg
.h"
#endif // platform
#endif // platform
+#define EVT_SPINCTRL(id, fn) \
+ DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_SPINCTRL_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & fn, (wxObject *) NULL ),
+
#endif // _WX_SPINCTRL_H_
#endif // _WX_SPINCTRL_H_