fixed modal dialogs after event loop change

[wxWidgets.git] / include / wx / gtk / bitmap.h

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index a6c24d9c068a3d80e4270889f45e23017f411f04..5ba80bf85f4b992257b201df21f5e306386b5a6c 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -11,7 +11,7 @@
 #ifndef __GTKBITMAPH__
 #define __GTKBITMAPH__
 
 #ifndef __GTKBITMAPH__
 #define __GTKBITMAPH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -84,6 +84,9 @@ public:
     
     wxImage ConvertToImage() const;
 
     
     wxImage ConvertToImage() const;
 

+    // copies the contents and mask of the given (colour) icon to the bitmap
+    virtual bool CopyFromIcon(const wxIcon& icon);
+

     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
     
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
     


@@ -93,8 +96,10 @@ public:
     bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM );
 
     wxPalette *GetPalette() const;
     bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM );
 
     wxPalette *GetPalette() const;

-    wxPalette *GetColourMap() const
-    { return GetPalette(); };
+    wxPalette *GetColourMap() const { return GetPalette(); };
+
+    static void InitStandardHandlers() { }
+    static void CleanUpHandlers() { }

 
     // implementation
     // --------------
 
     // implementation
     // --------------