Changed system colours for better default display of wxGrid. Please revert

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

diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index eb74f4960c209c373013c12b81d19c4ae27148a9..66e868d54d1c17ba51c84c96094e646325e91f47 100644 (file)
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -30,7 +30,7 @@
 #include <time.h>
 
 #ifdef __WXMSW__
 #include <time.h>
 
 #ifdef __WXMSW__

-#include <wx/msw/private.h>
+#include "wx/msw/private.h"

 #endif
 
 #include <string.h>
 #endif
 
 #include <string.h>


@@ -41,9 +41,7 @@
 // MAX length of Help descriptor
 #define _MAX_HELP_LEN 500
 
 // MAX length of Help descriptor
 #define _MAX_HELP_LEN 500
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)

-#endif

 
 wxWinHelpController::wxWinHelpController(void)
 {
 
 wxWinHelpController::wxWinHelpController(void)
 {


@@ -68,19 +66,19 @@ bool wxWinHelpController::LoadFile(const wxString& file)
 
 bool wxWinHelpController::DisplayContents(void)
 {
 
 bool wxWinHelpController::DisplayContents(void)
 {

-    if (m_helpFile == "") return FALSE;
+    if (m_helpFile == wxT("")) return FALSE;

 
     wxString str = m_helpFile;
     size_t len = str.Length();
 
     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 += ".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())
     {
 #if defined(__WIN95__)
 
     if (wxTheApp->GetTopWindow())
     {
 #if defined(__WIN95__)

-      WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const char*) str, HELP_FINDER, 0L);
+      WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_FINDER, 0L);

 #else
 #else

-      WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const char*) str, HELP_CONTENTS, 0L);
+      WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTENTS, 0L);

 #endif
      return TRUE;
     }
 #endif
      return TRUE;
     }


@@ -90,16 +88,16 @@ bool wxWinHelpController::DisplayContents(void)
 bool wxWinHelpController::DisplaySection(int section)
 {
     // Use context number
 bool wxWinHelpController::DisplaySection(int section)
 {
     // Use context number

-    if (m_helpFile == "") return FALSE;
+    if (m_helpFile == wxT("")) return FALSE;

 
     wxString str = m_helpFile;
     size_t len = str.Length();
 
     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 += ".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())
        {
 
     if (wxTheApp->GetTopWindow())
        {

-      WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const char*) str, HELP_CONTEXT, (DWORD)section);
+      WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section);

       return TRUE;
        }
     return FALSE;
       return TRUE;
        }
     return FALSE;


@@ -108,16 +106,16 @@ bool wxWinHelpController::DisplaySection(int section)
 bool wxWinHelpController::DisplayBlock(long block)
 {
     // Use context number -- a very rough equivalent to block id!
 bool wxWinHelpController::DisplayBlock(long block)
 {
     // Use context number -- a very rough equivalent to block id!

-    if (m_helpFile == "") 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)] == '.'))
 
     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 += ".hlp";
+      str += wxT(".hlp");

 
     if (wxTheApp->GetTopWindow())
        {
 
     if (wxTheApp->GetTopWindow())
        {

-      WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const char*) str, HELP_CONTEXT, (DWORD)block);
+      WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)block);

       return TRUE;
        }
     return FALSE;
       return TRUE;
        }
     return FALSE;


@@ -125,16 +123,16 @@ bool wxWinHelpController::DisplayBlock(long block)
 
 bool wxWinHelpController::KeywordSearch(const wxString& k)
 {
 
 bool wxWinHelpController::KeywordSearch(const wxString& k)
 {

-    if (m_helpFile == "") return FALSE;
+    if (m_helpFile == wxT("")) return FALSE;

 
     wxString str = m_helpFile;
     size_t len = str.Length();
 
     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 += ".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())
     {
 
     if (wxTheApp->GetTopWindow())
     {

-      WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const char*) str, HELP_PARTIALKEY, (DWORD)(const char*) k);
+      WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k);

       return TRUE;
     }
     return FALSE;
       return TRUE;
     }
     return FALSE;