[ 1557284 ] wxGenericComboControl -> wxGenericComboCtrl

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

diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h
index 3ac421b830e94a251a6520d185da75b57c838570..770dd5153a461fe21b78ceed035897cf7ac44e44 100644 (file)
--- a/include/wx/mgl/bitmap.h
+++ b/include/wx/mgl/bitmap.h
@@ -2,18 +2,13 @@
 // Name:        bitmap.h
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __WX_BITMAP_H__
 #define __WX_BITMAP_H__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #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();
+    virtual ~wxMask();
 
     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 wxBitmap& bmp);
     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;