wxCHECK/wxCHECK_RET changes

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 1d6260c5fca6ce6de6af981494f75f91a59d7d05..4d5acb76f72436e41fc31d40349e6134ffa38410 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

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

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


@@ -29,6 +29,8 @@ class wxDC;
 class wxPaintDC;
 class wxMemoryDC;
 class wxToolBarGTK;
 class wxPaintDC;
 class wxMemoryDC;
 class wxToolBarGTK;

+class wxBitmapButton;
+class wxStaticBitmap;

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


@@ -55,6 +57,8 @@ class wxMask: public wxObject
     friend wxDC;
     friend wxPaintDC;
     friend wxToolBarGTK;
     friend wxDC;
     friend wxPaintDC;
     friend wxToolBarGTK;

+    friend wxBitmapButton;
+    friend wxStaticBitmap;

     
     GdkBitmap *GetBitmap(void) const;
     
     
     GdkBitmap *GetBitmap(void) const;
     


@@ -68,6 +72,7 @@ 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)


@@ -76,6 +81,7 @@ class wxBitmap: public wxObject
 
     wxBitmap(void);
     wxBitmap( const int width, const int height, const int depth = -1 );
 
     wxBitmap(void);
     wxBitmap( const int width, const int height, const int depth = -1 );

+    wxBitmap( const char bits[], const int width, const int height, const int depth = 1 );

     wxBitmap( char **bits );
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxBitmap* bmp );
     wxBitmap( char **bits );
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxBitmap* bmp );


@@ -109,8 +115,11 @@ class wxBitmap: public wxObject
     friend wxPaintDC;
     friend wxMemoryDC;
     friend wxToolBarGTK;
     friend wxPaintDC;
     friend wxMemoryDC;
     friend wxToolBarGTK;

+    friend wxBitmapButton;
+    friend wxStaticBitmap;

 
     GdkPixmap *GetPixmap(void) const;
 
     GdkPixmap *GetPixmap(void) const;

+    GdkBitmap *GetBitmap(void) const;

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