Made icons configurable via a wxMApp virtual function. Tested on wxGTK only,

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 45258f067b7e9a0b2f05012b2b26eab10dfa5729..b49423e6b13328ab164735712569e8f0b31c24b0 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -27,18 +27,6 @@
 class wxMask;
 class wxBitmap;
 
 class wxMask;
 class wxBitmap;
 

-//-----------------------------------------------------------------------------
-// also implemented here from wxImage
-//-----------------------------------------------------------------------------
-
-/*
-class wxImage : wxGDIObject
-{
-  wxImage( const wxBitmap &bitmap );
-  wxBitmap ConvertToBitmap() const;
-}
-*/
-

 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------


@@ -53,9 +41,13 @@ public:
   wxMask( const wxBitmap& bitmap, int paletteIndex );
   wxMask( const wxBitmap& bitmap );
   ~wxMask();
   wxMask( const wxBitmap& bitmap, int paletteIndex );
   wxMask( const wxBitmap& bitmap );
   ~wxMask();

+  
+  bool Create( const wxBitmap& bitmap, const wxColour& colour );
+  bool Create( const wxBitmap& bitmap, int paletteIndex );
+  bool Create( const wxBitmap& bitmap );

 
  // implementation
 
  // implementation

-    
+

   GdkBitmap   *m_bitmap;
   GdkBitmap *GetBitmap() const;
 };
   GdkBitmap   *m_bitmap;
   GdkBitmap *GetBitmap() const;
 };


@@ -75,14 +67,13 @@ public:
   wxBitmap( const char **bits );
   wxBitmap( char **bits );
   wxBitmap( const wxBitmap& bmp );
   wxBitmap( const char **bits );
   wxBitmap( char **bits );
   wxBitmap( const wxBitmap& bmp );

-  wxBitmap( const wxBitmap* bmp );

   wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
   ~wxBitmap();
   wxBitmap& operator = ( const wxBitmap& bmp );
   bool operator == ( const wxBitmap& bmp );
   bool operator != ( const wxBitmap& bmp );
   bool Ok() const;
   wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
   ~wxBitmap();
   wxBitmap& operator = ( const wxBitmap& bmp );
   bool operator == ( const wxBitmap& bmp );
   bool operator != ( const wxBitmap& bmp );
   bool Ok() const;

-    
+

   int GetHeight() const;
   int GetWidth() const;
   int GetDepth() const;
   int GetHeight() const;
   int GetWidth() const;
   int GetDepth() const;


@@ -96,14 +87,14 @@ public:
   wxPalette *GetPalette() const;
   wxPalette *GetColourMap() const
     { return GetPalette(); };
   wxPalette *GetPalette() const;
   wxPalette *GetColourMap() const
     { return GetPalette(); };

-      
-// implementation      
+
+// implementation

 
   void SetHeight( int height );
   void SetWidth( int width );
   void SetDepth( int depth );
   void SetPixmap( GdkPixmap *pixmap );
 
   void SetHeight( int height );
   void SetWidth( int width );
   void SetDepth( int depth );
   void SetPixmap( GdkPixmap *pixmap );

-  
+

   GdkPixmap *GetPixmap() const;
   GdkBitmap *GetBitmap() const;
 
   GdkPixmap *GetPixmap() const;
   GdkBitmap *GetBitmap() const;