X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e3362daa88b836ea1e6092c6b44123061b9f0e9..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/iconloc.h?ds=inline diff --git a/include/wx/iconloc.h b/include/wx/iconloc.h index a1a5371a0d..d81e32700b 100644 --- a/include/wx/iconloc.h +++ b/include/wx/iconloc.h @@ -5,7 +5,7 @@ // Modified by: // Created: 21.06.2003 // RCS-ID: $Id$ -// Copyright: (c) 2003 Vadim Zeitlin +// Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -18,7 +18,7 @@ // wxIconLocation: describes the location of an icon // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxIconLocationBase +class WXDLLIMPEXP_BASE wxIconLocationBase { public: // ctor takes the name of the file where the icon is @@ -39,11 +39,11 @@ private: wxString m_filename; }; -// under MSW the same file may contain several icons so we also store the +// under Windows the same file may contain several icons so we also store the // index of the icon -#if defined(__WXMSW__) +#if defined(__WINDOWS__) -class WXDLLEXPORT wxIconLocation : public wxIconLocationBase +class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase { public: // ctor takes the name of the file where the icon is and the icons index in @@ -65,9 +65,15 @@ wxIconLocation::wxIconLocation(const wxString& file, int num) SetIndex(num); } -#else // !MSW +#else // !__WINDOWS__ -typedef wxIconLocationBase wxIconLocation; +// must be a class because we forward declare it as class +class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase +{ +public: + wxEXPLICIT wxIconLocation(const wxString& filename = wxEmptyString) + : wxIconLocationBase(filename) { } +}; #endif // platform