streamlining slider, scroller, spinbutton for osx carbon and cocoa

[wxWidgets.git] / include / wx / generic / spinctlg.h

diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h
index c5078faa756c9e090b2f488847d05d9de75d7ff1..d01f8ba5bc32b2eaf3c5dda19a1b103aed852321 100644 (file)
--- a/include/wx/generic/spinctlg.h
+++ b/include/wx/generic/spinctlg.h
@@ -40,7 +40,7 @@ class wxSpinCtrlTextGeneric; // wxTextCtrl used for the wxSpinCtrlGenericBase
 // function ambiguity.
 // ----------------------------------------------------------------------------
 
 // function ambiguity.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSpinCtrlGenericBase : public wxSpinCtrlBase
+class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxSpinCtrlBase

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


@@ -80,7 +80,7 @@ public:
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);

-    virtual bool Reparent(wxWindow *newParent);
+    virtual bool Reparent(wxWindowBase *newParent);

 
     // get the subcontrols
     wxTextCtrl   *GetText() const       { return m_textCtrl; }
 
     // get the subcontrols
     wxTextCtrl   *GetText() const       { return m_textCtrl; }


@@ -140,7 +140,7 @@ private:
 
 #include "wx/textctrl.h"
 
 
 #include "wx/textctrl.h"
 

-class WXDLLEXPORT wxSpinCtrlGenericBase : public wxTextCtrl
+class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxTextCtrl

 {
 public:
     wxSpinCtrlGenericBase() : m_value(0), m_min(0), m_max(100),
 {
 public:
     wxSpinCtrlGenericBase() : m_value(0), m_min(0), m_max(100),


@@ -247,10 +247,10 @@ public:
     }
 
     // accessors
     }
 
     // accessors

-    int GetValue(wxSPINCTRL_GETVALUE_FIX) const { return int(DoGetValue() + 0.5); }
-    int GetMin() const       { return int(m_min + 0.5); }
-    int GetMax() const       { return int(m_max + 0.5); }
-    int GetIncrement() const { return int(m_increment + 0.5); }
+    int GetValue(wxSPINCTRL_GETVALUE_FIX) const { return wxRound( DoGetValue() ); }
+    int GetMin() const       { return wxRound( m_min ); }
+    int GetMax() const       { return wxRound( m_max ); }
+    int GetIncrement() const { return wxRound( m_increment ); }

 
     // operations
     void SetValue(const wxString& value)    { wxSpinCtrlGenericBase::SetValue(value); } // visibility problem w/ gcc
 
     // operations
     void SetValue(const wxString& value)    { wxSpinCtrlGenericBase::SetValue(value); } // visibility problem w/ gcc