adopting correct implementation virtualization for Do/GradientFillConcentric

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 29649632b977dbc565be4880b67074f01141d2b4..21d6bcd28606a3b286f110a44628b9f28e164759 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -7,28 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKBITMAPH__
-#define __GTKBITMAPH__
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/palette.h"
-#include "wx/gdiobj.h"
+#ifndef _WX_GTK_BITMAP_H_
+#define _WX_GTK_BITMAP_H_

 
 typedef struct _GdkPixbuf GdkPixbuf;
 
 typedef struct _GdkPixbuf GdkPixbuf;

-

 class WXDLLEXPORT wxPixelDataBase;
 
 class WXDLLEXPORT wxPixelDataBase;
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMask;
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxImage;
-

 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------


@@ -42,7 +26,7 @@ public:
     wxMask( const wxBitmap& bitmap, int paletteIndex );
 #endif // wxUSE_PALETTE
     wxMask( const wxBitmap& bitmap );
     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
 
     bool Create( const wxBitmap& bitmap, const wxColour& colour );
 #if wxUSE_PALETTE


@@ -73,7 +57,7 @@ public:
     wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
     wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }

-    ~wxBitmap();
+    virtual ~wxBitmap();

     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const;
     bool Ok() const;
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const;
     bool Ok() const;


@@ -113,11 +97,9 @@ public:
     void SetWidth( int width );
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );
     void SetWidth( int width );
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );

-    void SetBitmap( GdkBitmap *bitmap );

     void SetPixbuf(GdkPixbuf *pixbuf);
 
     GdkPixmap *GetPixmap() const;
     void SetPixbuf(GdkPixbuf *pixbuf);
 
     GdkPixmap *GetPixmap() const;

-    GdkBitmap *GetBitmap() const;

     bool HasPixmap() const;
     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;
     bool HasPixmap() const;
     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;


@@ -138,9 +120,7 @@ protected:
 
 private:
     // to be called from CreateFromImage only!
 
 private:
     // to be called from CreateFromImage only!

-    bool CreateFromImageAsBitmap(const wxImage& image);
-    bool CreateFromImageAsPixmap(const wxImage& image);
-
+    bool CreateFromImageAsPixmap(const wxImage& image, int depth);

     bool CreateFromImageAsPixbuf(const wxImage& image);
 
     enum Representation
     bool CreateFromImageAsPixbuf(const wxImage& image);
 
     enum Representation


@@ -178,5 +158,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 };
 
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 };
 

-
-#endif // __GTKBITMAPH__
+#endif // _WX_GTK_BITMAP_H_