use global operator new to fix compilation errors if type T overloads new (as wxObjec...

[wxWidgets.git] / include / wx / iconloc.h

diff --git a/include/wx/iconloc.h b/include/wx/iconloc.h
index a1a5371a0de95b43f73c3194397a256c492684a6..dcccca3274f64ccbf1cc46ea1a9d41a45f838743 100644 (file)
--- 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,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
@@ -43,7 +43,7 @@ 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
@@ -67,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