Corrections to Forty Thieves; wxMemoryDC problem temporarily sorted

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

diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h
index 3b76035ae8a9d371d51277e72660c0c6de68986c..4f7d3f7824d1ff3f38249ad58ee6fa868c02a41e 100644 (file)
--- a/include/wx/msw/spinbutt.h
+++ b/include/wx/msw/spinbutt.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __SPINBUTTH__
-#define __SPINBUTTH__
+#ifndef _WX_SPINBUTT_H_
+#define _WX_SPINBUTT_H_
 
 #ifdef __GNUG__
 #pragma interface "spinbutt.h"
@@ -41,23 +41,23 @@ class WXDLLEXPORT wxSpinButton: public wxControl
 
   wxSpinButton(void);
 
-  inline wxSpinButton(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            const long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton")
+  inline wxSpinButton(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+            long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton")
   {
     Create(parent, id, pos, size, style, name);
   }
   ~wxSpinButton(void);
 
-  bool Create(wxWindow *parent, const wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            const long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton");
+  bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+            long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton");
 
 
   // Attributes
   ////////////////////////////////////////////////////////////////////////////
 
   int GetValue(void) const ;
-  void SetValue(const int val) ;
-  void SetRange(const int minVal, const int maxVal) ;
+  void SetValue(int val) ;
+  void SetRange(int minVal, int maxVal) ;
   inline int GetMin(void) const { return m_min; }
   inline int GetMax(void) const { return m_max; }
 
@@ -67,10 +67,10 @@ class WXDLLEXPORT wxSpinButton: public wxControl
   void Command(wxCommandEvent& event) { ProcessCommand(event); };
 
   // IMPLEMENTATION
-  bool MSWCommand(const WXUINT param, const WXWORD id);
-  bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
-  void MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
-  void MSWOnHScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control);
+  virtual bool MSWCommand(WXUINT param, WXWORD id);
+  virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
+  virtual void MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control);
+  virtual void MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control);
 
 protected:
   int   m_min;
@@ -82,7 +82,7 @@ class WXDLLEXPORT wxSpinEvent: public wxScrollEvent
   DECLARE_DYNAMIC_CLASS(wxSpinEvent)
 
  public:
-  wxSpinEvent(WXTYPE commandType = 0, int id = 0);
+  wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 };
 
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
@@ -102,6 +102,6 @@ typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
   { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },
 
 #endif
-    // __WIN95__
+    // _WX_WIN95__
 #endif
-    // __SPINBUTTH__
+    // _WX_SPINBUTT_H_