Removed unnecessary code from utilsunx.cpp

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 95db695c3b209d75995c57ac1232d8e5885de545..17ef65088864be099bf945af4aca2c7206789a51 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -2,10 +2,9 @@
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        bitmap.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

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


@@ -20,18 +19,12 @@
 #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/gdiobj.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxDC;
-class wxPaintDC;
-class wxMemoryDC;
-class wxToolBar;
-class wxBitmapButton;
-class wxStaticBitmap;
-

 class wxMask;
 class wxBitmap;
 
 class wxMask;
 class wxBitmap;
 


@@ -41,93 +34,79 @@ class wxBitmap;
 
 class wxMask: public wxObject
 {
 
 class wxMask: public wxObject
 {

-  DECLARE_DYNAMIC_CLASS(wxMask)
-
-  public:
-  
-    wxMask(void);
+public:
+    wxMask();

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

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

   
   

-    friend wxBitmap;
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxToolBar;
-    friend wxBitmapButton;
-    friend wxStaticBitmap;
-    
-    GdkBitmap *GetBitmap(void) const;
+    bool Create( const wxBitmap& bitmap, const wxColour& colour );
+    bool Create( const wxBitmap& bitmap, int paletteIndex );
+    bool Create( const wxBitmap& bitmap );
+
+    // implementation
+    GdkBitmap   *m_bitmap;

     
     

-  protected:
+    GdkBitmap *GetBitmap() const;

   
   

-    GdkBitmap *m_bitmap;     
-    
+private:
+    DECLARE_DYNAMIC_CLASS(wxMask)

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

-// CMB 20/5/98: added xbm constructor and GetBitmap() method
-class wxBitmap: public wxObject
+class wxBitmap: public wxGDIObject

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxBitmap)
-
-  public:
-
-    wxBitmap(void);
+public:
+    wxBitmap();

     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );

-    wxBitmap( char **bits );
+    wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); }
+    wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }

     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxBitmap& bmp );

-    wxBitmap( const wxBitmap* bmp );
-    wxBitmap( const wxString &filename, 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;
+    bool Ok() const;
+
+    int GetHeight() const;
+    int GetWidth() const;
+    int GetDepth() const;
+
+    wxMask *GetMask() const;
+    void SetMask( wxMask *mask );

     
     

-    int GetHeight(void) const;
-    int GetWidth(void) const;
-    int GetDepth(void) const;
+    wxBitmap GetSubBitmap( const wxRect& rect ) const;
+
+    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 SetHeight( int height );
     void SetWidth( int width );
     void SetDepth( int depth );

+    void SetPixmap( GdkPixmap *pixmap );
+    void SetBitmap( GdkBitmap *bitmap );

 
 

-    wxMask *GetMask(void) const;
-    void SetMask( wxMask *mask );
+    GdkPixmap *GetPixmap() const;
+    GdkBitmap *GetBitmap() const;

     
     

-    void Resize( int height, int width );
-    
-    bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL );
-    bool LoadFile( const wxString &name, int type );
-
-    wxPalette *GetPalette(void) const;
-    wxPalette *GetColourMap(void) const
-      { return GetPalette(); };
+protected:
+    bool CreateFromXpm(const char **bits);

 
 

-  private:
-  
-    friend wxDC;
-    friend wxPaintDC;
-    friend wxMemoryDC;
-    friend wxToolBar;
-    friend wxBitmapButton;
-    friend wxStaticBitmap;
-
-    GdkPixmap *GetPixmap(void) const;
-    GdkBitmap *GetBitmap(void) const;
-    
-    void DestroyImage(void);
-    void RecreateImage(void);
-    void Render(void);
-    
-    // no data :-)
+private:
+    DECLARE_DYNAMIC_CLASS(wxBitmap)

 };
 
 #endif // __GTKBITMAPH__
 };
 
 #endif // __GTKBITMAPH__