[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 9019174594484952076a6c9a42f5c0ff2cdbd0f2..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;
        
     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;
 #if !wxUSE_NANOX
     XSetWindowAttributes xattributes;
     XSizeHints size_hints;


@@ -118,18 +130,6 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     xattributes.override_redirect = False;
 #endif
     
     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());
 #if wxUSE_NANOX
     long backColor, foreColor;
     backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());


@@ -149,11 +149,23 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
 #endif
 
     XSelectInput( xdisplay, xwindow,
 #endif
 
     XSelectInput( xdisplay, xwindow,

-        extraFlags | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
-        ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
-        KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
-        PropertyChangeMask );
-
+                  extraFlags |
+                  ExposureMask |
+                  KeyPressMask |
+                  KeyReleaseMask |
+                  ButtonPressMask |
+                  ButtonReleaseMask |
+                  ButtonMotionMask |
+                  EnterWindowMask |
+                  LeaveWindowMask |
+                  PointerMotionMask |
+                  KeymapStateMask |
+                  FocusChangeMask |
+                  ColormapChangeMask |
+                  StructureNotifyMask |
+                  PropertyChangeMask
+                  );
+    

     wxAddWindowToTable( xwindow, (wxWindow*) this );
 
     // Set background to None which will prevent X11 from clearing the
     wxAddWindowToTable( xwindow, (wxWindow*) this );
 
     // Set background to None which will prevent X11 from clearing the


@@ -384,6 +396,7 @@ bool wxSetWMDecorations(Window w, long style)
     GR_WM_PROPERTIES wmProp;
 
     wmProp.flags = 0;
     GR_WM_PROPERTIES wmProp;
 
     wmProp.flags = 0;

+    wmProp.props = 0;

 
     if (style & wxRESIZE_BORDER)
     {
 
     if (style & wxRESIZE_BORDER)
     {


@@ -403,6 +416,11 @@ bool wxSetWMDecorations(Window w, long style)
     {
         wmProp.props |= GR_WM_PROPS_CAPTION ;
         wmProp.flags |= GR_WM_FLAGS_PROPS ;
     {
         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)
     }
 
     if (style & wxTHICK_FRAME)


@@ -447,14 +465,14 @@ bool wxSetWMDecorations(Window w, long style)
 
     if (style & wxRESIZE_BORDER)
     {
 
     if (style & wxRESIZE_BORDER)
     {

-       wxLogDebug("MWM_DECOR_RESIZEH");
+        // wxLogDebug("MWM_DECOR_RESIZEH");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_RESIZEH;
     }
 
     if (style & wxSYSTEM_MENU)
     {
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_RESIZEH;
     }
 
     if (style & wxSYSTEM_MENU)
     {

-       wxLogDebug("MWM_DECOR_MENU");
+        // wxLogDebug("MWM_DECOR_MENU");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MENU;
     }
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MENU;
     }


@@ -463,28 +481,28 @@ bool wxSetWMDecorations(Window w, long style)
         (style & wxTINY_CAPTION_HORIZ) ||
         (style & wxTINY_CAPTION_VERT))
     {
         (style & wxTINY_CAPTION_HORIZ) ||
         (style & wxTINY_CAPTION_VERT))
     {

-       wxLogDebug("MWM_DECOR_TITLE");
+        // wxLogDebug("MWM_DECOR_TITLE");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_TITLE;
     }
 
     if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION))
     {
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_TITLE;
     }
 
     if ((style & wxTHICK_FRAME) || (style & wxSIMPLE_BORDER) || (style & wxCAPTION))
     {

-       wxLogDebug("MWM_DECOR_BORDER");
+        // wxLogDebug("MWM_DECOR_BORDER");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_BORDER;
     }
 
     if (style & wxMINIMIZE_BOX)
     {
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_BORDER;
     }
 
     if (style & wxMINIMIZE_BOX)
     {

-       wxLogDebug("MWM_DECOR_MINIMIZE");
+        // wxLogDebug("MWM_DECOR_MINIMIZE");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MINIMIZE;
     }
 
     if (style & wxMAXIMIZE_BOX)
     {
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MINIMIZE;
     }
 
     if (style & wxMAXIMIZE_BOX)
     {

-       wxLogDebug("MWM_DECOR_MAXIMIZE");
+        // wxLogDebug("MWM_DECOR_MAXIMIZE");

         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MAXIMIZE;
     }
         hints.flags |= MWM_HINTS_DECORATIONS;
         hints.decorations |= MWM_DECOR_MAXIMIZE;
     }


@@ -585,15 +603,13 @@ void wxTopLevelWindowX11::DoSetClientSize(int width, int height)
 
 void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
 
 void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {

-    wxString msg;
-    msg.Printf("Setting pos: %d, %d", x, y);
-    wxLogDebug(msg);
+    // wxLogDebug( "Setting pos: %d, %d", x, y );

     wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
 
     wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
 

-    wxPoint pt = GetPosition();
-    msg.Printf("After, pos: %d, %d", pt.x, pt.y);
-    wxLogDebug(msg);

 #if 0
 #if 0

+    wxPoint pt = GetPosition();
+    // wxLogDebug( "After, pos: %d, %d", pt.x, pt.y );
+

     XSync(wxGlobalDisplay(), False);
     int w, h;
     GetSize(& w, & h);
     XSync(wxGlobalDisplay(), False);
     int w, h;
     GetSize(& w, & h);


@@ -608,14 +624,14 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz
 
     if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
 
     if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {

-       int yy = 0;
+        int yy = 0;

         AdjustForParentClientOrigin( x, yy, sizeFlags);
         windowChanges.x = x;
         valueMask |= CWX;
     }
     if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {
         AdjustForParentClientOrigin( x, yy, sizeFlags);
         windowChanges.x = x;
         valueMask |= CWX;
     }
     if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     {

-       int xx = 0;
+        int xx = 0;

         AdjustForParentClientOrigin( xx, y, sizeFlags);
         windowChanges.y = y;
         valueMask |= CWY;
         AdjustForParentClientOrigin( xx, y, sizeFlags);
         windowChanges.y = y;
         valueMask |= CWY;


@@ -646,18 +662,16 @@ void wxTopLevelWindowX11::DoGetPosition(int *x, int *y) const
     Window window = (Window) m_mainWidget;
     if (window)
     {
     Window window = (Window) m_mainWidget;
     if (window)
     {

-       int offsetX = 0;
-       int offsetY = 0;
+        int offsetX = 0;
+        int offsetY = 0;

        
 #if !wxUSE_NANOX
        
 #if !wxUSE_NANOX

-        wxLogDebug("Translating...");
+        // wxLogDebug("Translating...");

         Window childWindow;
         XTranslateCoordinates(wxGlobalDisplay(), window, XDefaultRootWindow(wxGlobalDisplay()),
                                  0, 0, & offsetX, & offsetY, & childWindow);
 
         Window childWindow;
         XTranslateCoordinates(wxGlobalDisplay(), window, XDefaultRootWindow(wxGlobalDisplay()),
                                  0, 0, & offsetX, & offsetY, & childWindow);
 

-       wxString msg;
-       msg.Printf("Offset: %d, %d", offsetX, offsetY);
-       wxLogDebug(msg);
+        // wxLogDebug("Offset: %d, %d", offsetX, offsetY);

 #endif
        
         XWindowAttributes attr;
 #endif
        
         XWindowAttributes attr;