projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Complete rewrite of DoDrawBitmap() and DoBlit().
[wxWidgets.git]
/
include
/
wx
/
spinbutt.h
diff --git
a/include/wx/spinbutt.h
b/include/wx/spinbutt.h
index e7b68ca1370833b5a06724b77797623be94c1450..feec6b791c2016ae805e7f0c82015999aa31dc93 100644
(file)
--- a/
include/wx/spinbutt.h
+++ b/
include/wx/spinbutt.h
@@
-36,10
+36,10
@@
// wxSP_WRAP: value wraps at either end
// ----------------------------------------------------------------------------
// wxSP_WRAP: value wraps at either end
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxSpinButtonBase : public wxControl
+class WXDLL
IMPEXP_CORE
wxSpinButtonBase : public wxControl
{
public:
{
public:
- // ctor in
ti
ializes the range with the default (0..100) values
+ // ctor in
it
ializes the range with the default (0..100) values
wxSpinButtonBase() { m_min = 0; m_max = 100; }
// accessors
wxSpinButtonBase() { m_min = 0; m_max = 100; }
// accessors
@@
-74,14
+74,16
@@
protected:
#if defined(__WXUNIVERSAL__)
#include "wx/univ/spinbutt.h"
#if defined(__WXUNIVERSAL__)
#include "wx/univ/spinbutt.h"
-#elif defined(__WXMSW__)
&& defined(__WIN95__)
+#elif defined(__WXMSW__)
#include "wx/msw/spinbutt.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/spinbutt.h"
#include "wx/msw/spinbutt.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/spinbutt.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK
20
__)
#include "wx/gtk/spinbutt.h"
#include "wx/gtk/spinbutt.h"
+#elif defined(__WXGTK__)
+ #include "wx/gtk1/spinbutt.h"
#elif defined(__WXMAC__)
#elif defined(__WXMAC__)
- #include "wx/
mac
/spinbutt.h"
+ #include "wx/
osx
/spinbutt.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/spinbutt.h"
#elif defined(__WXPM__)
#elif defined(__WXCOCOA__)
#include "wx/cocoa/spinbutt.h"
#elif defined(__WXPM__)
@@
-92,7
+94,7
@@
protected:
// the wxSpinButton event
// ----------------------------------------------------------------------------
// the wxSpinButton event
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxSpinEvent : public wxNotifyEvent
+class WXDLL
IMPEXP_CORE
wxSpinEvent : public wxNotifyEvent
{
public:
wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
{
public:
wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
@@
-100,23
+102,33
@@
public:
{
}
{
}
+ wxSpinEvent(const wxSpinEvent& event) : wxNotifyEvent(event) {}
+
// get the current value of the control
// get the current value of the control
+ int GetValue() const { return m_commandInt; }
+ void SetValue(int value) { m_commandInt = value; }
+
int GetPosition() const { return m_commandInt; }
void SetPosition(int pos) { m_commandInt = pos; }
int GetPosition() const { return m_commandInt; }
void SetPosition(int pos) { m_commandInt = pos; }
+ virtual wxEvent *Clone() const { return new wxSpinEvent(*this); }
+
private:
private:
- DECLARE_DYNAMIC_CLASS_NO_
COPY
(wxSpinEvent)
+ DECLARE_DYNAMIC_CLASS_NO_
ASSIGN
(wxSpinEvent)
};
typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
};
typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
+#define wxSpinEventHandler(func) \
+ (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSpinEventFunction, &func)
+
// macros for handling spin events
#define EVT_SPIN_UP(winid, func) \
// macros for handling spin events
#define EVT_SPIN_UP(winid, func) \
- DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, winid, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxSpinEventFunction, & func ), NULL ),
+ wx__DECLARE_EVT1(wxEVT_SCROLL_LINEUP, winid, wxSpinEventHandler(func))
#define EVT_SPIN_DOWN(winid, func) \
#define EVT_SPIN_DOWN(winid, func) \
- DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, winid, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxSpinEventFunction, & func ), NULL ),
+ wx__DECLARE_EVT1(wxEVT_SCROLL_LINEDOWN, winid, wxSpinEventHandler(func))
#define EVT_SPIN(winid, func) \
#define EVT_SPIN(winid, func) \
- DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, winid, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxSpinEventFunction, & func ), NULL ),
+ wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBTRACK, winid, wxSpinEventHandler(func))
#endif // wxUSE_SPINBTN
#endif // wxUSE_SPINBTN