X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..520e470fdd0daef09c77938db642e4583933c90d:/src/msw/spinbutt.cpp diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index 931add7bc9..56d537619e 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -43,12 +43,12 @@ wxSpinButton::wxSpinButton(void) m_max = 100; } -bool wxSpinButton::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, - const long style, const wxString& name) +bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, + long style, const wxString& name) { wxSystemSettings settings; - m_backgroundColour = parent->GetDefaultBackgroundColour() ; - m_foregroundColour = parent->GetDefaultForegroundColour() ; + m_backgroundColour = parent->GetBackgroundColour() ; + m_foregroundColour = parent->GetForegroundColour() ; SetName(name); @@ -117,23 +117,23 @@ int wxSpinButton::GetValue(void) const return (int) ::SendMessage((HWND) GetHWND(), UDM_GETPOS, 0, 0); } -void wxSpinButton::SetValue(const int val) +void wxSpinButton::SetValue(int val) { ::SendMessage((HWND) GetHWND(), UDM_SETPOS, 0, (LPARAM) MAKELONG((short) val, 0)); } -void wxSpinButton::SetRange(const int minVal, const int maxVal) +void wxSpinButton::SetRange(int minVal, int maxVal) { m_min = minVal; m_max = maxVal; ::SendMessage((HWND) GetHWND(), UDM_SETRANGE, 0, (LPARAM) MAKELONG((short) minVal, (short) maxVal)); } -void wxSpinButton::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control) +void wxSpinButton::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control) { if (control) { - wxSpinEvent event(0, m_windowId); + wxSpinEvent event(wxEVT_NULL, m_windowId); event.SetPosition(pos); event.SetOrientation(wxVERTICAL); event.SetEventObject( this ); @@ -178,11 +178,11 @@ void wxSpinButton::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXH } } -void wxSpinButton::MSWOnHScroll( const WXWORD wParam, const WXWORD pos, const WXHWND control) +void wxSpinButton::MSWOnHScroll( WXWORD wParam, WXWORD pos, WXHWND control) { if (control) { - wxSpinEvent event(0, m_windowId); + wxSpinEvent event(wxEVT_NULL, m_windowId); event.SetPosition(pos); event.SetOrientation(wxHORIZONTAL); event.SetEventObject( this ); @@ -227,13 +227,13 @@ void wxSpinButton::MSWOnHScroll( const WXWORD wParam, const WXWORD pos, const WX } } -bool wxSpinButton::MSWCommand(const WXUINT cmd, const WXWORD id) +bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id) { // No command messages return FALSE; } -bool wxSpinButton::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam) +bool wxSpinButton::MSWNotify(WXWPARAM wParam, WXLPARAM lParam) { NMHDR* hdr1 = (NMHDR*) lParam; switch ( hdr1->code ) @@ -261,7 +261,7 @@ bool wxSpinButton::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam) // Spin event IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent) -wxSpinEvent::wxSpinEvent(WXTYPE commandType, int id): +wxSpinEvent::wxSpinEvent(wxEventType commandType, int id): wxScrollEvent(commandType, id) { }