removed testing code from wxLongLong

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 59428e90247ea6501f43bec013cb5e2793f0d067..919af2c170fe24c60e7683b14f960d795b5f7a06 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -245,9 +245,9 @@ wxBitmap::wxBitmap( int width, int height, int depth )
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 }
 
-wxBitmap::wxBitmap( const char **bits )
+bool wxBitmap::CreateFromXpm( const char **bits )
 {
-    wxCHECK_RET( bits != NULL, wxT("invalid bitmap data") )
+    wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
 
     m_refData = new wxBitmapRefData();
 
@@ -256,30 +256,7 @@ wxBitmap::wxBitmap( const char **bits )
 
     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 )
-{
-    wxCHECK_RET( bits != NULL, wxT("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, wxT("couldn't create pixmap") );
+    wxCHECK_MSG( M_BMPDATA->m_pixmap, FALSE, wxT("couldn't create pixmap") );
 
     if (mask)
     {
@@ -291,6 +268,8 @@ wxBitmap::wxBitmap( char **bits )
 
     M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;  // ?
     if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
+
+    return TRUE;
 }
 
 wxBitmap::wxBitmap( const wxBitmap& bmp )
@@ -387,6 +366,45 @@ void wxBitmap::SetMask( wxMask *mask )
     M_BMPDATA->m_mask = mask;
 }
 
+wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
+{
+    wxCHECK_MSG( Ok() &&
+                 (rect.x >= 0) && (rect.y >= 0) && 
+                (rect.x+rect.width <= M_BMPDATA->m_width) && (rect.y+rect.height <= M_BMPDATA->m_height),
+                 wxNullBitmap, wxT("invalid bitmap or bitmap region") );
+    
+    wxBitmap ret( rect.width, rect.height, M_BMPDATA->m_bpp );
+    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
+    
+    if (ret.GetPixmap())
+    {
+        GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
+       gdk_draw_pixmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+       gdk_gc_destroy( gc );
+    }
+    else
+    {
+        GdkGC *gc = gdk_gc_new( ret.GetBitmap() );
+       gdk_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+       gdk_gc_destroy( gc );
+    }
+    
+    if (GetMask())
+    {
+        wxMask *mask = new wxMask;
+        GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
+        mask->m_bitmap = gdk_pixmap_new( parent, rect.width, rect.height, 1 );
+       
+        GdkGC *gc = gdk_gc_new( mask->m_bitmap );
+       gdk_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, 0, 0, rect.x, rect.y, rect.width, rect.height );
+       gdk_gc_destroy( gc );
+       
+       ret.SetMask( mask );
+    }
+    
+    return ret;
+}
+
 bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );