Add GetDrawable convenience function that returns m_bitmap

if the wxBitmap is monochrome or m_pixmap if the wxBitmap
is polichrome.

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

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 9cf410f3c42acd460bd8436a49c66f4069479627..f4c69428ef0a790c62d52f3fc0814809dcbae226 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -130,7 +130,9 @@ public:
 
     WXPixmap GetPixmap() const;
     WXPixmap GetBitmap() const;
-    
+
+    WXPixmap GetDrawable() const;
+
     WXDisplay *GetDisplay() const;
     
 protected:

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index b8c6b31ec74bc0be2b11483ce11bc040df92330b..b2edff7387452dba52a72d50477475c2a3bce5b7 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -1107,6 +1107,13 @@ WXPixmap wxBitmap::GetBitmap() const
     return M_BMPDATA->m_bitmap;
 }
 
+WXPixmap wxBitmap::GetDrawable() const
+{
+    wxCHECK_MSG( Ok(), (WXPixmap) NULL, wxT("invalid bitmap") );
+
+    return M_BMPDATA->m_bpp == 1 ? M_BMPDATA->m_bitmap : M_BMPDATA->m_pixmap;
+}
+
 WXDisplay *wxBitmap::GetDisplay() const
 {
     wxCHECK_MSG( Ok(), (WXDisplay*) NULL, wxT("invalid bitmap") );