do use the font in DoGetTextExtent()

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

diff --git a/src/msw/helpbest.cpp b/src/msw/helpbest.cpp
index bb1aad5059984d58826f1bdea7f77140dd5a2c8d..3605ea3daccd5f09c89d86889511c452ba814a4d 100644 (file)
--- a/src/msw/helpbest.cpp
+++ b/src/msw/helpbest.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpbest.cpp
+// Name:        src/msw/helpbest.cpp

 // Purpose:     Tries to load MS HTML Help, falls back to wxHTML upon failure
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     02/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon
 // Purpose:     Tries to load MS HTML Help, falls back to wxHTML upon failure
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     02/04/2001
 // RCS-ID:      $Id$
 // Copyright:   (c) Mattia Barbon

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

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "helpbest.h"
-#endif
-

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


@@ -21,13 +17,12 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/filefn.h"
 #endif
 
 #include "wx/filefn.h"

-#include "wx/log.h"

 
 

-#if wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) \
+#if wxUSE_HELP && wxUSE_MS_HTML_HELP \

     && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
 
 #include "wx/msw/helpchm.h"
     && wxUSE_WXHTML_HELP && !defined(__WXUNIVERSAL__)
 
 #include "wx/msw/helpchm.h"


@@ -39,7 +34,7 @@ IMPLEMENT_DYNAMIC_CLASS( wxBestHelpController, wxHelpControllerBase )
 bool wxBestHelpController::Initialize( const wxString& filename )
 {
     // try wxCHMHelpController
 bool wxBestHelpController::Initialize( const wxString& filename )
 {
     // try wxCHMHelpController

-    wxCHMHelpController* chm = new wxCHMHelpController;
+    wxCHMHelpController* chm = new wxCHMHelpController(m_parentWindow);

 
     m_helpControllerType = wxUseChmHelp;
     // do not warn upon failure
 
     m_helpControllerType = wxUseChmHelp;
     // do not warn upon failure


@@ -48,26 +43,29 @@ bool wxBestHelpController::Initialize( const wxString& filename )
     if( chm->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = chm;
     if( chm->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = chm;

-        return TRUE;
+        m_parentWindow = NULL;
+        return true;

     }
 
     // failed
     delete chm;
 
     // try wxHtmlHelpController
     }
 
     // failed
     delete chm;
 
     // try wxHtmlHelpController

-    wxHtmlHelpController* html = new wxHtmlHelpController;
+    wxHtmlHelpController *
+        html = new wxHtmlHelpController(m_style, m_parentWindow);

 
     m_helpControllerType = wxUseHtmlHelp;
     if( html->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = html;
 
     m_helpControllerType = wxUseHtmlHelp;
     if( html->Initialize( GetValidFilename( filename ) ) )
     {
         m_helpController = html;

-        return TRUE;
+        m_parentWindow = NULL;
+        return true;

     }
 
     // failed
     delete html;
 
     }
 
     // failed
     delete html;
 

-    return FALSE;
+    return false;

 }
 
 wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const
 }
 
 wxString wxBestHelpController::GetValidFilename( const wxString& filename ) const


@@ -102,4 +100,4 @@ wxString wxBestHelpController::GetValidFilename( const wxString& filename ) cons
 }
 
 #endif
 }
 
 #endif

-    // wxUSE_HELP && wxUSE_MS_HTML_HELP && defined(__WIN95__) && wxUSE_WXHTML_HELP
+    // wxUSE_HELP && wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP