fix for wxComboBox::GetSelection from inside event handler

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index f0ad2fe56bb98c900c7fc78f7c7f9c92e44c45b0..e104eb7e82bde8bc90e0985e8d5adc9af9529ca5 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -11,6 +11,9 @@
 #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"
@@ -324,7 +327,6 @@ bool wxBitmap::CreateFromXpm( const char **bits )
     return TRUE;
 }
 
-
 bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
 {
     wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
@@ -863,6 +865,12 @@ void wxBitmap::SetMask( wxMask *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() &&