typo in dcclient.cpp corrected (wxUSE_SPLINE => wxUSE_SPLINES)

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

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 8051b4da71bd0be62b1766a7144889b2f25ababd..61245d92c12e077abff8f89c0a5485f4fb79fd50 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -19,7 +19,6 @@
 #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


@@ -44,7 +43,7 @@ public:
   ~wxMask();
 
  // implementation
   ~wxMask();
 
  // implementation

-    
+

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


@@ -61,25 +60,19 @@ public:
   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( const char **bits );

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

-    
-  wxImage ConvertToImage() const;

 
   int GetHeight() const;
   int GetWidth() const;
   int GetDepth() 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 );
 
   wxMask *GetMask() const;
   void SetMask( wxMask *mask );


@@ -90,8 +83,13 @@ 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 );

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