X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e3362daa88b836ea1e6092c6b44123061b9f0e9..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/iconloc.h

diff --git a/include/wx/iconloc.h b/include/wx/iconloc.h
index a1a5371a0d..9baaaa5297 100644
--- a/include/wx/iconloc.h
+++ b/include/wx/iconloc.h
@@ -4,8 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003
-// RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -18,7 +17,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 +38,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 +64,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