X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6bd9b9f2472edac7b35e62bee78db18295e795f4..b85b06e13d22e7fc1604ec1a49caa1227a1b3d36:/src/msw/window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 6254c9ae8d..fbf9c4ced0 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -513,13 +513,15 @@ void wxWindowMSW::Init()
     m_lastKeydownProcessed = false;
 
     m_hWnd = 0;
-    m_hDWP = 0;
 
     m_xThumbSize = 0;
     m_yThumbSize = 0;
 
+#if wxUSE_DEFERRED_SIZING
+    m_hDWP = 0;
     m_pendingPosition = wxDefaultPosition;
     m_pendingSize = wxDefaultSize;
+#endif // wxUSE_DEFERRED_SIZING
 
 #ifdef __POCKETPC__
     m_contextMenuEnabled = false;
@@ -2131,10 +2133,11 @@ int wxWindowMSW::GetCharWidth() const
 #endif
 }
 
-void wxWindowMSW::GetTextExtent(const wxString& string,
-                             int *x, int *y,
-                             int *descent, int *externalLeading,
-                             const wxFont *fontToUse) const
+void wxWindowMSW::DoGetTextExtent(const wxString& string,
+                                  int *x, int *y,
+                                  int *descent,
+                                  int *externalLeading,
+                                  const wxFont *fontToUse) const
 {
     wxASSERT_MSG( !fontToUse || fontToUse->Ok(),
                     _T("invalid font in GetTextExtent()") );