Add const to GetTargetSize()

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 0e74b7a631e1ea3ef8aa2a4ef70988d049bb80fd..21d6bcd28606a3b286f110a44628b9f28e164759 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -7,30 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GTK_BITMAP_H_
+#define _WX_GTK_BITMAP_H_
 
-#ifndef __GTKBITMAPH__
-#define __GTKBITMAPH__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/palette.h"
-#include "wx/gdiobj.h"
-
-#ifdef __WXGTK20__
 typedef struct _GdkPixbuf GdkPixbuf;
-#endif
-
 class WXDLLEXPORT wxPixelDataBase;
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMask;
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxImage;
-
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
@@ -44,7 +26,7 @@ public:
     wxMask( const wxBitmap& bitmap, int paletteIndex );
 #endif // wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap );
-    ~wxMask();
+    virtual ~wxMask();
 
     bool Create( const wxBitmap& bitmap, const wxColour& colour );
 #if wxUSE_PALETTE
@@ -73,11 +55,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 );
+    virtual ~wxBitmap();
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const;
     bool Ok() const;
@@ -117,18 +97,12 @@ public:
     void SetWidth( int width );
     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 );
@@ -146,10 +120,7 @@ protected:
 
 private:
     // to be called from CreateFromImage only!
-    bool CreateFromImageAsBitmap(const wxImage& image);
-    bool CreateFromImageAsPixmap(const wxImage& image);
-
-#ifdef __WXGTK20__
+    bool CreateFromImageAsPixmap(const wxImage& image, int depth);
     bool CreateFromImageAsPixbuf(const wxImage& image);
 
     enum Representation
@@ -162,7 +133,6 @@ private:
     void PurgeOtherRepresentations(Representation keep);
 
     friend class wxMemoryDC;
-#endif
     friend class wxBitmapHandler;
 
 private:
@@ -188,5 +158,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 };
 
-
-#endif // __GTKBITMAPH__
+#endif // _WX_GTK_BITMAP_H_