X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cdd0895f43b739bfc1c3ab43214e1d6f26c561a..1ebd017e14fe820f790487702bf493fb0e772429:/include/wx/mgl/bitmap.h diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h index 3ac421b830..97adf8cacf 100644 --- 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" @@ -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); bool operator == (const wxBitmap& bmp) const; bool operator != (const wxBitmap& bmp) const; bool Ok() const;