Commit mentioned fix/hack to enable controls

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

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 32f4ef60e7f9fe644018fa7af2845da4f0d71549..d4b4d521a30fee7ace59e1238595bf2077acfc06 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -11,6 +11,9 @@
 
 #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"


@@ -74,6 +77,7 @@ public:
         XFlush(m_display);
         XSetErrorHandler(m_old);
     }
         XFlush(m_display);
         XSetErrorHandler(m_old);
     }

+

 private:
     Display *m_display;
     int (*m_old)(Display*, XErrorEvent *);
 private:
     Display *m_display;
     int (*m_old)(Display*, XErrorEvent *);


@@ -101,8 +105,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 )
         {