X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32b8ec418aee4e38877d4cb79e2984c766dcc358..f23b6f74bbf43799594924e94382b13587b4a57e:/include/wx/mgl/bitmap.h diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h index 3410efaf48..35cebd4e22 100644 --- a/include/wx/mgl/bitmap.h +++ b/include/wx/mgl/bitmap.h @@ -2,7 +2,7 @@ // Name: bitmap.h // Author: Vaclav Slavik // RCS-ID: $Id$ -// Copyright: (c) 2001 Vaclav Slavik +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -10,8 +10,8 @@ #ifndef __WX_BITMAP_H__ #define __WX_BITMAP_H__ -#ifdef __GNUG__ -#pragma interface +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma interface "bitmap.h" #endif #include "wx/defs.h" @@ -75,7 +75,7 @@ private: class WXDLLEXPORT wxBitmap: public wxBitmapBase { public: - wxBitmap(); + wxBitmap() {} wxBitmap(int width, int height, int depth = -1); wxBitmap(const char bits[], int width, int height, int depth = 1); wxBitmap(const char **bits) { CreateFromXpm(bits); } @@ -83,7 +83,7 @@ public: wxBitmap(const wxBitmap& bmp); wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE); wxBitmap(const wxImage& image, int depth = -1); - ~wxBitmap(); + ~wxBitmap() {} wxBitmap& operator = (const wxBitmap& bmp); bool operator == (const wxBitmap& bmp) const; bool operator != (const wxBitmap& bmp) const;