fix compilation without wxUSE_STREAMS (closes #10900)

[wxWidgets.git] / src / msw / window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 6254c9ae8d147071365482e4413041b8341e9123..fbf9c4ced005e1c48ba0cf3b4be88c58a178d0ae 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -513,13 +513,15 @@ void wxWindowMSW::Init()
     m_lastKeydownProcessed = false;
 
     m_hWnd = 0;
     m_lastKeydownProcessed = false;
 
     m_hWnd = 0;

-    m_hDWP = 0;

 
     m_xThumbSize = 0;
     m_yThumbSize = 0;
 
 
     m_xThumbSize = 0;
     m_yThumbSize = 0;
 

+#if wxUSE_DEFERRED_SIZING
+    m_hDWP = 0;

     m_pendingPosition = wxDefaultPosition;
     m_pendingSize = wxDefaultSize;
     m_pendingPosition = wxDefaultPosition;
     m_pendingSize = wxDefaultSize;

+#endif // wxUSE_DEFERRED_SIZING

 
 #ifdef __POCKETPC__
     m_contextMenuEnabled = false;
 
 #ifdef __POCKETPC__
     m_contextMenuEnabled = false;


@@ -2131,10 +2133,11 @@ int wxWindowMSW::GetCharWidth() const
 #endif
 }
 
 #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()") );
 {
     wxASSERT_MSG( !fontToUse || fontToUse->Ok(),
                     _T("invalid font in GetTextExtent()") );