X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a1f999fafa4312ccd47b7be65c672c2220fea36..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/msw/spinbutt.cpp diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index 297e172694..73395991b8 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/spinbutt.cpp +// Name: src/msw/spinbutt.cpp // Purpose: wxSpinButton // Author: Julian Smart // Modified by: @@ -17,11 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "spinbutt.h" - #pragma implementation "spinbutbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,7 +25,7 @@ #endif #ifndef WX_PRECOMP -#include "wx/app.h" + #include "wx/app.h" #endif #if wxUSE_SPINBTN @@ -42,6 +37,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) #include "wx/msw/private.h" #include "wx/msw/wrapcctl.h" +#ifndef UDM_SETRANGE32 + #define UDM_SETRANGE32 (WM_USER+111) +#endif + +#ifndef UDM_SETPOS32 + #define UDM_SETPOS32 (WM_USER+113) + #define UDM_GETPOS32 (WM_USER+114) +#endif + // ============================================================================ // implementation // ============================================================================ @@ -217,7 +221,7 @@ int wxSpinButton::GetValue() const { int n; #ifdef UDM_GETPOS32 - if ( wxTheApp->GetComCtl32Version() >= 580 ) + if ( wxApp::GetComCtl32Version() >= 580 ) { // use the full 32 bit range if available n = ::SendMessage(GetHwnd(), UDM_GETPOS32, 0, 0); @@ -240,7 +244,7 @@ void wxSpinButton::SetValue(int val) // wxSpinButtonBase::SetValue(val); -- no, it is pure virtual #ifdef UDM_SETPOS32 - if ( wxTheApp->GetComCtl32Version() >= 580 ) + if ( wxApp::GetComCtl32Version() >= 580 ) { // use the full 32 bit range if available ::SendMessage(GetHwnd(), UDM_SETPOS32, 0, val); @@ -273,7 +277,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal) bool wxSpinButton::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, WXWORD pos, WXHWND control) { - wxCHECK_MSG( control, false, wxT("scrolling what?") ) + wxCHECK_MSG( control, false, wxT("scrolling what?") ); if ( wParam != SB_THUMBPOSITION ) {