X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef6bd27b357788fa1ea5126824e72e1e277e8e4e..4c3ebca927cea2742ec128c9c3ef3676d1ecae01:/include/wx/mac/pnghand.h diff --git a/include/wx/mac/pnghand.h b/include/wx/mac/pnghand.h index 5b43b70d5d..e75688c75e 100644 --- a/include/wx/mac/pnghand.h +++ b/include/wx/mac/pnghand.h @@ -5,11 +5,11 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Microsoft, Julian Smart -// Licence: wxWindows licence +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "pnghand.h" #endif @@ -22,14 +22,14 @@ class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler public: inline wxPNGFileHandler(void) { - m_name = "PNG bitmap file"; - m_extension = "bmp"; - m_type = wxBITMAP_TYPE_PNG; + m_name = wxT("PNG bitmap file"); + m_extension = wxT("bmp"); + m_type = wxBITMAP_TYPE_PNG; }; virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, int desiredWidth, int desiredHeight); - virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL); + virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL); }; #endif