don't use static buffer needing a critical section to protect it for logging; this...

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

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 0e74b7a631e1ea3ef8aa2a4ef70988d049bb80fd..8640396da07e0bb23ca08b20095cd759dbb4f43c 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/bitmap.h
+// Name:        wx/gtk1/bitmap.h
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -17,10 +17,6 @@
 #include "wx/palette.h"
 #include "wx/gdiobj.h"
 
-#ifdef __WXGTK20__
-typedef struct _GdkPixbuf GdkPixbuf;
-#endif
-
 class WXDLLEXPORT wxPixelDataBase;
 
 //-----------------------------------------------------------------------------
@@ -73,11 +69,9 @@ public:
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); }
     wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
-    wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
     ~wxBitmap();
-    wxBitmap& operator = ( const wxBitmap& bmp );
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const;
     bool Ok() const;
@@ -118,17 +112,10 @@ public:
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );
     void SetBitmap( GdkBitmap *bitmap );
-#ifdef __WXGTK20__
-    void SetPixbuf(GdkPixbuf *pixbuf);
-#endif
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
     bool HasPixmap() const;
-#ifdef __WXGTK20__
-    bool HasPixbuf() const;
-    GdkPixbuf *GetPixbuf() const;
-#endif
 
     // Basically, this corresponds to Win32 StretchBlt()
     wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
@@ -149,20 +136,6 @@ private:
     bool CreateFromImageAsBitmap(const wxImage& image);
     bool CreateFromImageAsPixmap(const wxImage& image);
 
-#ifdef __WXGTK20__
-    bool CreateFromImageAsPixbuf(const wxImage& image);
-
-    enum Representation
-    {
-        Pixmap,
-        Pixbuf
-    };
-    // removes other representations from memory, keeping only 'keep'
-    // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
-    void PurgeOtherRepresentations(Representation keep);
-
-    friend class wxMemoryDC;
-#endif
     friend class wxBitmapHandler;
 
 private: