Small Motif bug fixes

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

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 3d7e90c69b83b9ce7b780f3c67df55fc699dfcea..35d5c3008a617a2b392089583cba82209b96d420 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -2,10 +2,9 @@
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

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


@@ -20,6 +19,7 @@
 #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


@@ -36,22 +36,17 @@ class wxMask: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxMask)
 
 {
   DECLARE_DYNAMIC_CLASS(wxMask)
 

-  public:
-  
-    wxMask(void);
-    wxMask( const wxBitmap& bitmap, const wxColour& colour );
-    wxMask( const wxBitmap& bitmap, const int paletteIndex );
-    wxMask( const wxBitmap& bitmap );
-    ~wxMask(void);
-
-  public:
-  
-    GdkBitmap *GetBitmap(void) const;
-    
-  protected:
-  
-    GdkBitmap *m_bitmap;     
+public:
+  wxMask();
+  wxMask( const wxBitmap& bitmap, const wxColour& colour );
+  wxMask( const wxBitmap& bitmap, int paletteIndex );
+  wxMask( const wxBitmap& bitmap );
+  ~wxMask();
+
+ // implementation

     
     

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

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -62,41 +57,46 @@ class wxBitmap: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
 
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
 

-  public:
-
-    wxBitmap(void);
-    wxBitmap( const int width, const int height, const int depth = -1 );
-    wxBitmap( char **bits );
-    wxBitmap( const wxBitmap& bmp );
-    wxBitmap( const wxBitmap* bmp );
-    wxBitmap( const wxString &filename, const int type );
-    ~wxBitmap(void);
-    wxBitmap& operator = ( const wxBitmap& bmp );
-    bool operator == ( const wxBitmap& bmp );
-    bool operator != ( const wxBitmap& bmp );
-    bool Ok(void) const;
+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 );
+  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(void) const;
-    int GetWidth(void) const;
-    int GetDepth(void) const;
-    void SetHeight( const int height );
-    void SetWidth( const int width );
-    void SetDepth( const int depth );
-
-    wxMask *GetMask(void) const;
-    void SetMask( wxMask *mask );
-    
-    bool SaveFile( const wxString &name, const int type, wxPalette *palette = NULL );
-    bool LoadFile( const wxString &name, const int type );
-        
-    wxPalette *GetPalette(void) const;
-    wxPalette *GetColourMap(void) const
-      { return GetPalette(); };
+  wxImage ConvertToImage() const;

 
 

-  public:
+  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;

 
 

-    GdkPixmap *GetPixmap(void) const;
-    

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