Moved all WXDLLEXPORT's to be before the return type in order to make

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

diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h
index 4c1aa7b1c96d7ba5ebc5cb4bb722ccd22038b59f..98d4410feb9512027c9e5c0cd12b8e0347be6b72 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$
 // 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"
 
 #ifdef __GNUG__
 #pragma interface "spinbutt.h"


@@ -31,58 +31,66 @@
     wxSP_WRAP:         value wraps at either end
  */
 
     wxSP_WRAP:         value wraps at either end
  */
 

-class WXDLLEXPORT wxSpinButton: public wxControl
+class WXDLLEXPORT wxSpinButton : public wxControl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxSpinButton)
- public:
-  /*
-   * Public interface
-   */
+DECLARE_DYNAMIC_CLASS(wxSpinButton)

 
 

-  wxSpinButton(void);
+public:
+    /*
+     * Public interface
+     */
+    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);
+    wxSpinButton(wxWindow *parent,
+                 wxWindowID id = -1,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
+                 const wxString& name = "wxSpinButton")
+    {
+        Create(parent, id, pos, size, style, name);
+    }

 
 

-  bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton");
+    virtual ~wxSpinButton();

 
 

+    bool Create(wxWindow *parent,
+                wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
+                const wxString& name = "wxSpinButton");

 
 

-  // Attributes
-  ////////////////////////////////////////////////////////////////////////////

 
 

-  int GetValue(void) const ;
-  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; }
+    // Attributes
+    ////////////////////////////////////////////////////////////////////////////

 
 

-  // Operations
-  ////////////////////////////////////////////////////////////////////////////
+    int GetValue() const ;
+    void SetValue(int val) ;
+    void SetRange(int minVal, int maxVal);
+    int GetMin() const { return m_min; }
+    int GetMax() const { return m_max; }

 
 

-  void Command(wxCommandEvent& event) { ProcessCommand(event); };
+    // Operations
+    ////////////////////////////////////////////////////////////////////////////

 
 

-  // IMPLEMENTATION
-  bool MSWCommand(WXUINT param, WXWORD id);
-  bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
-  void MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control);
-  void MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control);
+    void Command(wxCommandEvent& event) { ProcessCommand(event); };
+
+    // IMPLEMENTATION
+    virtual bool MSWCommand(WXUINT param, WXWORD id);
+    virtual bool MSWOnScroll(int orientation, WXWORD wParam,
+                             WXWORD pos, WXHWND control);

 
 protected:
 
 protected:

-  int   m_min;
-  int   m_max;
+    int   m_min;
+    int   m_max;

 };
 
 class WXDLLEXPORT wxSpinEvent: public wxScrollEvent
 {
 };
 
 class WXDLLEXPORT wxSpinEvent: public wxScrollEvent
 {

-  DECLARE_DYNAMIC_CLASS(wxSpinEvent)
+    DECLARE_DYNAMIC_CLASS(wxSpinEvent)

 
 

- public:
-  wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
+public:
+    wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0);

 };
 
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
 };
 
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);


@@ -102,6 +110,6 @@ typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
   { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },
 
 #endif
   { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },
 
 #endif

-    // __WIN95__
+    // _WX_WIN95__

 #endif
 #endif

-    // __SPINBUTTH__
+    // _WX_SPINBUTT_H_