add if wxUSE_NOTEBOOK around notebook-only renderer methods

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

diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h
index 35cebd4e22b0f0fd41076dae5d4e176d435f1825..770dd5153a461fe21b78ceed035897cf7ac44e44 100644 (file)
--- a/include/wx/mgl/bitmap.h
+++ b/include/wx/mgl/bitmap.h
@@ -6,14 +6,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __WX_BITMAP_H__
 #define __WX_BITMAP_H__
 
 #ifndef __WX_BITMAP_H__
 #define __WX_BITMAP_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "bitmap.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -45,7 +40,7 @@ public:
     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();
+    virtual ~wxMask();

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


@@ -80,11 +75,9 @@ public:
     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char **bits) { CreateFromXpm(bits); }
     wxBitmap(char **bits) { CreateFromXpm((const char **)bits); }
     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char **bits) { CreateFromXpm(bits); }
     wxBitmap(char **bits) { CreateFromXpm((const char **)bits); }

-    wxBitmap(const wxBitmap& bmp);

     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
     wxBitmap(const wxImage& image, int depth = -1);
     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
     wxBitmap(const wxImage& image, int depth = -1);

-    ~wxBitmap() {}
-    wxBitmap& operator = (const wxBitmap& bmp);
+    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;