X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa89a22b8e47000c98bff05c6f545f331f1c353..65a1f3509bd761f4e6a4873f80889ebf84bc1e4b:/src/unix/utilsx11.cpp diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp index 32f4ef60e7..d4b4d521a3 100644 --- a/src/unix/utilsx11.cpp +++ b/src/unix/utilsx11.cpp @@ -11,6 +11,9 @@ #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 ) {