Compilation fix for USE_UNIV=1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index f974941a3729233d212058c940a94a94d6553180..be6d9305ad336b3a36ea3be24ed151d31044dd7b 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -28,6 +28,7 @@
 
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxWindow;

+class WXDLLEXPORT wxWindowBase;

 
 // ---------------------------------------------------------------------------
 // private constants
 
 // ---------------------------------------------------------------------------
 // private constants


@@ -702,7 +703,7 @@ inline bool wxStyleHasBorder(long style)
 }
 
 // Deferred window moving
 }
 
 // Deferred window moving

-bool wxMoveWindowDeferred(HDWP& hdwp, wxWindow* win, HWND hWnd, int x, int y, int width, int height);
+bool wxMoveWindowDeferred(HDWP& hdwp, wxWindowBase* win, HWND hWnd, int x, int y, int width, int height);

 
 // ----------------------------------------------------------------------------
 // functions mapping HWND to wxWindow
 
 // ----------------------------------------------------------------------------
 // functions mapping HWND to wxWindow

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 6e4f99c3908a9fe95f3417e860bdf5b696bf1c1a..9048400d3005d8e816304e0ce24459c01aa85f7d 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -5969,7 +5969,7 @@ bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
 #endif // wxUSE_HOTKEY
 
 // Moves a window by deferred method or normal method
 #endif // wxUSE_HOTKEY
 
 // Moves a window by deferred method or normal method

-bool wxMoveWindowDeferred(HDWP& hdwp, wxWindow* win, HWND hWnd, int x, int y, int width, int height)
+bool wxMoveWindowDeferred(HDWP& hdwp, wxWindowBase* win, HWND hWnd, int x, int y, int width, int height)

 {
     if ( hdwp )
     {
 {
     if ( hdwp )
     {