moved wxDash typedef to gdicmn.h

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index bbde88901498891389b2f360631430c60bf34420..38d20c606c888972066faadf1ef693768dbc95a8 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -92,7 +92,9 @@ bool wxMask::Create( const wxBitmap& bitmap,
     unsigned char green = colour.Green();
     unsigned char blue = colour.Blue();
 
-    GdkVisual *visual = gdk_visual_get_system();
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
     int bpp = visual->depth;
     if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
     if (bpp == 15)
@@ -241,12 +243,24 @@ wxBitmap::wxBitmap()
 
 wxBitmap::wxBitmap( int width, int height, int depth )
 {
-    wxCHECK_RET( (width > 0) && (height > 0), wxT("invalid bitmap size") )
+    Create( width, height, depth );
 
-    if (depth == -1) depth = gdk_window_get_visual( wxRootWindow->window )->depth;
+    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+}
+
+bool wxBitmap::Create( int width, int height, int depth )
+{
+    UnRef();
 
-    wxCHECK_RET( (depth ==  gdk_window_get_visual( wxRootWindow->window )->depth) ||
-                 (depth == 1), wxT("invalid bitmap depth") )
+    wxCHECK_MSG( (width > 0) && (height > 0), FALSE, wxT("invalid bitmap size") )
+
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+
+    if (depth == -1) depth = visual->depth;
+
+    wxCHECK_MSG( (depth == visual->depth) ||
+                 (depth == 1), FALSE, wxT("invalid bitmap depth") )
 
     m_refData = new wxBitmapRefData();
     M_BMPDATA->m_mask = (wxMask *) NULL;
@@ -260,16 +274,18 @@ wxBitmap::wxBitmap( int width, int height, int depth )
     else
     {
         M_BMPDATA->m_pixmap = gdk_pixmap_new( wxRootWindow->window, width, height, depth );
-        M_BMPDATA->m_bpp = gdk_window_get_visual( wxRootWindow->window )->depth;
+        M_BMPDATA->m_bpp = visual->depth;
     }
 
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+    return Ok();
 }
-
 bool wxBitmap::CreateFromXpm( const char **bits )
 {
     wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
 
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
     m_refData = new wxBitmapRefData();
 
     GdkBitmap *mask = (GdkBitmap*) NULL;
@@ -286,7 +302,8 @@ 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 = gdk_window_get_visual( wxRootWindow->window )->depth;  // ?
+    M_BMPDATA->m_bpp = visual->depth;  // ?
+    
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 
     return TRUE;
@@ -443,6 +460,9 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
 
     if (!wxFileExists(name)) return FALSE;
 
+    GdkVisual *visual = gdk_window_get_visual( wxRootWindow->window );
+    wxASSERT( visual );
+    
     if (type == wxBITMAP_TYPE_XPM)
     {
         m_refData = new wxBitmapRefData();
@@ -458,7 +478,8 @@ 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( wxRootWindow->window )->depth;
+        
+        M_BMPDATA->m_bpp = visual->depth;
     }
     else // try if wxImage can load it
     {