X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd28827a0437782ea431ac9cf1845c4501b802b6..e17b6377be593ce71d722beb3cdcffb67baccf00:/src/msw/statbr95.cpp diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp index 059b36a0f5..c17ff4cc57 100644 --- a/src/msw/statbr95.cpp +++ b/src/msw/statbr95.cpp @@ -16,25 +16,22 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/setup.h" - #include "wx/frame.h" - #include "wx/settings.h" - #include "wx/dcclient.h" -#endif - #if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR -#include "wx/intl.h" -#include "wx/log.h" #include "wx/statusbr.h" +#ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/frame.h" + #include "wx/settings.h" + #include "wx/dcclient.h" + #include "wx/intl.h" + #include "wx/log.h" +#endif + #include "wx/msw/private.h" #include -// include "properly" -#include "wx/msw/wrapcctl.h" - #if wxUSE_UXTHEME #include "wx/msw/uxtheme.h" #endif @@ -293,10 +290,6 @@ bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const return true; } -#ifndef SWP_NOSENDCHANGING -#define SWP_NOSENDCHANGING 0 -#endif - void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height) { if ( GetParent()->IsSizeDeferred() ) @@ -310,8 +303,11 @@ void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height) // we must use SWP_NOCOPYBITS here otherwise it paints incorrectly // if other windows are size deferred ::SetWindowPos(GetHwnd(), NULL, x, y, width, height, - SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE | - SWP_NOCOPYBITS | SWP_NOSENDCHANGING); + SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE +#ifndef __WXWINCE__ + | SWP_NOCOPYBITS | SWP_NOSENDCHANGING +#endif + ); } // adjust fields widths to the new size