fixing warning and compile error against 10.4

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

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 5c00f53410747a91943a8f70119b93e5f24e0cc4..489f076d8178d8b2ad7a693fdfa324c741024d02 100644 (file)
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -18,6 +18,12 @@
 
 #include "wx/spinbutt.h"        // should make wxSpinEvent visible to the app
 
 
 #include "wx/spinbutt.h"        // should make wxSpinEvent visible to the app
 

+// 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);
+

 // ----------------------------------------------------------------------------
 // A spin ctrl is a text control with a spin button which is usually used to
 // prompt the user for a numeric input.
 // ----------------------------------------------------------------------------
 // A spin ctrl is a text control with a spin button which is usually used to
 // prompt the user for a numeric input.


@@ -49,7 +55,7 @@ public:
     virtual void SetSelection(long from, long to) = 0;
 
 private:
     virtual void SetSelection(long from, long to) = 0;
 
 private:

-    DECLARE_NO_COPY_CLASS(wxSpinCtrlBase)
+    wxDECLARE_NO_COPY_CLASS(wxSpinCtrlBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -89,7 +95,7 @@ private:
 typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
 
 #define wxSpinDoubleEventHandler(func) \
 typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
 
 #define wxSpinDoubleEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSpinDoubleEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxSpinDoubleEventFunction, func)

 
 // macros for handling spinctrl events
 
 
 // macros for handling spinctrl events
 


@@ -126,7 +132,7 @@ typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
     #include "wx/gtk1/spinctrl.h"
 #elif defined(__WXMAC__)
     #define wxHAS_NATIVE_SPINCTRL
     #include "wx/gtk1/spinctrl.h"
 #elif defined(__WXMAC__)
     #define wxHAS_NATIVE_SPINCTRL

-    #include "wx/mac/spinctrl.h"
+    #include "wx/osx/spinctrl.h"

 #endif // platform
 
 #if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE)
 #endif // platform
 
 #if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE)