fixing screen coordinate transformation

[wxWidgets.git] / src / html / helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index a9983916f7258a737e103ac6937e82a09c0425fa..e8990b8d23821c2ec4f46de44270ab0ef70c69b2 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -55,7 +55,6 @@
 #include "wx/fontenum.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"
 #include "wx/fontenum.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"

-#include "wx/app.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
 


@@ -85,12 +84,20 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     m_helpController = (wxHtmlHelpController*) NULL;
 }
 
     m_helpController = (wxHtmlHelpController*) NULL;
 }
 

+void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)
+{
+    m_helpController = controller;
+    if ( m_HtmlHelpWin )
+        m_HtmlHelpWin->SetController(controller);
+}
+

 // Create: builds the GUI components.
 bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
                              const wxString& WXUNUSED(title), int style,
                              wxConfigBase *config, const wxString& rootpath)
 {
     m_HtmlHelpWin = new wxHtmlHelpWindow(m_Data);
 // Create: builds the GUI components.
 bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
                              const wxString& WXUNUSED(title), int style,
                              wxConfigBase *config, const wxString& rootpath)
 {
     m_HtmlHelpWin = new wxHtmlHelpWindow(m_Data);

+    m_HtmlHelpWin->SetController(m_helpController);

     if ( config)
         m_HtmlHelpWin->UseConfig(config, rootpath);
     
     if ( config)
         m_HtmlHelpWin->UseConfig(config, rootpath);
     


@@ -106,7 +113,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
     GetPosition(& (m_HtmlHelpWin->GetCfgData().x), & (m_HtmlHelpWin->GetCfgData()).y);
 
 
     GetPosition(& (m_HtmlHelpWin->GetCfgData().x), & (m_HtmlHelpWin->GetCfgData()).y);
 

-    SetIcon(wxArtProvider::GetIcon(wxART_HELP, wxART_HELP_BROWSER));
+    SetIcon(wxArtProvider::GetIcon(wxART_HELP, wxART_FRAME_ICON));

 
     // On the Mac, each modeless frame must have a menubar.
     // TODO: add more menu items, and perhaps add a style to show
 
     // On the Mac, each modeless frame must have a menubar.
     // TODO: add more menu items, and perhaps add a style to show


@@ -238,11 +245,4 @@ void wxHtmlHelpFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 }
 #endif
 
 }
 #endif
 

-// we don't want to prevent the app from closing just because a help window
-// remains opened
-bool wxHtmlHelpFrame::ShouldPreventAppExit() const
-{
-    return (wx_const_cast(wxHtmlHelpFrame*, this) == wxTheApp->GetTopWindow());
-}
-

 #endif // wxUSE_WXHTML_HELP
 #endif // wxUSE_WXHTML_HELP