use correct scale when drawing

[wxWidgets.git] / include / wx / spinctrl.h

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index cf93212a66156168514e3c34be252f872e5cff86..d63d13ce62748a583674d2571e4d05646a8ab1e6 100644 (file)
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -21,8 +21,8 @@
 // Events
 class WXDLLIMPEXP_FWD_CORE wxSpinDoubleEvent;
 
 // Events
 class WXDLLIMPEXP_FWD_CORE wxSpinDoubleEvent;
 

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, wxSpinDoubleEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SPINCTRL, wxSpinEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SPINCTRLDOUBLE, wxSpinDoubleEvent);

 
 // ----------------------------------------------------------------------------
 // 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


@@ -104,10 +104,10 @@ typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
 // macros for handling spinctrl events
 
 #define EVT_SPINCTRL(id, fn) \
 // macros for handling spinctrl events
 
 #define EVT_SPINCTRL(id, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRL_UPDATED, id, wxSpinEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_SPINCTRL, id, wxSpinEventHandler(fn))

 
 #define EVT_SPINCTRLDOUBLE(id, fn) \
 
 #define EVT_SPINCTRLDOUBLE(id, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, id, wxSpinDoubleEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_SPINCTRLDOUBLE, id, wxSpinDoubleEventHandler(fn))

 
 // ----------------------------------------------------------------------------
 // include the platform-dependent class implementation
 
 // ----------------------------------------------------------------------------
 // include the platform-dependent class implementation


@@ -147,6 +147,10 @@ extern wxString wxSpinCtrlFormatAsHex(long val, long maxVal);
 
 } // namespace wxPrivate
 
 
 } // namespace wxPrivate
 

+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_SPINCTRL_UPDATED         wxEVT_SPINCTRL
+#define wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED   wxEVT_SPINCTRLDOUBLE
+

 #endif // wxUSE_SPINCTRL
 
 #endif // _WX_SPINCTRL_H_
 #endif // wxUSE_SPINCTRL
 
 #endif // _WX_SPINCTRL_H_