mingw32 compilation fixes

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 832600e1a2d78c5434e7a7b5c74a75c4318077be..8a6ca2ccc71fe4632380ee3121d2ad5351066c17 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -16,9 +16,9 @@
 #include "wx/filefn.h"
 #include "wx/image.h"
 
-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>
 
 //-----------------------------------------------------------------------------
 // wxMask
@@ -33,72 +33,78 @@ wxMask::wxMask()
 
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 {
+    m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap, colour );
 }
 
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {
+    m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap, paletteIndex );
 }
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {
+    m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap );
 }
 
 wxMask::~wxMask()
 {
-    if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+    if (m_bitmap) 
+        gdk_bitmap_unref( m_bitmap );
 }
 
-bool wxMask::Create( const wxBitmap& bitmap, const wxColour& colour )
+bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
+                     const wxColour& WXUNUSED(colour) )
 {
     if (m_bitmap)
-    { 
+    {
         gdk_bitmap_unref( m_bitmap );
-       m_bitmap = (GdkBitmap*) NULL;
+        m_bitmap = (GdkBitmap*) NULL;
     }
-    
-    wxFAIL_MSG( _T("TODO") );
-    
+
+    wxFAIL_MSG( wxT("TODO") );
+
     return FALSE;
 }
 
-bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
+bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),
+                     int WXUNUSED(paletteIndex) )
 {
     if (m_bitmap)
-    { 
+    {
         gdk_bitmap_unref( m_bitmap );
-       m_bitmap = (GdkBitmap*) NULL;
+        m_bitmap = (GdkBitmap*) NULL;
     }
-    
-    wxFAIL_MSG( _T("not implemented") );
-    
+
+    wxFAIL_MSG( wxT("not implemented") );
+
     return FALSE;
 }
 
 bool wxMask::Create( const wxBitmap& bitmap )
 {
     if (m_bitmap)
-    { 
+    {
         gdk_bitmap_unref( m_bitmap );
-       m_bitmap = (GdkBitmap*) NULL;
+        m_bitmap = (GdkBitmap*) NULL;
     }
-    
+
     if (!bitmap.Ok()) return FALSE;
-    
-    wxCHECK_MSG( bitmap.GetBitmap(), FALSE, _T("Cannot create mask from colour bitmap") );
-    
+
+    wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") );
+
     m_bitmap = gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
-    
+
     if (!m_bitmap) return FALSE;
-    
+
     GdkGC *gc = gdk_gc_new( m_bitmap );
-    
+
     gdk_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
-    
+
     gdk_gc_unref( gc );
-    
+
     return TRUE;
 }
 
@@ -158,13 +164,13 @@ wxBitmap::wxBitmap()
 
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
-    wxCHECK_RET( (width > 0) && (height > 0), _T("invalid bitmap size") )
-    
+    wxCHECK_RET( (width > 0) && (height > 0), wxT("invalid bitmap size") )
+
     GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
     if (depth == -1) depth = gdk_window_get_visual( parent )->depth;
-    
+
     wxCHECK_RET( (depth ==  gdk_window_get_visual( parent )->depth) ||
-                 (depth == 1), _T("invalid bitmap depth") )
+                 (depth == 1), wxT("invalid bitmap depth") )
 
     m_refData = new wxBitmapRefData();
     M_BMPDATA->m_mask = (wxMask *) NULL;
@@ -186,7 +192,7 @@ wxBitmap::wxBitmap( int width, int height, int depth )
 
 wxBitmap::wxBitmap( const char **bits )
 {
-    wxCHECK_RET( bits != NULL, _T("invalid bitmap data") )
+    wxCHECK_RET( bits != NULL, wxT("invalid bitmap data") )
 
     m_refData = new wxBitmapRefData();
 
@@ -209,7 +215,7 @@ wxBitmap::wxBitmap( const char **bits )
 
 wxBitmap::wxBitmap( char **bits )
 {
-    wxCHECK_RET( bits != NULL, _T("invalid bitmap data") )
+    wxCHECK_RET( bits != NULL, wxT("invalid bitmap data") )
 
     m_refData = new wxBitmapRefData();
 
@@ -218,7 +224,7 @@ wxBitmap::wxBitmap( char **bits )
 
     M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
 
-    wxCHECK_RET( M_BMPDATA->m_pixmap, _T("couldn't create pixmap") );
+    wxCHECK_RET( M_BMPDATA->m_pixmap, wxT("couldn't create pixmap") );
 
     if (mask)
     {
@@ -257,7 +263,7 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
     M_BMPDATA->m_height = height;
     M_BMPDATA->m_bpp = 1;
 
-    wxCHECK_RET( M_BMPDATA->m_bitmap, _T("couldn't create bitmap") );
+    wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
 
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 }
@@ -291,35 +297,35 @@ bool wxBitmap::Ok() const
 
 int wxBitmap::GetHeight() const
 {
-    wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_height;
 }
 
 int wxBitmap::GetWidth() const
 {
-    wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_width;
 }
 
 int wxBitmap::GetDepth() const
 {
-    wxCHECK_MSG( Ok(), -1, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_bpp;
 }
 
 wxMask *wxBitmap::GetMask() const
 {
-    wxCHECK_MSG( Ok(), (wxMask *) NULL, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_mask;
 }
 
 void wxBitmap::SetMask( wxMask *mask )
 {
-    wxCHECK_RET( Ok(), _T("invalid bitmap") );
+    wxCHECK_RET( Ok(), wxT("invalid bitmap") );
 
     if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
 
@@ -328,12 +334,12 @@ void wxBitmap::SetMask( wxMask *mask )
 
 bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
 {
-    wxCHECK_MSG( Ok(), FALSE, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
 
-    if (type == wxBITMAP_TYPE_PNG)
+    // Try to save the bitmap via wxImage handlers:
     {
         wxImage image( *this );
-       if (image.Ok()) return image.SaveFile( name, type );
+        if (image.Ok()) return image.SaveFile( name, type );
     }
 
     return FALSE;
@@ -363,20 +369,13 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
         gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
         M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;
     }
-    else if (type == wxBITMAP_TYPE_PNG)
-    {
-        wxImage image;
-        image.LoadFile( name, type );
-        if (image.Ok()) *this = image.ConvertToBitmap();
-    }
-    else if (type == wxBITMAP_TYPE_BMP)
+    else // try if wxImage can load it
     {
         wxImage image;
-        image.LoadFile( name, type );
+        if (!image.LoadFile( name, type )) return FALSE;
         if (image.Ok()) *this = image.ConvertToBitmap();
+        else return FALSE;
     }
-    else
-        return FALSE;
 
     return TRUE;
 }
@@ -418,14 +417,14 @@ void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 
 GdkPixmap *wxBitmap::GetPixmap() const
 {
-    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_pixmap;
 }
 
 GdkBitmap *wxBitmap::GetBitmap() const
 {
-    wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, _T("invalid bitmap") );
+    wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, wxT("invalid bitmap") );
 
     return M_BMPDATA->m_bitmap;
 }