X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ee31b00ed1aff56aa22f43f65a8604f6937ca37..458ca8c1fdad48cf05476338b946634eec03fe16:/include/wx/mac/icon.h?ds=inline diff --git a/include/wx/mac/icon.h b/include/wx/mac/icon.h index e1aa18fea5..aa5db567ab 100644 --- a/include/wx/mac/icon.h +++ b/include/wx/mac/icon.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: icon.h // Purpose: wxIcon class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "icon.h" #endif @@ -41,7 +41,7 @@ public: bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , int desiredWidth /* = -1 */ , int desiredHeight = -1); bool LoadFile(const wxString& name ,wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE ) - { return LoadFile( name , flags , -1 , -1 ) ; } + { return LoadFile( name , flags , -1 , -1 ) ; } inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; } @@ -60,9 +60,9 @@ class WXDLLEXPORT wxICONFileHandler: public wxBitmapHandler public: inline wxICONFileHandler() { - m_name = "ICO icon file"; - m_extension = "ico"; - m_type = wxBITMAP_TYPE_ICO; + m_name = "ICO icon file"; + m_extension = "ico"; + m_type = wxBITMAP_TYPE_ICO; }; virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, @@ -76,9 +76,9 @@ class WXDLLEXPORT wxICONResourceHandler: public wxBitmapHandler public: inline wxICONResourceHandler() { - m_name = "ICON resource"; - m_extension = ""; - m_type = wxBITMAP_TYPE_ICON_RESOURCE; + m_name = "ICON resource"; + m_extension = ""; + m_type = wxBITMAP_TYPE_ICON_RESOURCE; }; virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,