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

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

diff --git a/src/common/helpbase.cpp b/src/common/helpbase.cpp
index da1d222c58a97a462d906adc587b43063b86ada5..cb19c844ca7b08b15445f0e85193b5a6845c1f03 100644 (file)
--- a/src/common/helpbase.cpp
+++ b/src/common/helpbase.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "helpbase.h"
 #endif
 
@@ -24,12 +24,10 @@
 #include "wx/defs.h"
 #endif
 
-#include "wx/helpbase.h"
-
 #if wxUSE_HELP
 
-#if !USE_SHARED_LIBRARY
+#include "wx/helpbase.h"
+
 IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)
-#endif
 
 #endif // wxUSE_HELP