[this message is for the previous commit as well]

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

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index aeba31a27bfad3a754b3e3581026a063793d397a..d191faf6f16906a62ef4727ba4910bc604ba8bbd 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -101,6 +101,18 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     m_backgroundColour.CalcPixel( (WXColormap) cm );
     m_hasBgCol = TRUE;
        
+    wxSize size2(size);
+    if (size2.x == -1)
+       size2.x = 100;
+    if (size2.y == -1)
+       size2.y = 100;
+
+    wxPoint pos2(pos);
+    if (pos2.x == -1)
+       pos2.x = 100;
+    if (pos2.y == -1)
+       pos2.y = 100;
+    
 #if !wxUSE_NANOX
     XSetWindowAttributes xattributes;
     XSizeHints size_hints;
@@ -118,18 +130,6 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     xattributes.override_redirect = False;
 #endif
     
-    wxSize size2(size);
-    if (size2.x == -1)
-       size2.x = 100;
-    if (size2.y == -1)
-       size2.y = 100;
-
-    wxPoint pos2(pos);
-    if (pos2.x == -1)
-       pos2.x = 100;
-    if (pos2.y == -1)
-       pos2.y = 100;
-    
 #if wxUSE_NANOX
     long backColor, foreColor;
     backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
@@ -148,7 +148,6 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     extraFlags |= GR_EVENT_MASK_CLOSE_REQ;
 #endif
 
-#if wxUSE_NANOX
     XSelectInput( xdisplay, xwindow,
                   extraFlags |
                   ExposureMask |
@@ -166,25 +165,6 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
                   StructureNotifyMask |
                   PropertyChangeMask
                   );
-#else
-    XSelectInput( xdisplay, xwindow,
-                  extraFlags |
-                  ExposureMask |
-                  KeyPressMask |
-                  KeyReleaseMask |
-                  ButtonPressMask |
-                  ButtonReleaseMask |
-                  ButtonMotionMask |
-                  EnterWindowMask |
-                  LeaveWindowMask |
-                  PointerMotionMask |
-                  KeymapStateMask |
-                  FocusChangeMask |
-                  ColormapChangeMask |
-                  StructureNotifyMask |
-                  PropertyChangeMask
-                  );
-#endif
     
     wxAddWindowToTable( xwindow, (wxWindow*) this );
 
@@ -221,14 +201,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     XSetWMProtocols( xdisplay, xwindow, wm_protocols, 2);
 #endif
     
-#if 0 // wxUSE_NANOX
-    GR_WM_PROPERTIES props;
-    props.flags = GR_WM_FLAGS_TITLE;
-    props.title = (GR_CHAR*) "Hello";
-    GrSetWMProperties(xwindow, &props);
-#else
     wxSetWMDecorations( xwindow, style);
-#endif
 
     SetTitle(title);
     
@@ -423,6 +396,7 @@ bool wxSetWMDecorations(Window w, long style)
     GR_WM_PROPERTIES wmProp;
 
     wmProp.flags = 0;
+    wmProp.props = 0;
 
     if (style & wxRESIZE_BORDER)
     {
@@ -442,6 +416,11 @@ bool wxSetWMDecorations(Window w, long style)
     {
         wmProp.props |= GR_WM_PROPS_CAPTION ;
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
+
+        // The default dialog style doesn't include any kind
+        // of border, which is a bit odd. Anyway, inclusion
+        // of a caption surely implies a border.
+        style |= wxTHICK_FRAME;
     }
 
     if (style & wxTHICK_FRAME)
@@ -627,9 +606,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);