X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaf7ab431b85d817af39d1a19b6d392ff5bd9379..74b720793f9d312566450461fac394e5e456ae5d:/include/wx/iconloc.h?ds=sidebyside

diff --git a/include/wx/iconloc.h b/include/wx/iconloc.h
index 2ace40208b..dcccca3274 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 <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -18,11 +18,12 @@
 // 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
-    wxEXPLICIT wxIconLocationBase(const wxString& file) : m_filename(file) { }
+    wxEXPLICIT wxIconLocationBase(const wxString& filename = wxEmptyString)
+        : m_filename(filename) { }
 
     // default copy ctor, assignment operator and dtor are ok
 
@@ -31,7 +32,7 @@ public:
     bool IsOk() const { return !m_filename.empty(); }
 
     // set/get the icon file name
-    void SetFileName(const wxString& file) { m_filename = file; }
+    void SetFileName(const wxString& filename) { m_filename = filename; }
     const wxString& GetFileName() const { return m_filename; }
 
 private:
@@ -42,12 +43,12 @@ private:
 // index of the icon
 #if defined(__WXMSW__)
 
-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
     // the file
-    wxEXPLICIT wxIconLocation(const wxString& file, int num = 0);
+    wxEXPLICIT wxIconLocation(const wxString& file = wxEmptyString, int num = 0);
 
     // set/get the icon index
     void SetIndex(int num) { m_index = num; }
@@ -66,7 +67,13 @@ wxIconLocation::wxIconLocation(const wxString& file, int num)
 
 #else // !MSW
 
-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