Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/iconloc.h b/include/wx/iconloc.h
index 262cfb4036ccd6d45866bd0d142d859d6f768a2b..d81e32700b5b1d59aa419a6acf7462eb0629e440 100644 (file)
--- a/include/wx/iconloc.h
+++ b/include/wx/iconloc.h
@@ -6,7 +6,7 @@
 // Created:     21.06.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Created:     21.06.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICONLOC_H_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ICONLOC_H_


@@ -39,9 +39,9 @@ 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 WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase
 {
 
 class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase
 {


@@ -65,7 +65,7 @@ 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
 class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase
 
 // must be a class because we forward declare it as class
 class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase