unicode compilation fix

[wxWidgets.git] / src / common / dpycmn.cpp

diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index bc39bced676711599c60c0399797ead4ed364954..8797f81ecbc8067875b57286cd2b8ff49ba5146e 100644 (file)
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "displaybase.h"
 #endif
 
@@ -44,7 +44,7 @@ const wxVideoMode wxDefaultVideoMode;
 wxDisplayBase::wxDisplayBase(size_t index)
              : m_index (index)
 {
-    wxASSERT_MSG( m_index < wxDisplayBase::GetCount(),
+    wxASSERT_MSG( m_index < GetCount(),
                     wxT("An invalid index was passed to wxDisplay") );
 }