Added wxAccelerators (sort of)

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

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 2180a0cf92ca0a986ce688e02437593958b108a2..b06f111e55edc921f33db0902a253c02aab38b6b 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/bitmap.h"
 #endif
 
 #include "wx/bitmap.h"

+#include "wx/icon.h"

 #include "gdk/gdkprivate.h"
 
 #ifdef USE_GDK_IMLIB
 #include "gdk/gdkprivate.h"
 
 #ifdef USE_GDK_IMLIB


@@ -27,7 +28,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 
 wxMask::wxMask(void)
 {
 
 wxMask::wxMask(void)
 {

-  m_bitmap = NULL;
+  m_bitmap = (GdkBitmap *) NULL;

 }
 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour) )
 }
 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour) )


@@ -82,15 +83,15 @@ class wxBitmapRefData: public wxObjectRefData
 
 wxBitmapRefData::wxBitmapRefData(void)
 {
 
 wxBitmapRefData::wxBitmapRefData(void)
 {

-  m_pixmap = NULL;
-  m_bitmap = NULL;
-  m_mask = NULL;
+  m_pixmap = (GdkPixmap *) NULL;
+  m_bitmap = (GdkBitmap *) NULL;
+  m_mask = (wxMask *) NULL;

   m_width = 0;
   m_height = 0;
   m_bpp = 0;
   m_width = 0;
   m_height = 0;
   m_bpp = 0;

-  m_palette = NULL;
+  m_palette = (wxPalette *) NULL;

 #ifdef USE_GDK_IMLIB
 #ifdef USE_GDK_IMLIB

-  m_image = NULL;
+  m_image = (GdkImlibImage *) NULL;

 #endif
 }
 
 #endif
 }
 


@@ -98,7 +99,7 @@ wxBitmapRefData::~wxBitmapRefData(void)
 {
 #ifdef USE_GDK_IMLIB
   if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
 {
 #ifdef USE_GDK_IMLIB
   if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );

-  if (m_image) gdk_imlib_destroy_image( m_image );
+  if (m_image) gdk_imlib_kill_image( m_image );

 #else
   if (m_pixmap) gdk_pixmap_unref( m_pixmap );
 #endif
 #else
   if (m_pixmap) gdk_pixmap_unref( m_pixmap );
 #endif


@@ -121,7 +122,7 @@ wxBitmap::wxBitmap(void)
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
   m_refData = new wxBitmapRefData();
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
   m_refData = new wxBitmapRefData();

-  M_BMPDATA->m_mask = NULL;
+  M_BMPDATA->m_mask = (wxMask *) NULL;

   M_BMPDATA->m_pixmap = 
     gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, width, height, depth );
   M_BMPDATA->m_width = width;
   M_BMPDATA->m_pixmap = 
     gdk_pixmap_new( (GdkWindow*) &gdk_root_parent, width, height, depth );
   M_BMPDATA->m_width = width;


@@ -188,7 +189,7 @@ 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_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_bitmap = 
     gdk_bitmap_create_from_data( (GdkWindow*) &gdk_root_parent, (gchar *) bits, width, height );
   M_BMPDATA->m_width = width;


@@ -263,7 +264,7 @@ void wxBitmap::SetDepth( int depth )
 
 wxMask *wxBitmap::GetMask(void) const
 {
 
 wxMask *wxBitmap::GetMask(void) const
 {

-  if (!Ok()) return NULL;
+  if (!Ok()) return (wxMask *) NULL;

   
   return M_BMPDATA->m_mask;
 }
   
   return M_BMPDATA->m_mask;
 }


@@ -309,7 +310,7 @@ bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
   
   if (!M_BMPDATA->m_image) RecreateImage();
   
   
   if (!M_BMPDATA->m_image) RecreateImage();
   

-  return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, NULL );
+  return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, (GdkImlibSaveInfo *) NULL );

 
 #endif
 
 
 #endif
 


@@ -344,19 +345,19 @@ bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
         
 wxPalette *wxBitmap::GetPalette(void) const
 {
         
 wxPalette *wxBitmap::GetPalette(void) const
 {

-  if (!Ok()) return NULL;
+  if (!Ok()) return (wxPalette *) NULL;

   return M_BMPDATA->m_palette;
 }
 
 GdkPixmap *wxBitmap::GetPixmap(void) const
 {
   return M_BMPDATA->m_palette;
 }
 
 GdkPixmap *wxBitmap::GetPixmap(void) const
 {

-  if (!Ok()) return NULL;
+  if (!Ok()) return (GdkPixmap *) NULL;

   return M_BMPDATA->m_pixmap;
 }
   
 GdkBitmap *wxBitmap::GetBitmap(void) const
 {
   return M_BMPDATA->m_pixmap;
 }
   
 GdkBitmap *wxBitmap::GetBitmap(void) const
 {

-  if (!Ok()) return NULL;
+  if (!Ok()) return (GdkBitmap *) NULL;

   
   return M_BMPDATA->m_bitmap;
 }
   
   return M_BMPDATA->m_bitmap;
 }


@@ -368,7 +369,7 @@ void wxBitmap::DestroyImage(void)
   if (M_BMPDATA->m_image)
   {
     gdk_imlib_destroy_image( M_BMPDATA->m_image );
   if (M_BMPDATA->m_image)
   {
     gdk_imlib_destroy_image( M_BMPDATA->m_image );

-    M_BMPDATA->m_image = NULL;
+    M_BMPDATA->m_image = (GdkImlibImage *) NULL;

   }
 }
 
   }
 }