compilation fix for wxUSE_RESOURCE_LOADING_IN_MSW == 0

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 92bd009d71c0d18b12484e6caf41c75cdff6e6b9..d2e9fda7f0863c0d00531042fe89ecb1deb980ed 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -328,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) );
     }
 
     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;
 }
 
     return TRUE;
 }


@@ -344,7 +344,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     m_refData = new wxBitmapRefData();
 
     // ------
     m_refData = new wxBitmapRefData();
 
     // ------

-    // convertion to mono bitmap:
+    // conversion to mono bitmap:

     // ------
     if (depth == 1)
     {
     // ------
     if (depth == 1)
     {


@@ -440,7 +440,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     }
 
     // ------
     }
 
     // ------

-    // convertion to colour bitmap:
+    // conversion to colour bitmap:

     // ------
     else
     {
     // ------
     else
     {


@@ -814,6 +814,7 @@ wxImage wxBitmap::ConvertToImage() const
 }
 
 wxBitmap::wxBitmap( const wxBitmap& bmp )
 }
 
 wxBitmap::wxBitmap( const wxBitmap& bmp )

+    : wxGDIObject()

 {
     Ref( bmp );
 }
 {
     Ref( bmp );
 }