"unsigned char" restored in wxColour ctor

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 7baf8849f35ebdfb8bed0d7f7f3ce3af20a7f007..15af99d2c524127efe27fe0ff2408536cb4f7dfe 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -2,9 +2,8 @@
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -20,6 +19,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
+#include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -49,6 +49,8 @@ class wxMask: public wxObject
     GdkBitmap *GetBitmap() const;
 
   protected:
+  
+    friend wxBitmap;
 
     GdkBitmap *m_bitmap;
 
@@ -58,7 +60,6 @@ class wxMask: public wxObject
 // wxBitmap
 //-----------------------------------------------------------------------------
 
-// CMB 20/5/98: added xbm constructor and GetBitmap() method
 class wxBitmap: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
@@ -68,6 +69,7 @@ class wxBitmap: public wxObject
     wxBitmap();
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
+    wxBitmap( const wxImage &image );
     wxBitmap( char **bits );
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxBitmap* bmp );
@@ -77,6 +79,8 @@ class wxBitmap: public wxObject
     bool operator == ( const wxBitmap& bmp );
     bool operator != ( const wxBitmap& bmp );
     bool Ok() const;
+    
+    wxImage ConvertToImage() const;
 
     int GetHeight() const;
     int GetWidth() const;
@@ -88,8 +92,6 @@ class wxBitmap: public wxObject
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
 
-    void Resize( int height, int width );
-
     bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
     bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);
 
@@ -102,10 +104,6 @@ class wxBitmap: public wxObject
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
 
-    void DestroyImage();
-    void RecreateImage();
-    void Render();
-
     // no data :-)
 };