wxWindow::Show() works again

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 04771fc5de2b95f15c34145de73eabd57d1050fb..643d79f01d4f7857faf2a8a6dbac534a6308c1c0 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -345,7 +345,6 @@ protected:
 
     // additional (MSW specific) flags
     bool                  m_useCtl3D:1; // Using CTL3D for this control
-    bool                  m_inOnSize:1; // Protection against OnSize reentry
     bool                  m_backgroundTransparent:1;
     bool                  m_mouseInWindow:1;
     bool                  m_doubleClickAllowed:1;

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 3a7107fbba3720bd8b527bcee968b9ba6e43a5f2..d398797f0f0fe84cc60dfa031dfe370a623c26d5 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -293,8 +293,6 @@ void wxWindow::Init()
     m_caretEnabled =
     m_caretShown = FALSE;
 
-    m_inOnSize = FALSE;
-
     m_isBeingDeleted = FALSE;
     m_oldWndProc = 0;
     m_useCtl3D = FALSE;
@@ -307,6 +305,9 @@ void wxWindow::Init()
     m_yThumbSize = 0;
     m_backgroundTransparent = FALSE;
 
+    // as all windows are created with WS_VISIBLE style...
+    m_isShown = TRUE;
+
 #if wxUSE_MOUSEEVENT_HACK
     m_lastMouseX =
     m_lastMouseY = -1;