X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f65e33794fca0c936227235515a40e7df5c56e3..3069ac4e452f98644f9cdcae52a36ed9b9a93a31:/src/gtk/bitmap.cpp

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 6c2ecbe6d4..3e9ade68da 100644
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -2,10 +2,9 @@
 // Name:        bitmap.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -13,11 +12,11 @@
 #endif
 
 #include "wx/bitmap.h"
+#include "wx/icon.h"
+#include "wx/filefn.h"
 #include "gdk/gdkprivate.h"
-
-#ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
-#endif
+#include "gdk/gdkx.h"
+#include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 // wxMask
@@ -25,80 +24,70 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 
-wxMask::wxMask(void)
+wxMask::wxMask()
 {
-  m_bitmap = NULL;
-};
+    m_bitmap = (GdkBitmap *) NULL;
+}
 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour) )
 {
-};
+}
 
-wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const int WXUNUSED(paletteIndex) )
+wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
 {
-};
+}
 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
 {
-};
+}
 
-wxMask::~wxMask(void)
+wxMask::~wxMask()
 {
-#ifdef USE_GDK_IMLIB
-  // do not delete the mask, gdk_imlib does it for you
-#else
-  if (m_bitmap) gdk_bitmap_unref( m_bitmap );
-#endif  
-};
+    if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+}
 
 GdkBitmap *wxMask::GetBitmap(void) const
 {
-  return m_bitmap;
-};
-  
+    return m_bitmap;
+}
+
 //-----------------------------------------------------------------------------
 // wxBitmap
 //-----------------------------------------------------------------------------
 
-// CMB 20/5/98: added m_bitmap for GdkBitmaps
 class wxBitmapRefData: public wxObjectRefData
 {
-  public:
-  
-    wxBitmapRefData(void);
-    ~wxBitmapRefData(void);
-  
-    GdkPixmap      *m_pixmap;
-    GdkBitmap      *m_bitmap;
-    wxMask         *m_mask;
-    int             m_width;
-    int             m_height;
-    int             m_bpp;
-    wxPalette      *m_palette;
+public:
+  wxBitmapRefData(void);
+  ~wxBitmapRefData(void);
+
+  GdkPixmap      *m_pixmap;
+  GdkBitmap      *m_bitmap;
+  wxMask         *m_mask;
+  int             m_width;
+  int             m_height;
+  int             m_bpp;
+  wxPalette      *m_palette;
 };
 
-wxBitmapRefData::wxBitmapRefData(void)
+wxBitmapRefData::wxBitmapRefData()
 {
-  m_pixmap = NULL;
-  m_bitmap = NULL;
-  m_mask = NULL;
-  m_width = 0;
-  m_height = 0;
-  m_bpp = 0;
-  m_palette = NULL;
-};
+    m_pixmap = (GdkPixmap *) NULL;
+    m_bitmap = (GdkBitmap *) NULL;
+    m_mask = (wxMask *) NULL;
+    m_width = 0;
+    m_height = 0;
+    m_bpp = 0;
+    m_palette = (wxPalette *) NULL;
+}
 
-wxBitmapRefData::~wxBitmapRefData(void)
+wxBitmapRefData::~wxBitmapRefData()
 {
-#ifdef USE_GDK_IMLIB
-  if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
-#else
-  if (m_pixmap) gdk_pixmap_unref( m_pixmap );
-  if (m_bitmap) gdk_bitmap_unref( m_bitmap );
-#endif
-  if (m_mask) delete m_mask;
-  if (m_palette) delete m_palette;
-};
+    if (m_pixmap) gdk_pixmap_unref( m_pixmap );
+    if (m_bitmap) gdk_bitmap_unref( m_bitmap );
+    if (m_mask) delete m_mask;
+    if (m_palette) delete m_palette;
+}
 
 //-----------------------------------------------------------------------------
 
@@ -106,212 +95,273 @@ wxBitmapRefData::~wxBitmapRefData(void)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 
-wxBitmap::wxBitmap(void)
+wxBitmap::wxBitmap()
 {
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
-  
-wxBitmap::wxBitmap( const int width, const int height, const int depth )
-{
-  m_refData = new wxBitmapRefData();
-  M_BMPDATA->m_mask = NULL;
-  M_BMPDATA->m_pixmap = 
-    gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, width, height, depth );
-  gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-  M_BMPDATA->m_bpp = depth;
-   
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
+
+wxBitmap::wxBitmap( int width, int height, int depth )
+{
+    wxCHECK_RET( (width > 0) && (height > 0), "invalid bitmap size" )
+    wxCHECK_RET( (depth > 0) || (depth == -1), "invalid bitmap depth" )
+
+    m_refData = new wxBitmapRefData();
+
+    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
+
+    M_BMPDATA->m_mask = (wxMask *) NULL;
+    M_BMPDATA->m_pixmap = gdk_pixmap_new( parent, width, height, depth );
+    M_BMPDATA->m_width = width;
+    M_BMPDATA->m_height = height;
+    M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;
+
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
+
+wxBitmap::wxBitmap( const char **bits )
+{
+    wxCHECK_RET( bits != NULL, "invalid bitmap data" )
+
+    m_refData = new wxBitmapRefData();
+
+    GdkBitmap *mask = (GdkBitmap*) NULL;
+    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
+
+    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
+
+    if (mask)
+    {
+        M_BMPDATA->m_mask = new wxMask();
+        M_BMPDATA->m_mask->m_bitmap = mask;
+    }
+
+    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;  // ?
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
 
 wxBitmap::wxBitmap( char **bits )
 {
-  m_refData = new wxBitmapRefData();
-  
-  GdkBitmap *mask = NULL;
+    wxCHECK_RET( bits != NULL, "invalid bitmap data" )
+
+    m_refData = new wxBitmapRefData();
+
+    GdkBitmap *mask = (GdkBitmap*) NULL;
+    GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
+
+    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, (gchar **) bits );
+
+    wxCHECK_RET( M_BMPDATA->m_pixmap, "couldn't create pixmap" );
+
+    if (mask)
+    {
+        M_BMPDATA->m_mask = new wxMask();
+        M_BMPDATA->m_mask->m_bitmap = mask;
+    }
+
+    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;  // ?
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
 
-#ifndef USE_GDK_IMLIB
-  M_BMPDATA->m_pixmap = 
-    gdk_pixmap_create_from_xpm_d( (GdkWindow*) &gdk_root_parent, &mask, NULL, (gchar **) bits );
-#else
-  M_BMPDATA->m_pixmap = NULL;
-  int res = gdk_imlib_data_to_pixmap( bits, &M_BMPDATA->m_pixmap, &mask );
-#endif
-  
-  if (mask)
-  {
-    M_BMPDATA->m_mask = new wxMask();
-    M_BMPDATA->m_mask->m_bitmap = mask;
-  };
-				  
-  gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-  M_BMPDATA->m_bpp = 24; // ?
-   
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
-  
 wxBitmap::wxBitmap( const wxBitmap& bmp )
 {
-  Ref( bmp );
-   
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
-  
-wxBitmap::wxBitmap( const wxBitmap* bmp )
-{
-  if (bmp) Ref( *bmp );
-   
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+    Ref( bmp );
+
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
 
-wxBitmap::wxBitmap( const wxString &filename, const int type )
+wxBitmap::wxBitmap( const wxString &filename, int type )
 {
-  LoadFile( filename, type );
-};
+    LoadFile( filename, type );
+
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
 
-// CMB 15/5/98: add constructor for xbm bitmaps
-wxBitmap::wxBitmap( const char bits[], const int width, const int height, const int WXUNUSED(depth))
+wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
 {
-  m_refData = new wxBitmapRefData();
+    m_refData = new wxBitmapRefData();
 
-  M_BMPDATA->m_mask = NULL;
-  M_BMPDATA->m_bitmap = 
-    gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );
-  gdk_window_get_size( M_BMPDATA->m_bitmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-  M_BMPDATA->m_bpp = 1;
+    M_BMPDATA->m_mask = (wxMask *) NULL;
+    M_BMPDATA->m_bitmap =
+      gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );
+    M_BMPDATA->m_width = width;
+    M_BMPDATA->m_height = height;
+    M_BMPDATA->m_bpp = 1;
 
-  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    wxCHECK_RET( M_BMPDATA->m_bitmap, "couldn't create bitmap" );
+
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 }
-  
-wxBitmap::~wxBitmap(void)
+
+wxBitmap::~wxBitmap()
 {
-  if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
-};
-  
+    if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
+}
+
 wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
 {
-  if (*this == bmp) return (*this); 
-  Ref( bmp ); 
-  return *this; 
-};
-  
+    if (*this == bmp) return (*this);
+    Ref( bmp );
+    return *this;
+}
+
 bool wxBitmap::operator == ( const wxBitmap& bmp )
 {
-  return m_refData == bmp.m_refData; 
-};
-  
+    return m_refData == bmp.m_refData;
+}
+
 bool wxBitmap::operator != ( const wxBitmap& bmp )
 {
-  return m_refData != bmp.m_refData; 
-};
-  
+    return m_refData != bmp.m_refData;
+}
+
 bool wxBitmap::Ok(void) const
 {
-  return m_refData != NULL;
-};
-  
+    return (m_refData != NULL);
+}
+
 int wxBitmap::GetHeight(void) const
 {
-  if (!Ok()) return 0;
-  return M_BMPDATA->m_height;
-};
+    wxCHECK_MSG( Ok(), -1, "invalid bitmap" );
+
+    return M_BMPDATA->m_height;
+}
 
 int wxBitmap::GetWidth(void) const
 {
-  if (!Ok()) return 0;
-  return M_BMPDATA->m_width;
-};
+    wxCHECK_MSG( Ok(), -1, "invalid bitmap" );
+
+    return M_BMPDATA->m_width;
+}
 
 int wxBitmap::GetDepth(void) const
 {
-  if (!Ok()) return 0;
-  return M_BMPDATA->m_bpp;
-};
+    wxCHECK_MSG( Ok(), -1, "invalid bitmap" );
 
-void wxBitmap::SetHeight( const int height )
+    return M_BMPDATA->m_bpp;
+}
+
+wxMask *wxBitmap::GetMask(void) const
 {
-  if (!Ok()) return;
-  M_BMPDATA->m_height = height;
-};
+    wxCHECK_MSG( Ok(), (wxMask *) NULL, "invalid bitmap" );
+
+    return M_BMPDATA->m_mask;
+}
 
-void wxBitmap::SetWidth( const int width )
+void wxBitmap::SetMask( wxMask *mask )
 {
-  if (!Ok()) return;
-  M_BMPDATA->m_width = width;
-};
+    wxCHECK_RET( Ok(), "invalid bitmap" );
+
+    if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
 
-void wxBitmap::SetDepth( const int depth )
+    M_BMPDATA->m_mask = mask;
+}
+
+bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
 {
-  if (!Ok()) return;
-  M_BMPDATA->m_bpp = depth;
-};
+    wxCHECK_MSG( Ok(), FALSE, "invalid bitmap" );
 
-wxMask *wxBitmap::GetMask(void) const
+    if (type == wxBITMAP_TYPE_PNG)
+    {
+        wxImage image( *this );
+	if (image.Ok()) return image.SaveFile( name, type );
+    }
+
+    return FALSE;
+}
+
+bool wxBitmap::LoadFile( const wxString &name, int type )
 {
-  if (!Ok()) return NULL;
-  return M_BMPDATA->m_mask;
-};
+    UnRef();
 
-void wxBitmap::SetMask( wxMask *mask )
+    if (!wxFileExists(name)) return FALSE;
+
+    if (type == wxBITMAP_TYPE_XPM)
+    {
+        m_refData = new wxBitmapRefData();
+
+        GdkBitmap *mask = (GdkBitmap*) NULL;
+        GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
+
+        M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( parent, &mask, NULL, name );
+
+        if (mask)
+        {
+           M_BMPDATA->m_mask = new wxMask();
+           M_BMPDATA->m_mask->m_bitmap = mask;
+        }
+
+        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)
+    {
+        wxImage image;
+        image.LoadFile( name, type );
+        if (image.Ok()) *this = image.ConvertToBitmap();
+    }
+    else
+        return FALSE;
+
+    return TRUE;
+}
+
+wxPalette *wxBitmap::GetPalette(void) const
 {
-  if (!Ok()) return;
-  if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
-  M_BMPDATA->m_mask = mask;
-};
+    if (!Ok()) return (wxPalette *) NULL;
+
+    return M_BMPDATA->m_palette;
+}
 
-bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), const int WXUNUSED(type), 
-  wxPalette *WXUNUSED(palette) )
+void wxBitmap::SetHeight( int height )
 {
-  return FALSE;
-};
+    if (!m_refData) m_refData = new wxBitmapRefData();
+
+    M_BMPDATA->m_height = height;
+}
 
-bool wxBitmap::LoadFile( const wxString &name, const int WXUNUSED(type) )
+void wxBitmap::SetWidth( int width )
 {
-#ifdef USE_GDK_IMLIB
+    if (!m_refData) m_refData = new wxBitmapRefData();
 
-  UnRef();
-  m_refData = new wxBitmapRefData();
-  M_BMPDATA->m_mask = NULL;
+    M_BMPDATA->m_width = width;
+}
 
-  GdkBitmap *mask = NULL;
-  
-  int res = gdk_imlib_load_file_to_pixmap( WXSTRINGCAST name, &M_BMPDATA->m_pixmap, &mask );
+void wxBitmap::SetDepth( int depth )
+{
+    if (!m_refData) m_refData = new wxBitmapRefData();
 
-  if (res != 1)
-  {
-    UnRef();
-    return FALSE;
-  };
-
-  if (mask)
-  {
-    M_BMPDATA->m_mask = new wxMask();
-    M_BMPDATA->m_mask->m_bitmap = mask;
-  }
-				  
-  gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
-  M_BMPDATA->m_bpp = 24; // ?
-  
-  return TRUE;
-#endif
+    M_BMPDATA->m_bpp = depth;
+}
 
-  return FALSE;
-};
-        
-wxPalette *wxBitmap::GetPalette(void) const
+void wxBitmap::SetPixmap( GdkPixmap *pixmap )
 {
-  if (!Ok()) return NULL;
-  return M_BMPDATA->m_palette;
-};
+    if (!m_refData) m_refData = new wxBitmapRefData();
+
+    M_BMPDATA->m_pixmap = pixmap;
+}
 
 GdkPixmap *wxBitmap::GetPixmap(void) const
 {
-  if (!Ok()) return NULL;
-  return M_BMPDATA->m_pixmap;
-};
-  
+    wxCHECK_MSG( Ok(), (GdkPixmap *) NULL, "invalid bitmap" );
+
+    return M_BMPDATA->m_pixmap;
+}
+
 GdkBitmap *wxBitmap::GetBitmap(void) const
 {
-  if (!Ok()) return NULL;
-  return M_BMPDATA->m_bitmap;
-};
-  
+    wxCHECK_MSG( Ok(), (GdkBitmap *) NULL, "invalid bitmap" );
+
+    return M_BMPDATA->m_bitmap;
+}
+
+