X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/646930985a7a9bd840086a0011026b2bac188c29..9869734d0431a29732006119f2d4ed35af70ca9b:/include/wx/msw/spinbutt.h?ds=inline diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h index 07b18e2b1c..b00a23faf7 100644 --- 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" @@ -31,58 +31,67 @@ wxSP_WRAP: value wraps at either end */ -class WXDLLEXPORT wxSpinButton: public wxControl +class WXDLLEXPORT wxSpinButton : public wxControl { - DECLARE_DYNAMIC_CLASS(wxSpinButton) - public: - /* - * Public interface - */ - - 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") - { - 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"); - - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - int GetValue(void) const ; - void SetValue(const int val) ; - void SetRange(const int minVal, const int maxVal) ; - inline int GetMin(void) const { return m_min; } - inline int GetMax(void) const { return m_max; } - - // Operations - //////////////////////////////////////////////////////////////////////////// - - 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); - +DECLARE_DYNAMIC_CLASS(wxSpinButton) + +public: + /* + * Public interface + */ + wxSpinButton(); + + 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); + } + + 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() const ; + void SetValue(int val) ; + void SetRange(int minVal, int maxVal); + int GetMin() const { return m_min; } + int GetMax() const { return m_max; } + + // Operations + //////////////////////////////////////////////////////////////////////////// + + void Command(wxCommandEvent& event) { ProcessCommand(event); }; + + // IMPLEMENTATION + 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; - int m_max; + int m_min; + int m_max; }; class WXDLLEXPORT wxSpinEvent: public wxScrollEvent { - DECLARE_DYNAMIC_CLASS(wxSpinEvent) - - public: - wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0); + DECLARE_DYNAMIC_CLASS(wxSpinEvent) + +public: + wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0); }; typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&); @@ -102,6 +111,6 @@ typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&); { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func }, #endif - // __WIN95__ + // _WX_WIN95__ #endif - // __SPINBUTTH__ + // _WX_SPINBUTT_H_