don't pass NULL pointer to printf(), this crashes Solaris printf

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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 78b8c96225a71a475194010279606947ecb0815d..64e9f1ebae5f7ad6211e4d93c7f14c9cfa345025 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -39,7 +39,8 @@
 class WXDLLEXPORT wxSpinButtonBase : public wxControl
 {
 public:
 class WXDLLEXPORT wxSpinButtonBase : public wxControl
 {
 public:

-    wxSpinButtonBase() { InitBase(); }
+    // ctor initializes the range with the default (0..100) values
+    wxSpinButtonBase() { m_min = 0; m_max = 100; }

 
     // accessors
     virtual int GetValue() const = 0;
 
     // accessors
     virtual int GetValue() const = 0;


@@ -60,13 +61,6 @@ public:
     bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; }
 
 protected:
     bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; }
 
 protected:

-    // init the base part of the control
-    void InitBase()
-    {
-        m_min = 0;
-        m_max = 100;
-    }
-

     // the range value
     int   m_min;
     int   m_max;
     // the range value
     int   m_min;
     int   m_max;


@@ -116,13 +110,16 @@ private:
 
 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, -1, (wxObjectEventFunction) (wxEventFunction) (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, -1, (wxObjectEventFunction) (wxEventFunction) (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, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
+    wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBTRACK, winid, wxSpinEventHandler(func))

 
 #endif // wxUSE_SPINBTN
 
 
 #endif // wxUSE_SPINBTN