AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't show windows with "hidden" XRC attribute at all.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin 2014-02-01 18:18:52 +00:00
parent 36e3a58992
commit 7baf1ce2fd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/xrc/xmlres.h
View File

@ -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!!

2
src/xrc/xmlres.cpp
View File

@ -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")));