"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 61f2bb2708197f40f7bf7648d61be8b7285f9b29..15af99d2c524127efe27fe0ff2408536cb4f7dfe 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -2,10 +2,9 @@
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -20,22 +19,12 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"

+#include "wx/image.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxDC;
-class wxPaintDC;
-class wxMemoryDC;
-class wxToolBar;
-class wxBitmapButton;
-class wxStaticBitmap;
-class wxFrame;
-class wxDialog;
-class wxTreeCtrl;
-class wxNotebook;
-

 class wxMask;
 class wxBitmap;
 
 class wxMask;
 class wxBitmap;
 


@@ -55,22 +44,13 @@ class wxMask: public wxObject
     wxMask( const wxBitmap& bitmap );
     ~wxMask();
 
     wxMask( const wxBitmap& bitmap );
     ~wxMask();
 

-  private:
-
-    friend wxBitmap;
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxToolBar;
-    friend wxBitmapButton;
-    friend wxStaticBitmap;
-    friend wxFrame;
-    friend wxDialog;
-    friend wxTreeCtrl;
-    friend wxNotebook;
-
+  // implementation
+    

     GdkBitmap *GetBitmap() const;
 
   protected:
     GdkBitmap *GetBitmap() const;
 
   protected:

+  
+    friend wxBitmap;

 
     GdkBitmap *m_bitmap;
 
 
     GdkBitmap *m_bitmap;
 


@@ -80,7 +60,6 @@ class wxMask: public wxObject
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-// CMB 20/5/98: added xbm constructor and GetBitmap() method

 class wxBitmap: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
 class wxBitmap: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)


@@ -90,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();
     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 );
     wxBitmap( char **bits );
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxBitmap* bmp );


@@ -99,6 +79,8 @@ class wxBitmap: public wxObject
     bool operator == ( const wxBitmap& bmp );
     bool operator != ( const wxBitmap& bmp );
     bool Ok() const;
     bool operator == ( const wxBitmap& bmp );
     bool operator != ( const wxBitmap& bmp );
     bool Ok() const;

+    
+    wxImage ConvertToImage() const;

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


@@ -110,34 +92,17 @@ class wxBitmap: public wxObject
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
 
     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);
 
     wxPalette *GetPalette() const;
     wxPalette *GetColourMap() const
       { return GetPalette(); };
     bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL );
     bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM);
 
     wxPalette *GetPalette() const;
     wxPalette *GetColourMap() const
       { return GetPalette(); };

-
-  private:
-
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxMemoryDC;
-    friend wxToolBar;
-    friend wxBitmapButton;
-    friend wxStaticBitmap;
-    friend wxFrame;
-    friend wxDialog;
-    friend wxTreeCtrl;
-    friend wxNotebook;
+      
+  // implementation      

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

-  
-    void DestroyImage();
-    void RecreateImage();
-    void Render();

 
     // no data :-)
 };
 
     // no data :-)
 };