A few tweaks and cleanups

[wxWidgets.git] / src / motif / spinbutt.cpp

diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index 6c7c4d442483d7d54cd2f3b2e20d3857d2dc6f66..112d3e0631444d3d55bbbce3bc81e8c342e81416 100644 (file)
--- a/src/motif/spinbutt.cpp
+++ b/src/motif/spinbutt.cpp
@@ -6,36 +6,31 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "spinbutt.h"
+    #pragma implementation "spinbutt.h"
 #endif
 
 #include "wx/spinbutt.h"
+#include "wx/spinctrl.h"
 
-#if !USE_SHARED_LIBRARY
+// put wxSpinCtrl here too because it doesn't have a separate file for it in
+// wxMotif (yet)
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-#endif
-
-wxSpinButton::wxSpinButton()
-{
-       m_min = 0;
-       m_max = 100;
-}
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
 
-bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& WXUNUSED(pos), const wxSize& WXUNUSED(size),
             long style, const wxString& name)
 {
     SetName(name);
 
     m_windowStyle = style;
 
-    SetParent(parent);
+    if (parent) parent->AddChild(this);
 
-    m_min = 0;
-    m_max = 100;
+    InitBase();
 
     m_windowId = (id == -1) ? NewControlId() : id;
 
@@ -52,23 +47,22 @@ wxSpinButton::~wxSpinButton()
 
 int wxSpinButton::GetValue() const
 {
-       // TODO
+    // TODO
     return 0;
 }
 
-void wxSpinButton::SetValue(int val)
+void wxSpinButton::SetValue(int WXUNUSED(val))
 {
-       // TODO
+    // TODO
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
-       m_min = minVal;
-       m_max = maxVal;
-       // TODO
+    // TODO
+    wxSpinButtonBase::SetRange(minVal, maxVal);
 }
 
-void wxSpinButton::ChangeFont(bool keepOriginalSize)
+void wxSpinButton::ChangeFont(bool WXUNUSED(keepOriginalSize))
 {
     // TODO
 }
@@ -82,12 +76,3 @@ void wxSpinButton::ChangeForegroundColour()
 {
     // TODO
 }
-
-// Spin event
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
-
-wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
-  wxScrollEvent(commandType, id)
-{
-}
-