X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9d59ee7e0cbe4acae6153adafb5ddce9a4e65dd..e795e8b56f213f97745636a017609091746894a0:/src/common/bmpbase.cpp diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp index bc718b14e6..7868b0b775 100644 --- a/src/common/bmpbase.cpp +++ b/src/common/bmpbase.cpp @@ -8,10 +8,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "bitmapbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,8 +15,11 @@ #pragma hdrstop #endif -#if defined(__WXMGL__) || defined(__WXMAC__) \ - || defined(__WXMOTIF__) || defined(__WXX11__) +#if defined(__WXMGL__) || \ + defined(__WXMAC__) || \ + defined(__WXGTK__) || \ + defined(__WXMOTIF__) || \ + defined(__WXX11__) #include "wx/setup.h" #include "wx/utils.h" @@ -78,7 +77,7 @@ wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapTy { wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData(); if ( handler->GetExtension() == extension && - (bitmapType == -1 || handler->GetType() == bitmapType) ) + (bitmapType == wxBITMAP_TYPE_ANY || handler->GetType() == bitmapType) ) return handler; node = node->GetNext(); } @@ -122,5 +121,4 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule) -#endif // defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXCOCOA__) || defined(__WXMOTIF__) || defined(__WXX11__) - +#endif // __WXMGL__ || __WXMAC__ || __WXCOCOA__ || __WXMOTIF__ || __WXX11__