X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7919cba5b7c60e490e5b6e72f92496b8b48401ff..5de9f492eca0bde0b23d762e614c21b30c74adb5:/include/wx/bitmap.h diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index 36dda96e2a..8c34a26f7e 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -5,7 +5,7 @@ // Modified by: // Created: 22.04.01 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -16,7 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "bitmapbase.h" #endif @@ -32,7 +32,11 @@ class WXDLLEXPORT wxImage; class WXDLLEXPORT wxMask; class WXDLLEXPORT wxPalette; -#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXCOCOA__) || defined(__WXMOTIF__) || defined(__WXX11__) +#if defined(__WXMGL__) || \ + defined(__WXMAC__) || \ + defined(__WXCOCOA__) || \ + defined(__WXMOTIF__) || \ + defined(__WXX11__) // Only used by some ports // FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes