Better name for wxXmlResource::GetDirection() argument.

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

diff --git a/include/wx/iconloc.h b/include/wx/iconloc.h
index 4e929c5dce9db52637d216e0ab7d0ae9663e258f..9baaaa5297fb73e02f67198d59cb9cc6d60edd6b 100644 (file)
--- a/include/wx/iconloc.h
+++ b/include/wx/iconloc.h
@@ -4,8 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -18,7 +17,7 @@
 // wxIconLocation: describes the location of an icon
 // ----------------------------------------------------------------------------
 
 // wxIconLocation: describes the location of an icon
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT_BASE wxIconLocationBase
+class WXDLLIMPEXP_BASE wxIconLocationBase

 {
 public:
     // ctor takes the name of the file where the icon is
 {
 public:
     // ctor takes the name of the file where the icon is


@@ -39,11 +38,11 @@ private:
     wxString m_filename;
 };
 
     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
 // index of the icon

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

 
 

-class WXDLLEXPORT_BASE 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
 {
 public:
     // ctor takes the name of the file where the icon is and the icons index in


@@ -65,10 +64,10 @@ wxIconLocation::wxIconLocation(const wxString& file, int num)
     SetIndex(num);
 }
 
     SetIndex(num);
 }
 

-#else // !MSW
+#else // !__WINDOWS__

 
 // must be a class because we forward declare it as class
 
 // must be a class because we forward declare it as class

-class WXDLLEXPORT_BASE wxIconLocation : public wxIconLocationBase
+class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase

 {
 public:
     wxEXPLICIT wxIconLocation(const wxString& filename = wxEmptyString)
 {
 public:
     wxEXPLICIT wxIconLocation(const wxString& filename = wxEmptyString)