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

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index cf1d19793b044fddfcdcb01debd13092609ae960..6b42e73d02c72a13fdaf3bea6cd218871fa235f7 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -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);
 
     if ( show ) 
     bool ret = wxDialogBase::Show(show);
 
     if ( show ) 

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index d191faf6f16906a62ef4727ba4910bc604ba8bbd..123f4f836d7d2f783f43775397acfd7d018cb850 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -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);
 }