fixes for compilation with wxUSE_PALETTE=0

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 170e8daf4f09e5698c25acf8ee8d160e81d9d6d7..1f62c2a11be98d0aff1282aed4a3abe3aa55ff8d 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -11,6 +11,9 @@
 #pragma implementation "bitmap.h"
 #endif
 
 #pragma implementation "bitmap.h"
 #endif
 

+#include "wx/defs.h"
+
+#include "wx/palette.h"

 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"


@@ -40,7 +43,7 @@ extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern GtkWidget *wxRootWindow;
+extern GtkWidget *wxGetRootWindow();

 
 //-----------------------------------------------------------------------------
 // wxMask
 
 //-----------------------------------------------------------------------------
 // wxMask


@@ -89,7 +92,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
     wxImage image( bitmap );
     if (!image.Ok()) return FALSE;
 
     wxImage image( bitmap );
     if (!image.Ok()) return FALSE;
 

-    m_bitmap = gdk_pixmap_new( wxRootWindow->window, image.GetWidth(), image.GetHeight(), 1 );
+    m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );

     GdkGC *gc = gdk_gc_new( m_bitmap );
 
     GdkColor color;
     GdkGC *gc = gdk_gc_new( m_bitmap );
 
     GdkColor color;


@@ -108,9 +111,9 @@ bool wxMask::Create( const wxBitmap& bitmap,
     unsigned char green = colour.Green();
     unsigned char blue = colour.Blue();
 
     unsigned char green = colour.Green();
     unsigned char blue = colour.Blue();
 

-    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );

     wxASSERT( visual );
     wxASSERT( visual );

-    
+

     int bpp = visual->depth;
     if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
     if (bpp == 15)
     int bpp = visual->depth;
     if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
     if (bpp == 15)


@@ -170,7 +173,7 @@ bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
     wxPalette *pal = bitmap.GetPalette();
 
     wxCHECK_MSG( pal, FALSE, wxT("Cannot create mask from bitmap without palette") );
     wxPalette *pal = bitmap.GetPalette();
 
     wxCHECK_MSG( pal, FALSE, wxT("Cannot create mask from bitmap without palette") );

-    
+

     pal->GetRGB(paletteIndex, &r, &g, &b);
 
     return Create(bitmap, wxColour(r, g, b));
     pal->GetRGB(paletteIndex, &r, &g, &b);
 
     return Create(bitmap, wxColour(r, g, b));


@@ -188,7 +191,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
 
     wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") );
 
 
     wxCHECK_MSG( bitmap.GetBitmap(), FALSE, wxT("Cannot create mask from colour bitmap") );
 

-    m_bitmap = gdk_pixmap_new( wxRootWindow->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );
+    m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, bitmap.GetWidth(), bitmap.GetHeight(), 1 );

 
     if (!m_bitmap) return FALSE;
 
 
     if (!m_bitmap) return FALSE;
 


@@ -252,14 +255,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxGDIObject)
 
 wxBitmap::wxBitmap()
 {
 
 wxBitmap::wxBitmap()
 {

-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
     Create( width, height, depth );
 }
 
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
     Create( width, height, depth );

-
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

 }
 
 bool wxBitmap::Create( int width, int height, int depth )
 }
 
 bool wxBitmap::Create( int width, int height, int depth )


@@ -268,7 +268,7 @@ bool wxBitmap::Create( int width, int height, int depth )
 
     wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
 
 
     wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
 

-    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );

     wxASSERT( visual );
 
     if (depth == -1) depth = visual->depth;
     wxASSERT( visual );
 
     if (depth == -1) depth = visual->depth;


@@ -282,12 +282,12 @@ bool wxBitmap::Create( int width, int height, int depth )
     M_BMPDATA->m_height = height;
     if (depth == 1)
     {
     M_BMPDATA->m_height = height;
     if (depth == 1)
     {

-        M_BMPDATA->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
+        M_BMPDATA->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );

         M_BMPDATA->m_bpp = 1;
     }
     else
     {
         M_BMPDATA->m_bpp = 1;
     }
     else
     {

-        M_BMPDATA->m_pixmap = gdk_pixmap_new( wxRootWindow->window, width, height, depth );
+        M_BMPDATA->m_pixmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, depth );

         M_BMPDATA->m_bpp = visual->depth;
     }
 
         M_BMPDATA->m_bpp = visual->depth;
     }
 


@@ -298,14 +298,14 @@ bool wxBitmap::CreateFromXpm( const char **bits )
 {
     wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
 
 {
     wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
 

-    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );

     wxASSERT( visual );
     wxASSERT( visual );

-    
+

     m_refData = new wxBitmapRefData();
 
     GdkBitmap *mask = (GdkBitmap*) NULL;
 
     m_refData = new wxBitmapRefData();
 
     GdkBitmap *mask = (GdkBitmap*) NULL;
 

-    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &mask, NULL, (gchar **) bits );
+    M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, (gchar **) bits );

 
     wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") );
 
 
     wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") );
 


@@ -318,22 +318,16 @@ bool wxBitmap::CreateFromXpm( const char **bits )
     gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
 
     M_BMPDATA->m_bpp = visual->depth;  // ?
     gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
 
     M_BMPDATA->m_bpp = visual->depth;  // ?

-    
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-extern GtkWidget *wxRootWindow;
-

 bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 {
     wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
     wxCHECK_MSG( depth == -1 || depth == 1, FALSE, wxT("invalid bitmap depth") )
 
     m_refData = new wxBitmapRefData();
 bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 {
     wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
     wxCHECK_MSG( depth == -1 || depth == 1, FALSE, wxT("invalid bitmap depth") )
 
     m_refData = new wxBitmapRefData();

-      
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

 
     // ------
     // convertion to mono bitmap:
 
     // ------
     // convertion to mono bitmap:


@@ -346,11 +340,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         SetHeight( height );
         SetWidth( width );
 
         SetHeight( height );
         SetWidth( width );
 

-        SetBitmap( gdk_pixmap_new( wxRootWindow->window, width, height, 1 ) );
+        SetBitmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 ) );

 
         SetDepth( 1 );
 
 
         SetDepth( 1 );
 

-        GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+        GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );

         wxASSERT( visual );
 
         // Create picture image
         wxASSERT( visual );
 
         // Create picture image


@@ -371,7 +365,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
             mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
 
             wxMask *mask = new wxMask();
             mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
 
             wxMask *mask = new wxMask();

-            mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
+            mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );

 
             SetMask( mask );
         }
 
             SetMask( mask );
         }


@@ -431,7 +425,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
             gdk_gc_unref( mask_gc );
         }
     }
             gdk_gc_unref( mask_gc );
         }
     }

-    
+

     // ------
     // convertion to colour bitmap:
     // ------
     // ------
     // convertion to colour bitmap:
     // ------


@@ -443,11 +437,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
         SetHeight( height );
         SetWidth( width );
 
         SetHeight( height );
         SetWidth( width );
 

-        SetPixmap( gdk_pixmap_new( wxRootWindow->window, width, height, -1 ) );
+        SetPixmap( gdk_pixmap_new( wxGetRootWindow()->window, width, height, -1 ) );

 
         // Retrieve depth
 
 
         // Retrieve depth
 

-        GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+        GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );

         wxASSERT( visual );
 
         int bpp = visual->depth;
         wxASSERT( visual );
 
         int bpp = visual->depth;


@@ -501,7 +495,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
             mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
 
             wxMask *mask = new wxMask();
             mask_image =  gdk_image_new_bitmap( visual, mask_data, width, height );
 
             wxMask *mask = new wxMask();

-            mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, width, height, 1 );
+            mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, width, height, 1 );

 
             SetMask( mask );
         }
 
             SetMask( mask );
         }


@@ -636,7 +630,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 wxImage wxBitmap::ConvertToImage() const
 {
     wxImage image;
 wxImage wxBitmap::ConvertToImage() const
 {
     wxImage image;

-    
+

     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
     GdkImage *gdk_image = (GdkImage*) NULL;
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
     GdkImage *gdk_image = (GdkImage*) NULL;


@@ -657,7 +651,7 @@ wxImage wxBitmap::ConvertToImage() const
     }
 
     wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") );
     }
 
     wxCHECK_MSG( gdk_image, wxNullImage, wxT("couldn't create image") );

-    
+

     image.Create( GetWidth(), GetHeight() );
     char unsigned *data = image.GetData();
 
     image.Create( GetWidth(), GetHeight() );
     char unsigned *data = image.GetData();
 


@@ -691,7 +685,7 @@ wxImage wxBitmap::ConvertToImage() const
     {
         GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
 
     {
         GdkVisual *visual = gdk_window_get_visual( GetPixmap() );
 

-        if (visual == NULL) visual = gdk_window_get_visual( wxRootWindow->window );
+        if (visual == NULL) visual = gdk_window_get_visual( wxGetRootWindow()->window );

         bpp = visual->depth;
         if (bpp == 16) bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
         red_shift_right = visual->red_shift;
         bpp = visual->depth;
         if (bpp == 16) bpp = visual->red_prec + visual->green_prec + visual->blue_prec;
         red_shift_right = visual->red_shift;


@@ -765,7 +759,7 @@ wxImage wxBitmap::ConvertToImage() const
     }
 
     gdk_image_destroy( gdk_image );
     }
 
     gdk_image_destroy( gdk_image );

-    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );    
+    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );

 
     return image;
 }
 
     return image;
 }


@@ -773,15 +767,11 @@ wxImage wxBitmap::ConvertToImage() const
 wxBitmap::wxBitmap( const wxBitmap& bmp )
 {
     Ref( bmp );
 wxBitmap::wxBitmap( const wxBitmap& bmp )
 {
     Ref( bmp );

-
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::wxBitmap( const wxString &filename, int type )
 {
     LoadFile( filename, type );
 }
 
 wxBitmap::wxBitmap( const wxString &filename, int type )
 {
     LoadFile( filename, type );

-
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
 }
 
 wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))


@@ -790,25 +780,23 @@ wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth
 
     M_BMPDATA->m_mask = (wxMask *) NULL;
     M_BMPDATA->m_bitmap =
 
     M_BMPDATA->m_mask = (wxMask *) NULL;
     M_BMPDATA->m_bitmap =

-      gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) bits, width, height );
+      gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, width, height );

     M_BMPDATA->m_width = width;
     M_BMPDATA->m_height = height;
     M_BMPDATA->m_bpp = 1;
 
     wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );
     M_BMPDATA->m_width = width;
     M_BMPDATA->m_height = height;
     M_BMPDATA->m_bpp = 1;
 
     wxCHECK_RET( M_BMPDATA->m_bitmap, wxT("couldn't create bitmap") );

-
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::~wxBitmap()
 {
 }
 
 wxBitmap::~wxBitmap()
 {

-    if (wxTheBitmapList) wxTheBitmapList->DeleteObject(this);

 }
 
 wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
 {
 }
 
 wxBitmap& wxBitmap::operator = ( const wxBitmap& bmp )
 {

-    if (*this == bmp) return (*this);
-    Ref( bmp );
+    if ( m_refData != bmp.m_refData )
+        Ref( bmp );
+

     return *this;
 }
 
     return *this;
 }
 


@@ -864,6 +852,12 @@ void wxBitmap::SetMask( wxMask *mask )
     M_BMPDATA->m_mask = mask;
 }
 
     M_BMPDATA->m_mask = mask;
 }
 

+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+{
+    *this = icon;
+    return TRUE;
+}
+

 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {
     wxCHECK_MSG( Ok() &&
 wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 {
     wxCHECK_MSG( Ok() &&


@@ -890,7 +884,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     if (GetMask())
     {
         wxMask *mask = new wxMask;
     if (GetMask())
     {
         wxMask *mask = new wxMask;

-        mask->m_bitmap = gdk_pixmap_new( wxRootWindow->window, rect.width, rect.height, 1 );
+        mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );

 
         GdkGC *gc = gdk_gc_new( mask->m_bitmap );
         gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );
 
         GdkGC *gc = gdk_gc_new( mask->m_bitmap );
         gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );


@@ -921,16 +915,16 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
 
     if (!wxFileExists(name)) return FALSE;
 
 
     if (!wxFileExists(name)) return FALSE;
 

-    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    GdkVisual *visual = gdk_window_get_visual( wxGetRootWindow()->window );

     wxASSERT( visual );
     wxASSERT( visual );

-    
+

     if (type == wxBITMAP_TYPE_XPM)
     {
         m_refData = new wxBitmapRefData();
 
         GdkBitmap *mask = (GdkBitmap*) NULL;
 
     if (type == wxBITMAP_TYPE_XPM)
     {
         m_refData = new wxBitmapRefData();
 
         GdkBitmap *mask = (GdkBitmap*) NULL;
 

-        M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxRootWindow->window, &mask, NULL, name.fn_str() );
+        M_BMPDATA->m_pixmap = gdk_pixmap_create_from_xpm( wxGetRootWindow()->window, &mask, NULL, name.fn_str() );

 
         if (mask)
         {
 
         if (mask)
         {


@@ -939,7 +933,7 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
         }
 
         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;
     }
     else // try if wxImage can load it
         M_BMPDATA->m_bpp = visual->depth;
     }
     else // try if wxImage can load it