Unicode compilation fixes after wxFFile change

[wxWidgets.git] / src / gtk1 / bitmap.cpp

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 634273f99e71df99c7c753400a9de4beb5140c0f..d2e9fda7f0863c0d00531042fe89ecb1deb980ed 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -33,10 +33,7 @@
 #ifdef __WXGTK20__
     #include <gdk/gdkimage.h>
 #else // GTK+ 1.2
-    // VZ: is this still needed? seems to compile fine without it...
-    #if (GTK_MINOR_VERSION > 0)
-        #include <gdk/gdkrgb.h>
-    #endif
+    #include <gdk/gdkrgb.h>
 #endif // GTK+ 2.0/1.2
 
 extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
@@ -331,8 +328,8 @@ bool wxBitmap::CreateFromXpm( const char **bits )
     }
 
     gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-
-    M_BMPDATA->m_bpp = visual->depth;  // ?
+    
+    M_BMPDATA->m_bpp = visual->depth;  // Can we get a different depth from create_from_xpm_d() ?
 
     return TRUE;
 }
@@ -347,7 +344,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     m_refData = new wxBitmapRefData();
 
     // ------
-    // convertion to mono bitmap:
+    // conversion to mono bitmap:
     // ------
     if (depth == 1)
     {
@@ -360,7 +357,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );
 
         SetDepth( 1 );
-
+        
         GdkVisual *visual = wxTheApp->GetGdkVisual();
 
         // Create picture image
@@ -443,7 +440,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     }
 
     // ------
-    // convertion to colour bitmap:
+    // conversion to colour bitmap:
     // ------
     else
     {
@@ -460,7 +457,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         int bpp = visual->depth;
 
         SetDepth( bpp );
-
+        
         if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
         if (bpp < 8) bpp = 8;
 
@@ -705,7 +702,7 @@ wxImage wxBitmap::ConvertToImage() const
 
     image.Create( GetWidth(), GetHeight() );
     char unsigned *data = image.GetData();
-
+    
     if (!data)
     {
         gdk_image_destroy( gdk_image );
@@ -817,6 +814,7 @@ wxImage wxBitmap::ConvertToImage() const
 }
 
 wxBitmap::wxBitmap( const wxBitmap& bmp )
+    : wxGDIObject()
 {
     Ref( bmp );
 }