Moved Nano-X specific code from univ to x11
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -153,18 +153,6 @@ bool wxDialog::Show(bool show)
|
|||||||
EndModal(wxID_CANCEL);
|
EndModal(wxID_CANCEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Not sure how to put this in platform-specific
|
|
||||||
// code just yet. Nano-X has to force a size event,
|
|
||||||
// else there's no initial size.
|
|
||||||
#if wxUSE_NANOX
|
|
||||||
if (show)
|
|
||||||
{
|
|
||||||
wxSizeEvent event(GetSize(), GetId());
|
|
||||||
event.SetEventObject(this);
|
|
||||||
GetEventHandler()->ProcessEvent(event);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bool ret = wxDialogBase::Show(show);
|
bool ret = wxDialogBase::Show(show);
|
||||||
|
|
||||||
if ( show )
|
if ( show )
|
||||||
|
@@ -231,6 +231,17 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
|
|||||||
|
|
||||||
bool wxTopLevelWindowX11::Show(bool show)
|
bool wxTopLevelWindowX11::Show(bool show)
|
||||||
{
|
{
|
||||||
|
// Nano-X has to force a size event,
|
||||||
|
// else there's no initial size.
|
||||||
|
#if wxUSE_NANOX
|
||||||
|
if (show)
|
||||||
|
{
|
||||||
|
wxSizeEvent event(GetSize(), GetId());
|
||||||
|
event.SetEventObject(this);
|
||||||
|
GetEventHandler()->ProcessEvent(event);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
return wxWindowX11::Show(show);
|
return wxWindowX11::Show(show);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user