Changed a few #include <xxx.h> to #include "xxx.h"

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 15af99d2c524127efe27fe0ff2408536cb4f7dfe..b49423e6b13328ab164735712569e8f0b31c24b0 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -19,7 +19,6 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
-#include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -36,24 +35,21 @@ class wxMask: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxMask)
 
-  public:
-
-    wxMask();
-    wxMask( const wxBitmap& bitmap, const wxColour& colour );
-    wxMask( const wxBitmap& bitmap, int paletteIndex );
-    wxMask( const wxBitmap& bitmap );
-    ~wxMask();
-
-  // implementation
-    
-    GdkBitmap *GetBitmap() const;
-
-  protected:
+public:
+  wxMask();
+  wxMask( const wxBitmap& bitmap, const wxColour& colour );
+  wxMask( const wxBitmap& bitmap, int paletteIndex );
+  wxMask( const wxBitmap& bitmap );
+  ~wxMask();
   
-    friend wxBitmap;
+  bool Create( const wxBitmap& bitmap, const wxColour& colour );
+  bool Create( const wxBitmap& bitmap, int paletteIndex );
+  bool Create( const wxBitmap& bitmap );
 
-    GdkBitmap *m_bitmap;
+ // implementation
 
+  GdkBitmap   *m_bitmap;
+  GdkBitmap *GetBitmap() const;
 };
 
 //-----------------------------------------------------------------------------
@@ -64,45 +60,43 @@ class wxBitmap: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
 
-  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( 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;
-    
-    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 );
-
-    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(); };
-      
-  // implementation      
-
-    GdkPixmap *GetPixmap() const;
-    GdkBitmap *GetBitmap() const;
+public:
+  wxBitmap();
+  wxBitmap( int width, int height, int depth = -1 );
+  wxBitmap( const char bits[], int width, int height, int depth = 1 );
+  wxBitmap( const char **bits );
+  wxBitmap( char **bits );
+  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;
+
+  int GetHeight() const;
+  int GetWidth() const;
+  int GetDepth() const;
+
+  wxMask *GetMask() const;
+  void SetMask( wxMask *mask );
+
+  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(); };
+
+// implementation
+
+  void SetHeight( int height );
+  void SetWidth( int width );
+  void SetDepth( int depth );
+  void SetPixmap( GdkPixmap *pixmap );
+
+  GdkPixmap *GetPixmap() const;
+  GdkBitmap *GetBitmap() const;
 
     // no data :-)
 };