more GTK-ish toolbar drawing

[wxWidgets.git] / src / x11 / toplevel.cpp

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index d3a09042d0f0dde28b7cc5477063fef308ecf30a..123f4f836d7d2f783f43775397acfd7d018cb850 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -231,6 +231,17 @@ wxTopLevelWindowX11::~wxTopLevelWindowX11()
 
 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);
 }
 
@@ -606,9 +617,10 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz
     // wxLogDebug( "Setting pos: %d, %d", x, y );
     wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
 
+#if 0
     wxPoint pt = GetPosition();
     // wxLogDebug( "After, pos: %d, %d", pt.x, pt.y );
-#if 0
+
     XSync(wxGlobalDisplay(), False);
     int w, h;
     GetSize(& w, & h);