moved some more stuff from .cpp files to here

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

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index a6c24d9c068a3d80e4270889f45e23017f411f04..25b7778b1c7df307a344ad7f711905dafdaa9563 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -11,7 +11,7 @@
 #ifndef __GTKBITMAPH__
 #define __GTKBITMAPH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
@@ -84,6 +84,9 @@ public:
     
     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 );
     
@@ -93,8 +96,10 @@ public:
     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
     // --------------