combobox buglet when inserting item

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index a95fe7784a414e4ff81dd9a4c35491c5145b6320..08cf535a6a643046dfacf4de841ffe404431b5a0 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -156,15 +156,15 @@ wxImage wxImage::Scale( int width, int height )
 {
     wxImage image;
     
 {
     wxImage image;
     

-    wxCHECK_MSG( Ok(), image, "invlaid image" );
+    wxCHECK_MSG( Ok(), image, _T("invalid image") );

     
     

-    wxCHECK_MSG( (width > 0) && (height > 0), image, "invalid image size" );
+    wxCHECK_MSG( (width > 0) && (height > 0), image, _T("invalid image size") );

     
     image.Create( width, height );
     
     char unsigned *data = image.GetData();
     
     
     image.Create( width, height );
     
     char unsigned *data = image.GetData();
     

-    wxCHECK_MSG( data, image, "unable to create image" );
+    wxCHECK_MSG( data, image, _T("unable to create image") );

     
     if (M_IMGDATA->m_hasMask)
         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
     
     if (M_IMGDATA->m_hasMask)
         image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );


@@ -193,12 +193,12 @@ wxImage wxImage::Scale( int width, int height )
 
 void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
 {
 
 void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
 {

-    wxCHECK_RET( Ok(), "invalid image" );
+    wxCHECK_RET( Ok(), _T("invalid image") );

     
     int w = M_IMGDATA->m_width;
     int h = M_IMGDATA->m_height;
     
     
     int w = M_IMGDATA->m_width;
     int h = M_IMGDATA->m_height;
     

-    wxCHECK_RET( (x>=0) && (y>=0) && (x<w) && (y<h), "invalid image index" );
+    wxCHECK_RET( (x>=0) && (y>=0) && (x<w) && (y<h), _T("invalid image index") );

     
     long pos = (y * w + x) * 3;
     
     
     long pos = (y * w + x) * 3;
     


@@ -209,12 +209,12 @@ void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned c
 
 unsigned char wxImage::GetRed( int x, int y )
 {
 
 unsigned char wxImage::GetRed( int x, int y )
 {

-    wxCHECK_MSG( Ok(), 0, "invalid image" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid image") );

     
     int w = M_IMGDATA->m_width;
     int h = M_IMGDATA->m_height;
     
     
     int w = M_IMGDATA->m_width;
     int h = M_IMGDATA->m_height;
     

-    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, "invalid image index" );
+    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, _T("invalid image index") );

     
     long pos = (y * w + x) * 3;
     
     
     long pos = (y * w + x) * 3;
     


@@ -223,12 +223,12 @@ unsigned char wxImage::GetRed( int x, int y )
 
 unsigned char wxImage::GetGreen( int x, int y )
 {
 
 unsigned char wxImage::GetGreen( int x, int y )
 {

-    wxCHECK_MSG( Ok(), 0, "invalid image" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid image") );

     
     int w = M_IMGDATA->m_width;
     int h = M_IMGDATA->m_height;
     
     
     int w = M_IMGDATA->m_width;
     int h = M_IMGDATA->m_height;
     

-    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, "invalid image index" );
+    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, _T("invalid image index") );

     
     long pos = (y * w + x) * 3;
     
     
     long pos = (y * w + x) * 3;
     


@@ -237,12 +237,12 @@ unsigned char wxImage::GetGreen( int x, int y )
 
 unsigned char wxImage::GetBlue( int x, int y )
 {
 
 unsigned char wxImage::GetBlue( int x, int y )
 {

-    wxCHECK_MSG( Ok(), 0, "invalid image" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid image") );

     
     int w = M_IMGDATA->m_width;
     int h = M_IMGDATA->m_height;
     
     
     int w = M_IMGDATA->m_width;
     int h = M_IMGDATA->m_height;
     

-    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, "invalid image index" );
+    wxCHECK_MSG( (x>=0) && (y>=0) && (x<w) && (y<h), 0, _T("invalid image index") );

     
     long pos = (y * w + x) * 3;
     
     
     long pos = (y * w + x) * 3;
     


@@ -256,21 +256,21 @@ bool wxImage::Ok() const
 
 char unsigned *wxImage::GetData() const
 {
 
 char unsigned *wxImage::GetData() const
 {

-    wxCHECK_MSG( Ok(), (char unsigned *)NULL, "invalid image" );
+    wxCHECK_MSG( Ok(), (char unsigned *)NULL, _T("invalid image") );

     
     return M_IMGDATA->m_data;
 }
 
 void wxImage::SetData( char unsigned *data )
 {
     
     return M_IMGDATA->m_data;
 }
 
 void wxImage::SetData( char unsigned *data )
 {

-    wxCHECK_RET( Ok(), "invalid image" );
+    wxCHECK_RET( Ok(), _T("invalid image") );

 
     memcpy(M_IMGDATA->m_data, data, M_IMGDATA->m_width * M_IMGDATA->m_height * 3);
 }
 
 void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
 {
 
     memcpy(M_IMGDATA->m_data, data, M_IMGDATA->m_width * M_IMGDATA->m_height * 3);
 }
 
 void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
 {

-    wxCHECK_RET( Ok(), "invalid image" );
+    wxCHECK_RET( Ok(), _T("invalid image") );

     
     M_IMGDATA->m_maskRed = r;
     M_IMGDATA->m_maskGreen = g;
     
     M_IMGDATA->m_maskRed = r;
     M_IMGDATA->m_maskGreen = g;


@@ -280,49 +280,49 @@ void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
 
 unsigned char wxImage::GetMaskRed() const
 {
 
 unsigned char wxImage::GetMaskRed() const
 {

-    wxCHECK_MSG( Ok(), 0, "invalid image" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid image") );

     
     return M_IMGDATA->m_maskRed;
 }
 
 unsigned char wxImage::GetMaskGreen() const
 {
     
     return M_IMGDATA->m_maskRed;
 }
 
 unsigned char wxImage::GetMaskGreen() const
 {

-    wxCHECK_MSG( Ok(), 0, "invalid image" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid image") );

     
     return M_IMGDATA->m_maskGreen;
 }
 
 unsigned char wxImage::GetMaskBlue() const
 {
     
     return M_IMGDATA->m_maskGreen;
 }
 
 unsigned char wxImage::GetMaskBlue() const
 {

-    wxCHECK_MSG( Ok(), 0, "invalid image" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid image") );

     
     return M_IMGDATA->m_maskBlue;
 }
 
 void wxImage::SetMask( bool mask )
 {
     
     return M_IMGDATA->m_maskBlue;
 }
 
 void wxImage::SetMask( bool mask )
 {

-    wxCHECK_RET( Ok(), "invalid image" );
+    wxCHECK_RET( Ok(), _T("invalid image") );

     
     M_IMGDATA->m_hasMask = mask;
 }
 
 bool wxImage::HasMask() const
 {
     
     M_IMGDATA->m_hasMask = mask;
 }
 
 bool wxImage::HasMask() const
 {

-    wxCHECK_MSG( Ok(), FALSE, "invalid image" );
+    wxCHECK_MSG( Ok(), FALSE, _T("invalid image") );

     
     return M_IMGDATA->m_hasMask;
 }
 
 int wxImage::GetWidth() const
 {
     
     return M_IMGDATA->m_hasMask;
 }
 
 int wxImage::GetWidth() const
 {

-    wxCHECK_MSG( Ok(), 0, "invalid image" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid image") );

     
     return M_IMGDATA->m_width;
 }
 
 int wxImage::GetHeight() const
 {
     
     return M_IMGDATA->m_width;
 }
 
 int wxImage::GetHeight() const
 {

-    wxCHECK_MSG( Ok(), 0, "invalid image" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid image") );

     
     return M_IMGDATA->m_height;
 }
     
     return M_IMGDATA->m_height;
 }


@@ -337,7 +337,7 @@ bool wxImage::LoadFile( const wxString& filename, long type )
     }
 
     else {
     }
 
     else {

-        wxLogError( "Can't load image from file '%s': file does not exist.", filename.c_str() );
+        wxLogError( _T("Can't load image from file '%s': file does not exist."), filename.c_str() );

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -356,7 +356,7 @@ bool wxImage::LoadFile( const wxString& filename, const wxString& mimetype )
     }
     
     else {
     }
     
     else {

-        wxLogError( "Can't load image from file '%s': file does not exist.", filename.c_str() );
+        wxLogError( _T("Can't load image from file '%s': file does not exist."), filename.c_str() );

         
         return FALSE;
     }
         
         return FALSE;
     }


@@ -400,7 +400,7 @@ bool wxImage::LoadFile( wxInputStream& stream, long type )
     
     if (handler == NULL)
     {
     
     if (handler == NULL)
     {

-        wxLogWarning( "No image handler for type %d defined.", type );
+        wxLogWarning( _T("No image handler for type %d defined."), type );

         
         return FALSE;
     }
         
         return FALSE;
     }


@@ -418,7 +418,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype )
 
     if (handler == NULL)
     {
 
     if (handler == NULL)
     {

-        wxLogWarning( "No image handler for type %s defined.", mimetype.GetData() );
+        wxLogWarning( _T("No image handler for type %s defined."), mimetype.GetData() );

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -428,13 +428,13 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype )
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type )
 {
 
 bool wxImage::SaveFile( wxOutputStream& stream, int type )
 {

-    wxCHECK_MSG( Ok(), FALSE, "invalid image" );
-
+    wxCHECK_MSG( Ok(), FALSE, _T("invalid image") );
+    

     wxImageHandler *handler = FindHandler(type);
     wxImageHandler *handler = FindHandler(type);

-
+    

     if (handler == NULL)
     {
     if (handler == NULL)
     {

-        wxLogWarning( "No image handler for type %d defined.", type );
+        wxLogWarning( _T("No image handler for type %d defined."), type );

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -444,13 +444,13 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type )
 
 bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
 {
 
 bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype )
 {

-    wxCHECK_MSG( Ok(), FALSE, "invalid image" );
+    wxCHECK_MSG( Ok(), FALSE, _T("invalid image") );

     
     wxImageHandler *handler = FindHandlerMime(mimetype);
     
     if (handler == NULL)
     {
     
     wxImageHandler *handler = FindHandlerMime(mimetype);
     
     if (handler == NULL)
     {

-        wxLogWarning( "No image handler for type %s defined.", mimetype.GetData() );
+        wxLogWarning( _T("No image handler for type %s defined."), mimetype.GetData() );

         
         return FALSE;
     }
         
         return FALSE;
     }


@@ -630,12 +630,12 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
     int height = (int)dbuf[1];
     if (width > 32767)
     {
     int height = (int)dbuf[1];
     if (width > 32767)
     {

-        wxLogError( "Image width > 32767 pixels for file\n" );
+        wxLogError( _T("Image width > 32767 pixels for file\n") );

         return FALSE;
     }
     if (height > 32767)
     {
         return FALSE;
     }
     if (height > 32767)
     {

-        wxLogError( "Image height > 32767 pixels for file\n" );
+        wxLogError( _T("Image height > 32767 pixels for file\n") );

         return FALSE;
     }
     stream.Read(&word, 2);
         return FALSE;
     }
     stream.Read(&word, 2);


@@ -644,14 +644,14 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
     bpp = (int)word;
     if (bpp != 1 && bpp != 4 && bpp != 8 && bpp && 16 && bpp != 24 && bpp != 32)
     {
     bpp = (int)word;
     if (bpp != 1 && bpp != 4 && bpp != 8 && bpp && 16 && bpp != 24 && bpp != 32)
     {

-        wxLogError( "unknown bitdepth in file\n" );
+        wxLogError( _T("unknown bitdepth in file\n") );

         return FALSE;
     }
     stream.Read(dbuf, 4 * 4);
     comp = (int)dbuf[0];
     if (comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && comp != BI_BITFIELDS)
     {
         return FALSE;
     }
     stream.Read(dbuf, 4 * 4);
     comp = (int)dbuf[0];
     if (comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && comp != BI_BITFIELDS)
     {

-        wxLogError( "unknown encoding in Windows BMP file\n" );
+        wxLogError( _T("unknown encoding in Windows BMP file\n") );

         return FALSE;
     }
     stream.Read(dbuf, 4 * 2);
         return FALSE;
     }
     stream.Read(dbuf, 4 * 2);


@@ -661,7 +661,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
     /* some more sanity checks */
     if (((comp == BI_RLE4) && (bpp != 4)) || ((comp == BI_RLE8) && (bpp != 8)) || ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
     {
     /* some more sanity checks */
     if (((comp == BI_RLE4) && (bpp != 4)) || ((comp == BI_RLE8) && (bpp != 8)) || ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
     {

-        wxLogError( "encoding of BMP doesn't match bitdepth\n" );
+        wxLogError( _T("encoding of BMP doesn't match bitdepth\n") );

         return FALSE;
     }
     if (bpp < 16)
         return FALSE;
     }
     if (bpp < 16)


@@ -670,7 +670,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
         
         if (!cmap)
         {
         
         if (!cmap)
         {

-            wxLogError( "Cannot allocate RAM for color map in BMP file\n" );
+            wxLogError( _T("Cannot allocate RAM for color map in BMP file\n") );

             return FALSE;
         }
     }
             return FALSE;
         }
     }


@@ -681,7 +681,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
     ptr = image->GetData();
     if (!ptr)
     {
     ptr = image->GetData();
     if (!ptr)
     {

-        wxLogError( "Cannot allocate RAM for RGB data in file\n" );
+        wxLogError( _T("Cannot allocate RAM for RGB data in file\n") );

         if (cmap)
             free(cmap);
         return FALSE;
         if (cmap)
             free(cmap);
         return FALSE;


@@ -795,7 +795,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
                 {
                     if (comp == BI_RLE4)
                     {
                 {
                     if (comp == BI_RLE4)
                     {

-                        wxLogError( "can't deal with 4bit encoded yet.\n");
+                        wxLogError( _T("can't deal with 4bit encoded yet.\n") );

                         image->Destroy();
                         free(cmap);
                         return FALSE;
                         image->Destroy();
                         free(cmap);
                         return FALSE;


@@ -973,7 +973,7 @@ wxBitmap wxImage::ConvertToBitmap() const
     
     // set bitmap parameters
     wxBitmap bitmap;
     
     // set bitmap parameters
     wxBitmap bitmap;

-    wxCHECK_MSG( Ok(), bitmap, "invalid image" );
+    wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );

     bitmap.SetWidth( width );
     bitmap.SetHeight( bmpHeight );
     bitmap.SetDepth( wxDisplayDepth() );
     bitmap.SetWidth( width );
     bitmap.SetHeight( bmpHeight );
     bitmap.SetDepth( wxDisplayDepth() );


@@ -981,7 +981,7 @@ wxBitmap wxImage::ConvertToBitmap() const
     // create a DIB header
     int headersize = sizeof(BITMAPINFOHEADER);
     LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
     // create a DIB header
     int headersize = sizeof(BITMAPINFOHEADER);
     LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );

-    wxCHECK_MSG( lpDIBh, bitmap, "could not allocate memory for DIB header" );
+    wxCHECK_MSG( lpDIBh, bitmap, _T("could not allocate memory for DIB header") );

     // Fill in the DIB header
     lpDIBh->bmiHeader.biSize = headersize;
     lpDIBh->bmiHeader.biWidth = (DWORD)width;
     // Fill in the DIB header
     lpDIBh->bmiHeader.biSize = headersize;
     lpDIBh->bmiHeader.biWidth = (DWORD)width;


@@ -1002,7 +1002,7 @@ wxBitmap wxImage::ConvertToBitmap() const
     lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
     if( !lpBits )
     {
     lpBits = (unsigned char *)malloc( lpDIBh->bmiHeader.biSizeImage );
     if( !lpBits )
     {

-        wxFAIL_MSG( "could not allocate memory for DIB" );
+        wxFAIL_MSG( _T("could not allocate memory for DIB") );

         free( lpDIBh );
         return bitmap;
     }
         free( lpDIBh );
         return bitmap;
     }


@@ -1145,7 +1145,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
     // check the bitmap
     if( !bitmap.Ok() )
     {
     // check the bitmap
     if( !bitmap.Ok() )
     {

-        wxFAIL_MSG( "invalid bitmap" );
+        wxFAIL_MSG( _T("invalid bitmap") );

         return;
     }
     
         return;
     }
     


@@ -1156,7 +1156,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
     unsigned char *data = GetData();
     if( !data )
     {
     unsigned char *data = GetData();
     if( !data )
     {

-        wxFAIL_MSG( "could not allocate data for image" );
+        wxFAIL_MSG( _T("could not allocate data for image") );

         return;
     }
     
         return;
     }
     


@@ -1176,7 +1176,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
     LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
     if( !lpDIBh )
     {
     LPBITMAPINFO lpDIBh = (BITMAPINFO *) malloc( headersize );
     if( !lpDIBh )
     {

-        wxFAIL_MSG( "could not allocate data for DIB header" );
+        wxFAIL_MSG( _T("could not allocate data for DIB header") );

         free( data );
         return;
     }
         free( data );
         return;
     }


@@ -1198,7 +1198,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
     lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
     if( !lpBits )
     {
     lpBits = (unsigned char *) malloc( lpDIBh->bmiHeader.biSizeImage );
     if( !lpBits )
     {

-        wxFAIL_MSG( "could not allocate data for DIB" );
+        wxFAIL_MSG( _T("could not allocate data for DIB") );

         free( data );
         free( lpDIBh );
         return;
         free( data );
         free( lpDIBh );
         return;


@@ -1277,11 +1277,15 @@ wxImage::wxImage( const wxBitmap &bitmap )
 #include "gdk/gdk.h"
 #include "gdk/gdkx.h"
 
 #include "gdk/gdk.h"
 #include "gdk/gdkx.h"
 

+#if (GTK_MINOR_VERSION > 0)
+#include "gdk/gdkrgb.h"
+#endif
+

 wxBitmap wxImage::ConvertToBitmap() const
 {
     wxBitmap bitmap;
     
 wxBitmap wxImage::ConvertToBitmap() const
 {
     wxBitmap bitmap;
     

-    wxCHECK_MSG( Ok(), bitmap, "invalid image" );
+    wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );

     
     int width = GetWidth();
     int height = GetHeight();
     
     int width = GetWidth();
     int height = GetHeight();


@@ -1289,14 +1293,54 @@ wxBitmap wxImage::ConvertToBitmap() const
     bitmap.SetHeight( height );
     bitmap.SetWidth( width );
     
     bitmap.SetHeight( height );
     bitmap.SetWidth( width );
     

-    // Create picture
+    bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) );
+
+     // Retrieve depth
+    
+    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
+    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
+    int bpp = visual->depth;
+    
+    bitmap.SetDepth( bpp );
+    
+    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+    if (bpp < 8) bpp = 8;
+    
+#if (GTK_MINOR_VERSION > 0)
+
+    if (!HasMask() && (bpp > 8))
+    {
+        static bool s_hasInitialized = FALSE;
+       
+       if (!s_hasInitialized)
+       {
+           gdk_rgb_init();
+           s_hasInitialized = TRUE;
+       }
+       
+        GdkGC *gc = gdk_gc_new( bitmap.GetPixmap() );
+       
+       gdk_draw_rgb_image( bitmap.GetPixmap(),
+                           gc,
+                           0, 0,
+                           width, height,
+                           GDK_RGB_DITHER_NONE,
+                           GetData(),
+                           width*3 );
+                           
+        gdk_gc_unref( gc );
+                           
+       return bitmap;
+    }
+    
+#endif
+    
+    // Create picture image

     
     GdkImage *data_image =
         gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
     
     
     GdkImage *data_image =
         gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
     

-    bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) );
-    
-    // Create mask
+    // Create mask image

     
     GdkImage *mask_image = (GdkImage*) NULL;
     
     
     GdkImage *mask_image = (GdkImage*) NULL;
     


@@ -1312,17 +1356,6 @@ wxBitmap wxImage::ConvertToBitmap() const
         bitmap.SetMask( mask );
     }
     
         bitmap.SetMask( mask );
     }
     

-    // Retrieve depth
-    
-    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
-    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
-    int bpp = visual->depth;
-    
-    bitmap.SetDepth( bpp );
-    
-    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
-    if (bpp < 8) bpp = 8;
-    

     // Render
     
     enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
     // Render
     
     enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };


@@ -1460,13 +1493,13 @@ wxBitmap wxImage::ConvertToBitmap() const
 
 wxImage::wxImage( const wxBitmap &bitmap )
 {
 
 wxImage::wxImage( const wxBitmap &bitmap )
 {

-    wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
+    wxCHECK_RET( bitmap.Ok(), _T("invalid bitmap") );

     
     GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(),
         0, 0,
         bitmap.GetWidth(), bitmap.GetHeight() );
     
     
     GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(),
         0, 0,
         bitmap.GetWidth(), bitmap.GetHeight() );
     

-    wxCHECK_RET( gdk_image, "couldn't create image" );
+    wxCHECK_RET( gdk_image, _T("couldn't create image") );

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


@@ -1474,7 +1507,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
     if (!data)
     {
         gdk_image_destroy( gdk_image );
     if (!data)
     {
         gdk_image_destroy( gdk_image );

-        wxFAIL_MSG( "couldn't create image" );
+        wxFAIL_MSG( _T("couldn't create image") );

         return;
     }
     
         return;
     }
     


@@ -1554,7 +1587,7 @@ wxBitmap wxImage::ConvertToBitmap() const
 {
     wxBitmap bitmap;
     
 {
     wxBitmap bitmap;
     

-    wxCHECK_MSG( Ok(), bitmap, "invalid image" );
+    wxCHECK_MSG( Ok(), bitmap, _T("invalid image") );

 
     int width = GetWidth();
     int height = GetHeight();
 
     int width = GetWidth();
     int height = GetHeight();


@@ -1758,7 +1791,7 @@ wxBitmap wxImage::ConvertToBitmap() const
 
 wxImage::wxImage( const wxBitmap &bitmap )
 {
 
 wxImage::wxImage( const wxBitmap &bitmap )
 {

-    wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
+    wxCHECK_RET( bitmap.Ok(), _T("invalid bitmap") );

     
     Display *dpy = (Display*) wxGetDisplay();
     Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) );
     
     Display *dpy = (Display*) wxGetDisplay();
     Visual* vis = DefaultVisual( dpy, DefaultScreen( dpy ) );


@@ -1770,7 +1803,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
         bitmap.GetWidth(), bitmap.GetHeight(),
         AllPlanes, ZPixmap );
     
         bitmap.GetWidth(), bitmap.GetHeight(),
         AllPlanes, ZPixmap );
     

-    wxCHECK_RET( ximage, "couldn't create image" );
+    wxCHECK_RET( ximage, _T("couldn't create image") );

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


@@ -1778,7 +1811,7 @@ wxImage::wxImage( const wxBitmap &bitmap )
     if (!data)
     {
         XDestroyImage( ximage );
     if (!data)
     {
         XDestroyImage( ximage );

-        wxFAIL_MSG( "couldn't create image" );
+        wxFAIL_MSG( _T("couldn't create image") );

         return;
     }
     
         return;
     }
     


@@ -1891,4 +1924,3 @@ public:
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)

-