guarding agains NULL

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

diff --git a/include/wx/osx/spinctrl.h b/include/wx/osx/spinctrl.h
index f95b0c10f2aa4db17e1294034cc10f64166a6d71..f8a7ab2057afef431c69d876616aab16339f90a1 100644 (file)
--- a/include/wx/osx/spinctrl.h
+++ b/include/wx/osx/spinctrl.h
@@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxSpinCtrlButton;
 // wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton
 // ----------------------------------------------------------------------------
 
 // wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxNavigationEnabled<wxControl>

 {
 public:
     wxSpinCtrl() { Init(); }
 {
 public:
     wxSpinCtrl() { Init(); }


@@ -93,8 +93,6 @@ public:
     // number is out of range
     bool GetTextValue(int *val) const;
 
     // number is out of range
     bool GetTextValue(int *val) const;
 

-    WX_DECLARE_CONTROL_CONTAINER();
-

 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;
 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;


@@ -113,7 +111,6 @@ private:
 
     int            m_oldValue;
 private:
 
     int            m_oldValue;
 private:

-    DECLARE_EVENT_TABLE()

     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };