Update for bitmap, image on scaling, transparancy,

wxCHECKs and no more dependance of wxBitmap on wxImage
  in its API


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gtk1/bitmap.h

@@ -19,7 +19,6 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
-#include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -28,6 +27,18 @@
 class wxMask;
 class wxBitmap;
 
+//-----------------------------------------------------------------------------
+// also implemented here from wxImage
+//-----------------------------------------------------------------------------
+
+/*
+class wxImage : wxGDIObject
+{
+  wxImage( const wxBitmap &bitmap );
+  wxBitmap ConvertToBitmap() const;
+}
+*/
+
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
@@ -61,7 +72,6 @@ public:
   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( const char **bits );
   wxBitmap( char **bits );
   wxBitmap( const wxBitmap& bmp );
@@ -73,14 +83,9 @@ public:
   bool operator != ( const wxBitmap& bmp );
   bool Ok() const;
     
-  wxImage ConvertToImage() const;
-
   int GetHeight() const;
   int GetWidth() const;
   int GetDepth() const;
-  void SetHeight( int height );
-  void SetWidth( int width );
-  void SetDepth( int depth );
 
   wxMask *GetMask() const;
   void SetMask( wxMask *mask );
@@ -94,6 +99,11 @@ public:
       
 // implementation      
 
+  void SetHeight( int height );
+  void SetWidth( int width );
+  void SetDepth( int depth );
+  void SetPixmap( GdkPixmap *pixmap );
+  
   GdkPixmap *GetPixmap() const;
   GdkBitmap *GetBitmap() const;