Add wxDataViewRendererBase::GetEffectiveAlignment() and use it.

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

diff --git a/include/wx/iconloc.h b/include/wx/iconloc.h
index dcccca3274f64ccbf1cc46ea1a9d41a45f838743..9baaaa5297fb73e02f67198d59cb9cc6d60edd6b 100644 (file)
--- a/include/wx/iconloc.h
+++ b/include/wx/iconloc.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003
-// RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,9 +38,9 @@ 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 WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase
 {
@@ -65,7 +64,7 @@ wxIconLocation::wxIconLocation(const wxString& file, int num)
     SetIndex(num);
 }
 
-#else // !MSW
+#else // !__WINDOWS__
 
 // must be a class because we forward declare it as class
 class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase