USE_xxx constants renamed to wxUSE_xxx. This is an incompatible change, you

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 3d7e90c69b83b9ce7b780f3c67df55fc699dfcea..81406d49ecee9a1fcea68de40ef9f45a0a424282 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -3,9 +3,9 @@
 // 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
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

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


@@ -37,66 +37,77 @@ class wxMask: public wxObject
   DECLARE_DYNAMIC_CLASS(wxMask)
 
   public:
   DECLARE_DYNAMIC_CLASS(wxMask)
 
   public:

-  
-    wxMask(void);
+
+    wxMask();

     wxMask( const wxBitmap& bitmap, const wxColour& colour );
     wxMask( const wxBitmap& bitmap, const wxColour& colour );

-    wxMask( const wxBitmap& bitmap, const int paletteIndex );
+    wxMask( const wxBitmap& bitmap, int paletteIndex );

     wxMask( const wxBitmap& bitmap );
     wxMask( const wxBitmap& bitmap );

-    ~wxMask(void);
+    ~wxMask();

 
 

-  public:
-  
-    GdkBitmap *GetBitmap(void) const;
+  // implementation

     
     

+    GdkBitmap *GetBitmap() const;
+

   protected:
   
   protected:
   

-    GdkBitmap *m_bitmap;     
-    
+    friend wxBitmap;
+
+    GdkBitmap *m_bitmap;
+

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

+// CMB 20/5/98: added xbm constructor and GetBitmap() method

 class wxBitmap: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
 
   public:
 
 class wxBitmap: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxBitmap)
 
   public:
 

-    wxBitmap(void);
-    wxBitmap( const int width, const int height, const int depth = -1 );
+    wxBitmap();
+    wxBitmap( int width, int height, int depth = -1 );
+    wxBitmap( const char bits[], int width, int height, 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 );

-    wxBitmap( const wxString &filename, const int type );
-    ~wxBitmap(void);
+    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 );
     wxBitmap& operator = ( const wxBitmap& bmp );
     bool operator == ( const wxBitmap& bmp );
     bool operator != ( const wxBitmap& bmp );

-    bool Ok(void) 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;
+    bool Ok() 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 );
     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
+
+    void Resize( int height, int width );
+
+    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(); };
       { return GetPalette(); };

+      
+  // implementation      

 
 

-  public:
+    GdkPixmap *GetPixmap() const;
+    GdkBitmap *GetBitmap() const;
+
+    void DestroyImage();
+    void RecreateImage();
+    void Render();

 
 

-    GdkPixmap *GetPixmap(void) const;
-    

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