check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index c5c2847bfc8232fac3f4006b8cc834cea973b81c..a9983916f7258a737e103ac6937e82a09c0425fa 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -19,7 +19,7 @@
 
 #if wxUSE_WXHTML_HELP
 
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/dynarray.h"
     #include "wx/intl.h"
@@ -34,15 +34,16 @@
     #include "wx/statbox.h"
     #include "wx/radiobox.h"
     #include "wx/menu.h"
-#endif // WXPRECOMP
-
-#ifdef __WXMAC__
+    #include "wx/settings.h"
     #include "wx/msgdlg.h"
-#endif
+    #include "wx/textctrl.h"
+    #include "wx/toolbar.h"
+    #include "wx/choicdlg.h"
+    #include "wx/filedlg.h"
+#endif // WX_PRECOMP
 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpctrl.h"
-#include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/imaglist.h"
 #include "wx/treectrl.h"
@@ -51,13 +52,10 @@
 #include "wx/html/htmlwin.h"
 #include "wx/busyinfo.h"
 #include "wx/progdlg.h"
-#include "wx/toolbar.h"
 #include "wx/fontenum.h"
-#include "wx/filedlg.h"
 #include "wx/artprov.h"
 #include "wx/spinctrl.h"
-#include "wx/choicdlg.h"
-#include "wx/settings.h"
+#include "wx/app.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame)
 
@@ -72,10 +70,11 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
 END_EVENT_TABLE()
 
 wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow* parent, wxWindowID id, const wxString& title,
-                                 int style, wxHtmlHelpData* data)
+                                 int style, wxHtmlHelpData* data,
+                                 wxConfigBase *config, const wxString& rootpath)
 {
     Init(data);
-    Create(parent, id, title, style);
+    Create(parent, id, title, style, config, rootpath);
 }
 
 void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
@@ -88,10 +87,13 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
 
 // Create: builds the GUI components.
 bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
-                             const wxString& WXUNUSED(title), int style)
+                             const wxString& WXUNUSED(title), int style,
+                             wxConfigBase *config, const wxString& rootpath)
 {
     m_HtmlHelpWin = new wxHtmlHelpWindow(m_Data);
-
+    if ( config)
+        m_HtmlHelpWin->UseConfig(config, rootpath);
+    
     wxFrame::Create(parent, id, _("Help"),
                     wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),
                     wxSize(m_HtmlHelpWin->GetCfgData().w, m_HtmlHelpWin->GetCfgData().h),
@@ -224,16 +226,23 @@ void wxHtmlHelpFrame::UseConfig(wxConfigBase *config, const wxString& rootPath)
 }
 
 #ifdef __WXMAC__
-void wxHtmlHelpFrame::OnClose(wxCommandEvent& event)
+void wxHtmlHelpFrame::OnClose(wxCommandEvent& WXUNUSED(event))
 {
     Close(true);
 }
 
-void wxHtmlHelpFrame::OnAbout(wxCommandEvent& event)
+void wxHtmlHelpFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxMessageBox(wxT("wxWidgets HTML Help Viewer (c) 1998-2006, Vaclav Slavik et al"), wxT("HelpView"),
         wxICON_INFORMATION|wxOK, this);
 }
 #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