Fixed notebook redraw problems when using XP theme with Classic appearance.

[wxWidgets.git] / src / unix / utilsx11.cpp

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 7f46dcdbbf07328b56d271f5037f590d4e22f615..85256f048ed26999efa89d5178ce6c8e245a3262 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -6,11 +6,14 @@
 // Created:     25.03.02
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     25.03.02
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__)
 
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__)
 

+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/unix/utilsx11.h"
 #include "wx/iconbndl.h"
 #include "wx/image.h"
 #include "wx/unix/utilsx11.h"
 #include "wx/iconbndl.h"
 #include "wx/image.h"


@@ -101,8 +104,11 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
 
     if( size > 0 )
     {
 
     if( size > 0 )
     {

-        wxUint32* data = new wxUint32[size];
-        wxUint32* ptr = data;
+//       The code below is correct for 64-bit machines also.
+//       wxUint32* data = new wxUint32[size];
+//       wxUint32* ptr = data;
+        unsigned long* data = new unsigned long[size];
+        unsigned long* ptr = data;

 
         for( i = 0; i < max; ++i )
         {
 
         for( i = 0; i < max; ++i )
         {


@@ -276,11 +282,7 @@ static bool wxQueryWMspecSupport(Display *display, Window rootWnd, Atom feature)
     
     // Is the WM ICCCM supporting?
     XGetWindowProperty(display, rootWnd,
     
     // Is the WM ICCCM supporting?
     XGetWindowProperty(display, rootWnd,

-#ifdef __VMS

                        _NET_SUPPORTING_WM_CHECK, 0, LONG_MAX,
                        _NET_SUPPORTING_WM_CHECK, 0, LONG_MAX,

-#else
-                       _NET_SUPPORTING_WM_CHECK, 0, UINT_MAX,
-#endif

                        False, XA_WINDOW, &type, &format, &nwins,
                        &after, (unsigned char **)&wins);
     if ( type != XA_WINDOW || nwins <= 0 || wins[0] == None )
                        False, XA_WINDOW, &type, &format, &nwins,
                        &after, (unsigned char **)&wins);
     if ( type != XA_WINDOW || nwins <= 0 || wins[0] == None )


@@ -289,11 +291,7 @@ static bool wxQueryWMspecSupport(Display *display, Window rootWnd, Atom feature)
 
     // Query for supported features:
     XGetWindowProperty(display, rootWnd,
 
     // Query for supported features:
     XGetWindowProperty(display, rootWnd,

-#ifdef __VMS
-                      _NET_SUPPORTED, 0, LONG_MAX,
-#else
-                      _NET_SUPPORTED, 0, UINT_MAX,
-#endif
+                       _NET_SUPPORTED, 0, LONG_MAX,

                        False, XA_ATOM, &type, &format, &natoms,
                        &after, (unsigned char **)&atoms);
     if ( type != XA_ATOM || atoms == NULL )
                        False, XA_ATOM, &type, &format, &natoms,
                        &after, (unsigned char **)&atoms);
     if ( type != XA_ATOM || atoms == NULL )


@@ -408,17 +406,29 @@ static void wxSetKDEFullscreen(Display *display, Window rootWnd,
     }
 
     // it is neccessary to unmap the window, otherwise kwin will ignore us:
     }
 
     // it is neccessary to unmap the window, otherwise kwin will ignore us:

+    XSync(display, False);
+    

     bool wasMapped = IsMapped(display, w);
     if (wasMapped)
     bool wasMapped = IsMapped(display, w);
     if (wasMapped)

+    {

         XUnmapWindow(display, w);
         XUnmapWindow(display, w);

+        XSync(display, False);
+    }
+

     XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) &data, lng);
     XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) &data, lng);

+    XSync(display, False);
+

     if (wasMapped)
     if (wasMapped)

+    {

         XMapRaised(display, w);
         XMapRaised(display, w);

+        XSync(display, False);
+    }

     
     wxWMspecSetState(display, rootWnd, w, 
                      fullscreen ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE,
                      _NET_WM_STATE_STAYS_ON_TOP);
     
     wxWMspecSetState(display, rootWnd, w, 
                      fullscreen ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE,
                      _NET_WM_STATE_STAYS_ON_TOP);

+    XSync(display, False);

 
     if (!fullscreen)
     {
 
     if (!fullscreen)
     {


@@ -431,6 +441,7 @@ static void wxSetKDEFullscreen(Display *display, Window rootWnd,
         XMoveResizeWindow(display, w,
                           origRect->x, origRect->y,
                           origRect->width, origRect->height);
         XMoveResizeWindow(display, w,
                           origRect->x, origRect->y,
                           origRect->width, origRect->height);

+        XSync(display, False);

     }
 }
 
     }
 }