fixing osx_carbon

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

diff --git a/src/os2/helpwin.cpp b/src/os2/helpwin.cpp
index 1cff079772e74ee8fce71b77736e643f37eb40f2..dacf83e5249621dc793114c7d77116aca35029e4 100644 (file)
--- a/src/os2/helpwin.cpp
+++ b/src/os2/helpwin.cpp
@@ -1,24 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpwin.cpp
+// Name:        src/os2/helpwin.cpp

 // Purpose:     Help system: native implementation
 // Author:      David Webster
 // Modified by:
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     Help system: native implementation
 // Author:      David Webster
 // Modified by:
 // Created:     10/09/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_HELP
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/defs.h"

 #endif
 
 #include "wx/os2/helpwin.h"
 
 #endif
 
 #include "wx/os2/helpwin.h"
 

-#if wxUSE_HELP

 #include <time.h>
 
 #include <time.h>
 

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

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


@@ -32,7 +35,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
 
 wxWinHelpController::wxWinHelpController()
 {
 
 wxWinHelpController::wxWinHelpController()
 {

-    m_helpFile = "";
+    m_helpFile = wxEmptyString;

 }
 
 wxWinHelpController::~wxWinHelpController()
 }
 
 wxWinHelpController::~wxWinHelpController()


@@ -43,78 +46,82 @@ bool wxWinHelpController::Initialize(const wxString& filename)
 {
     m_helpFile = filename;
     // TODO any other inits
 {
     m_helpFile = filename;
     // TODO any other inits

-    return TRUE;
+    return true;

 }
 
 bool wxWinHelpController::LoadFile(const wxString& file)
 {
     m_helpFile = file;
     // TODO
 }
 
 bool wxWinHelpController::LoadFile(const wxString& file)
 {
     m_helpFile = file;
     // TODO

-    return TRUE;
+    return true;

 }
 
 bool wxWinHelpController::DisplayContents()
 {
 }
 
 bool wxWinHelpController::DisplayContents()
 {

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

 
     wxString str = m_helpFile;
 
     wxString str = m_helpFile;

-    size_t len = str.Length();
+    size_t len = str.length();

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

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

-    // TODO : display the help
-     return TRUE;
+        // TODO : display the help
+        return true;

     }
     }

-       return FALSE;
+    return false;

 }
 
 }
 

-bool wxWinHelpController::DisplaySection(int section)
+bool wxWinHelpController::DisplaySection(int WXUNUSED(section))

 {
     // Use context number
 {
     // Use context number

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

 
     wxString str = m_helpFile;
 
     wxString str = m_helpFile;

-    size_t len = str.Length();
+    size_t len = str.length();

     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 (!(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())

-       {
-    // TODO ::
-    //  WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section);
-      return TRUE;
-       }
-    return FALSE;
+    {
+        // TODO ::
+        //  WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)section);
+        return true;
+    }
+
+    return false;

 }
 
 }
 

-bool wxWinHelpController::DisplayBlock(long block)
+bool wxWinHelpController::DisplayBlock(long WXUNUSED(block))

 {
     // Use context number -- a very rough equivalent to block id!
 {
     // Use context number -- a very rough equivalent to block id!

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

 
     wxString str = m_helpFile;
 
     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)] == '.'))
+    size_t len = str.length();
+    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())
       str += wxT(".hlp");
 
     if (wxTheApp->GetTopWindow())

-       {
-    // TODO:
-    //  WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)block);
-      return TRUE;
-       }
-    return FALSE;
+    {
+        // TODO:
+        //  WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_CONTEXT, (DWORD)block);
+        return true;
+    }
+    return false;

 }
 
 }
 

-bool wxWinHelpController::KeywordSearch(const wxString& k,
+bool wxWinHelpController::KeywordSearch(const wxString& WXUNUSED(k),

                                         wxHelpSearchMode WXUNUSED(mode))
 {
                                         wxHelpSearchMode WXUNUSED(mode))
 {

-    if (m_helpFile == "") return FALSE;
+    if (m_helpFile == wxEmptyString) return false;

 
     wxString str = m_helpFile;
 
     wxString str = m_helpFile;

-    size_t len = str.Length();
+    size_t len = str.length();

     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 (!(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");
 


@@ -122,26 +129,26 @@ bool wxWinHelpController::KeywordSearch(const wxString& k,
     {
       // TODO:
       // WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k);
     {
       // TODO:
       // WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k);

-      return TRUE;
+      return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 // Can't close the help window explicitly in WinHelp
 bool wxWinHelpController::Quit()
 {
 }
 
 // Can't close the help window explicitly in WinHelp
 bool wxWinHelpController::Quit()
 {

-  if (wxTheApp->GetTopWindow())
-  {
-    // TODO:
-    // WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), 0, HELP_QUIT, 0L);
-    return TRUE;
-  }
-  else
-    return FALSE;
+    if (wxTheApp->GetTopWindow())
+    {
+      // TODO:
+      // WinHelp((HWND) wxTheApp->GetTopWindow()->GetHWND(), 0, HELP_QUIT, 0L);
+      return true;
+    }
+
+    return false;

 }
 
 void wxWinHelpController::OnQuit()
 {
 }
 }
 
 void wxWinHelpController::OnQuit()
 {
 }

-#endif // wxUSE_HELP

 
 

+#endif // wxUSE_HELP