Added wxBitmap::GetSubBitmap()

  Correct images in gen. dir dlg.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 2917413d439611dfeefd36358faeb0973e9037c7..9e37103faeeb72df3742e823d60c940f7b580a57 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -80,6 +80,8 @@ public:
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
+    
+    wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
     bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
     bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM );

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 2917413d439611dfeefd36358faeb0973e9037c7..9e37103faeeb72df3742e823d60c940f7b580a57 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -80,6 +80,8 @@ public:
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
+    
+    wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
     bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
     bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM );

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index c9985fad5ef1e2bd700f3222ac15ed555b7e0abb..6d63802c5fea45e7e038d113efc645f9286c333f 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -212,10 +212,17 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
   dc.SetPen( *wxWHITE_PEN );
   dc.DrawRectangle( 150, 30, 100, 100 );
 
-  if (my_anti && my_anti->Ok()) dc.DrawBitmap( *my_anti, 250, 140 );
+  if (my_anti && my_anti->Ok()) dc.DrawBitmap( *my_anti, 280, 30 );
 
   dc.DrawText( "PNG handler", 30, 135 );
-  if (my_horse_png && my_horse_png->Ok()) dc.DrawBitmap( *my_horse_png, 30, 150 );
+  if (my_horse_png && my_horse_png->Ok())
+  { 
+    dc.DrawBitmap( *my_horse_png, 30, 150 );
+    wxRect rect(0,0,100,100);
+    wxBitmap sub( my_horse_png->GetSubBitmap(rect) );
+    dc.DrawText( "GetSubBitmap()", 280, 190 );
+    dc.DrawBitmap( sub, 280, 210 );
+  }
 
   dc.DrawText( "JPEG handler", 30, 365 );
   if (my_horse_jpeg && my_horse_jpeg->Ok()) dc.DrawBitmap( *my_horse_jpeg, 30, 380 );

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index d5b8014cbf0cbea56b78be50c6c74781298734b4..ba118204be019390aff54238d03caadd9e1bcac4 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -225,11 +225,12 @@ void wxDirCtrl::CreateItems(const wxTreeItemId &parent)
 
     for (unsigned int i=0; i<m_paths.Count(); i++)
     {
-  dir_item = new wxDirItemData(m_paths[i],m_names[i]);
+        dir_item = new wxDirItemData(m_paths[i],m_names[i]);
 #ifdef __WXMSW__
-  id = AppendItem( parent, m_names[i], -1, -1, dir_item);
+        id = AppendItem( parent, m_names[i], -1, -1, dir_item);
 #else
-  id = AppendItem( parent, m_names[i], 0, 1, dir_item);
+        id = AppendItem( parent, m_names[i], 0, -1, dir_item);
+       SetItemImage( id, 1, wxTreeItemIcon_Expanded );
 #endif
         if (dir_item->m_hasSubDirs) SetItemHasChildren(id);
     }

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 572a176c3bd96ccddb17f10957d5c85cbd577fda..919af2c170fe24c60e7683b14f960d795b5f7a06 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -366,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") );

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 572a176c3bd96ccddb17f10957d5c85cbd577fda..919af2c170fe24c60e7683b14f960d795b5f7a06 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -366,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") );