added wxString ctor from std::string (inside #ifdef wxUSE_STD_STRING); removed pragma...

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

diff --git a/src/common/dndcmn.cpp b/src/common/dndcmn.cpp
index aa9a861fd69b8ea11b7ca59d1b8fbeee1e25d7f4..18cef9cf8025eb71f8691a63b4b980d2d9fe7853 100644 (file)
--- a/src/common/dndcmn.cpp
+++ b/src/common/dndcmn.cpp
@@ -4,7 +4,7 @@
 // Modified by:
 // Created:     19.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows Team
+// Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -12,7 +12,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "dndbase.h"
 #endif