fixed some crashes

[wxWidgets.git] / src / common / image.cpp

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 903defa811ebbf5dd557d4fa389b387fd7a1b6e5..430bf440d0ce762af55b8916083e043fe7f608fa 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -1398,12 +1398,16 @@ wxImage::wxImage( const wxBitmap &bitmap )
 
 #ifdef __WXMAC__
 
 
 #ifdef __WXMAC__
 

-#include <PictUtils.h>
+#ifdef __UNIX__
+  #include <QD/PictUtils.h>
+#else
+  #include <PictUtils.h>
+#endif

 
 extern CTabHandle wxMacCreateColorTable( int numColors ) ;
 extern void wxMacDestroyColorTable( CTabHandle colors ) ;
 extern void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;
 
 extern CTabHandle wxMacCreateColorTable( int numColors ) ;
 extern void wxMacDestroyColorTable( CTabHandle colors ) ;
 extern void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue ) ;

-extern GWorldPtr wxMacCreateGWorld( int height , int width , int depth ) ;
+extern GWorldPtr wxMacCreateGWorld( int width , int height , int depth ) ;

 extern void wxMacDestroyGWorld( GWorldPtr gw ) ;
 
 wxBitmap wxImage::ConvertToBitmap() const
 extern void wxMacDestroyGWorld( GWorldPtr gw ) ;
 
 wxBitmap wxImage::ConvertToBitmap() const


@@ -1948,7 +1952,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
     }
 
     wxCHECK_RET( gdk_image, wxT("couldn't create image") );
     }
 
     wxCHECK_RET( gdk_image, wxT("couldn't create image") );

-
+    

     Create( bitmap.GetWidth(), bitmap.GetHeight() );
     char unsigned *data = GetData();
 
     Create( bitmap.GetWidth(), bitmap.GetHeight() );
     char unsigned *data = GetData();