Visualage C++ V4.0 duplicate symbol fixes

[wxWidgets.git] / src / msw / helpwin.cpp

diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index f5d4860472572b1563ca89164d77f10937a2257a..66e868d54d1c17ba51c84c96094e646325e91f47 100644 (file)
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -30,7 +30,7 @@
 #include <time.h>
 
 #ifdef __WXMSW__
-#include <wx/msw/private.h>
+#include "wx/msw/private.h"
 #endif
 
 #include <string.h>
@@ -41,9 +41,7 @@
 // MAX length of Help descriptor
 #define _MAX_HELP_LEN 500
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
-#endif
 
 wxWinHelpController::wxWinHelpController(void)
 {
@@ -68,12 +66,12 @@ bool wxWinHelpController::LoadFile(const wxString& file)
 
 bool wxWinHelpController::DisplayContents(void)
 {
-    if (m_helpFile == _T("")) return FALSE;
+    if (m_helpFile == wxT("")) return FALSE;
 
     wxString str = m_helpFile;
     size_t len = str.Length();
-    if (!(str[(size_t)(len-1)] == _T('p') && str[(size_t)(len-2)] == _T('l') && str[(size_t)(len-3)] == _T('h') && str[(size_t)(len-4)] == _T('.')))
-      str += _T(".hlp");
+    if (!(str[(size_t)(len-1)] == wxT('p') && str[(size_t)(len-2)] == wxT('l') && str[(size_t)(len-3)] == wxT('h') && str[(size_t)(len-4)] == wxT('.')))
+      str += wxT(".hlp");
 
     if (wxTheApp->GetTopWindow())
     {
@@ -90,12 +88,12 @@ bool wxWinHelpController::DisplayContents(void)
 bool wxWinHelpController::DisplaySection(int section)
 {
     // Use context number
-    if (m_helpFile == _T("")) return FALSE;
+    if (m_helpFile == wxT("")) return FALSE;
 
     wxString str = m_helpFile;
     size_t len = str.Length();
-    if (!(str[(size_t)(len-1)] == _T('p') && str[(size_t)(len-2)] == _T('l') && str[(size_t)(len-3)] == _T('h') && str[(size_t)(len-4)] == _T('.')))
-      str += _T(".hlp");
+    if (!(str[(size_t)(len-1)] == wxT('p') && str[(size_t)(len-2)] == wxT('l') && str[(size_t)(len-3)] == wxT('h') && str[(size_t)(len-4)] == wxT('.')))
+      str += wxT(".hlp");
 
     if (wxTheApp->GetTopWindow())
        {
@@ -108,12 +106,12 @@ bool wxWinHelpController::DisplaySection(int section)
 bool wxWinHelpController::DisplayBlock(long block)
 {
     // Use context number -- a very rough equivalent to block id!
-    if (m_helpFile == _T("")) return FALSE;
+    if (m_helpFile == wxT("")) return FALSE;
 
     wxString str = m_helpFile;
     size_t len = str.Length();
     if (!(str[(size_t)(len-1)] == 'p' && str[(size_t)(len-2)] == 'l' && str[(size_t)(len-3)] == 'h' && str[(size_t)(len-4)] == '.'))
-      str += _T(".hlp");
+      str += wxT(".hlp");
 
     if (wxTheApp->GetTopWindow())
        {
@@ -125,12 +123,12 @@ bool wxWinHelpController::DisplayBlock(long block)
 
 bool wxWinHelpController::KeywordSearch(const wxString& k)
 {
-    if (m_helpFile == _T("")) return FALSE;
+    if (m_helpFile == wxT("")) return FALSE;
 
     wxString str = m_helpFile;
     size_t len = str.Length();
-    if (!(str[(size_t)(len-1)] == _T('p') && str[(size_t)(len-2)] == _T('l') && str[(size_t)(len-3)] == _T('h') && str[(size_t)(len-4)] == _T('.')))
-      str += _T(".hlp");
+    if (!(str[(size_t)(len-1)] == wxT('p') && str[(size_t)(len-2)] == wxT('l') && str[(size_t)(len-3)] == wxT('h') && str[(size_t)(len-4)] == wxT('.')))
+      str += wxT(".hlp");
 
     if (wxTheApp->GetTopWindow())
     {