From aeafc354935512ddba84502bc60ca3b6246c14ce Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 31 Jan 1999 23:28:58 +0000 Subject: [PATCH] by default the ctrl accepts keyboard input now (why wouldn't it?) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/spinbutt.h | 101 +++++++++++++++++++++----------------- 1 file changed, 55 insertions(+), 46 deletions(-) diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h index 4f7d3f7824..b00a23faf7 100644 --- a/include/wx/msw/spinbutt.h +++ b/include/wx/msw/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, 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, 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(int val) ; - void SetRange(int minVal, 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 - 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); - +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&); -- 2.47.2