X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33d0b396b23cc198d6966d2ae4bd03762821e56c..406291e530b14c6a2f4537ce59647d88b3ccde7c:/src/gtk/bitmap.cpp

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index d2241e591d..e715481f32 100644
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/bitmap.h"
+#include "wx/icon.h"
 #include "gdk/gdkprivate.h"
 
 #ifdef USE_GDK_IMLIB
@@ -28,19 +29,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask,wxObject)
 wxMask::wxMask(void)
 {
   m_bitmap = NULL;
-};
+}
 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), const wxColour& WXUNUSED(colour) )
 {
-};
+}
 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap), int WXUNUSED(paletteIndex) )
 {
-};
+}
 
 wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
 {
-};
+}
 
 wxMask::~wxMask(void)
 {
@@ -49,12 +50,12 @@ wxMask::~wxMask(void)
 #else
   if (m_bitmap) gdk_bitmap_unref( m_bitmap );
 #endif  
-};
+}
 
 GdkBitmap *wxMask::GetBitmap(void) const
 {
   return m_bitmap;
-};
+}
   
 //-----------------------------------------------------------------------------
 // wxBitmap
@@ -92,7 +93,7 @@ wxBitmapRefData::wxBitmapRefData(void)
 #ifdef USE_GDK_IMLIB
   m_image = NULL;
 #endif
-};
+}
 
 wxBitmapRefData::~wxBitmapRefData(void)
 {
@@ -105,7 +106,7 @@ wxBitmapRefData::~wxBitmapRefData(void)
   if (m_bitmap) gdk_bitmap_unref( m_bitmap );
   if (m_mask) delete m_mask;
   if (m_palette) delete m_palette;
-};
+}
 
 //-----------------------------------------------------------------------------
 
@@ -116,7 +117,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 wxBitmap::wxBitmap(void)
 {
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+}
   
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
@@ -129,7 +130,7 @@ wxBitmap::wxBitmap( int width, int height, int depth )
   M_BMPDATA->m_bpp = depth;
    
   if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-};
+}
 
 wxBitmap::wxBitmap( char **bits )
 {
@@ -146,7 +147,7 @@ wxBitmap::wxBitmap( char **bits )
   {
     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) );
   
@@ -160,26 +161,28 @@ wxBitmap::wxBitmap( char **bits )
   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);
-};
+}
 
 wxBitmap::wxBitmap( const wxString &filename, int type )
 {
   LoadFile( filename, type );
-};
+  
+  if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
 
 // CMB 15/5/98: add constructor for xbm bitmaps
 wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
@@ -199,72 +202,72 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
 wxBitmap::~wxBitmap(void)
 {
   if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);
-};
+}
   
 wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
 {
   if (*this == bmp) return (*this); 
   Ref( bmp ); 
   return *this; 
-};
+}
   
 bool wxBitmap::operator == ( const wxBitmap& bmp )
 {
   return m_refData == bmp.m_refData; 
-};
+}
   
 bool wxBitmap::operator != ( const wxBitmap& bmp )
 {
   return m_refData != bmp.m_refData; 
-};
+}
   
 bool wxBitmap::Ok(void) const
 {
   return m_refData != NULL;
-};
+}
   
 int wxBitmap::GetHeight(void) const
 {
   if (!Ok()) return 0;
   return M_BMPDATA->m_height;
-};
+}
 
 int wxBitmap::GetWidth(void) const
 {
   if (!Ok()) return 0;
   return M_BMPDATA->m_width;
-};
+}
 
 int wxBitmap::GetDepth(void) const
 {
   if (!Ok()) return 0;
   return M_BMPDATA->m_bpp;
-};
+}
 
 void wxBitmap::SetHeight( int height )
 {
   if (!Ok()) return;
   M_BMPDATA->m_height = height;
-};
+}
 
 void wxBitmap::SetWidth( int width )
 {
   if (!Ok()) return;
   M_BMPDATA->m_width = width;
-};
+}
 
 void wxBitmap::SetDepth( int depth )
 {
   if (!Ok()) return;
   M_BMPDATA->m_bpp = depth;
-};
+}
 
 wxMask *wxBitmap::GetMask(void) const
 {
   if (!Ok()) return NULL;
   
   return M_BMPDATA->m_mask;
-};
+}
 
 void wxBitmap::SetMask( wxMask *mask )
 {
@@ -272,7 +275,7 @@ void wxBitmap::SetMask( wxMask *mask )
   
   if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
   M_BMPDATA->m_mask = mask;
-};
+}
 
 void wxBitmap::Resize( int height, int width )
 {
@@ -296,7 +299,7 @@ void wxBitmap::Resize( int height, int width )
   Render();
   
 #endif
-};
+}
 
 bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type), 
   wxPalette *WXUNUSED(palette) )
@@ -312,7 +315,7 @@ bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
 #endif
 
   return FALSE;
-};
+}
 
 bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
 {
@@ -327,7 +330,7 @@ bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
   {
     UnRef();
     return FALSE;
-  };
+  }
 
   Render();
 				  
@@ -338,26 +341,26 @@ bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
 #endif
 
   return FALSE;
-};
+}
         
 wxPalette *wxBitmap::GetPalette(void) const
 {
   if (!Ok()) return NULL;
   return M_BMPDATA->m_palette;
-};
+}
 
 GdkPixmap *wxBitmap::GetPixmap(void) const
 {
   if (!Ok()) return NULL;
   return M_BMPDATA->m_pixmap;
-};
+}
   
 GdkBitmap *wxBitmap::GetBitmap(void) const
 {
   if (!Ok()) return NULL;
   
   return M_BMPDATA->m_bitmap;
-};
+}
   
 void wxBitmap::DestroyImage(void)
 {
@@ -367,12 +370,12 @@ void wxBitmap::DestroyImage(void)
   {
     gdk_imlib_destroy_image( M_BMPDATA->m_image );
     M_BMPDATA->m_image = NULL;
-  };
-};
+  }
+}
 
 void wxBitmap::RecreateImage(void)
 {
-};
+}
 
 void wxBitmap::Render(void)
 {
@@ -389,9 +392,9 @@ void wxBitmap::Render(void)
   {
     M_BMPDATA->m_mask = new wxMask();
     M_BMPDATA->m_mask->m_bitmap = mask;
-  };
+  }
   
 #endif
-};
+}