]> git.saurik.com Git - wxWidgets.git/blobdiff - src/unix/utilsx11.cpp
oops, added missing const_cast to make last check in compile
[wxWidgets.git] / src / unix / utilsx11.cpp
index d2145aaa37bd6d3a6da7c0ef875e8c5ecdbadfb2..d4b4d521a30fee7ace59e1238595bf2077acfc06 100644 (file)
@@ -6,11 +6,14 @@
 // Created:     25.03.02
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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"
@@ -74,6 +77,7 @@ public:
         XFlush(m_display);
         XSetErrorHandler(m_old);
     }
+
 private:
     Display *m_display;
     int (*m_old)(Display*, XErrorEvent *);
@@ -101,8 +105,11 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
 
     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 )
         {