From 7baf1ce2fd9bcf21e2bc336de46dd95fecf7a56b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 1 Feb 2014 18:18:52 +0000
Subject: [PATCH] Don't show windows with "hidden" XRC attribute at all.

This is better than showing them initially and then hiding them if only
because it avoids the unexpected wxEVT_SHOW events being generated.

Closes #15919.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/xrc/xmlres.h | 4 +++-
 src/xrc/xmlres.cpp      | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 88c71fef49..e58f1c0551 100644
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -620,7 +620,9 @@ public:
    if (m_instance) \
        variable = wxStaticCast(m_instance, classname); \
    if (!variable) \
-       variable = new classname;
+       variable = new classname; \
+   if (GetBool(wxT("hidden"), 0) == 1) \
+       variable->Hide();
 
 
 // FIXME -- remove this $%^#$%#$@# as soon as Ron checks his changes in!!
diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 473db8717d..49ff0ff48a 100644
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -2440,8 +2440,6 @@ void wxXmlResourceHandlerImpl::SetupWindow(wxWindow *wnd)
         wnd->Enable(false);
     if (GetBool(wxT("focused"), 0) == 1)
         wnd->SetFocus();
-    if (GetBool(wxT("hidden"), 0) == 1)
-        wnd->Show(false);
 #if wxUSE_TOOLTIPS
     if (HasParam(wxT("tooltip")))
         wnd->SetToolTip(GetText(wxT("tooltip")));