X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f330429afd2aee5fcd98a1b75019734a9d9cd11..04fa04d8067d235ab45b5bc05b65f0679634b541:/src/html/helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index e8990b8d23..c726a936eb 100644
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -69,11 +69,18 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
 END_EVENT_TABLE()
 
 wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow* parent, wxWindowID id, const wxString& title,
-                                 int style, wxHtmlHelpData* data,
-                                 wxConfigBase *config, const wxString& rootpath)
+                                 int style, wxHtmlHelpData* data
+#if wxUSE_CONFIG
+                                 , wxConfigBase *config, const wxString& rootpath
+#endif // wxUSE_CONFIG
+                                 )
 {
     Init(data);
-    Create(parent, id, title, style, config, rootpath);
+    Create(parent, id, title, style
+#if wxUSE_CONFIG
+        , config, rootpath
+#endif // wxUSE_CONFIG
+        );
 }
 
 void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
@@ -81,7 +88,8 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     // Simply pass the pointer on to the help window
     m_Data = data;
     m_HtmlHelpWin = NULL;
-    m_helpController = (wxHtmlHelpController*) NULL;
+    m_helpController = NULL;
+    m_shouldPreventAppExit = false;
 }
 
 void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)
@@ -93,14 +101,19 @@ void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)
 
 // Create: builds the GUI components.
 bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
-                             const wxString& WXUNUSED(title), int style,
-                             wxConfigBase *config, const wxString& rootpath)
+                             const wxString& WXUNUSED(title), int style
+#if wxUSE_CONFIG
+                             , wxConfigBase *config, const wxString& rootpath
+#endif // wxUSE_CONFIG
+                             )
 {
     m_HtmlHelpWin = new wxHtmlHelpWindow(m_Data);
     m_HtmlHelpWin->SetController(m_helpController);
-    if ( config)
+#if wxUSE_CONFIG
+    if ( config )
         m_HtmlHelpWin->UseConfig(config, rootpath);
-    
+#endif // wxUSE_CONFIG
+
     wxFrame::Create(parent, id, _("Help"),
                     wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),
                     wxSize(m_HtmlHelpWin->GetCfgData().w, m_HtmlHelpWin->GetCfgData().h),
@@ -113,7 +126,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
     GetPosition(& (m_HtmlHelpWin->GetCfgData().x), & (m_HtmlHelpWin->GetCfgData()).y);
 
-    SetIcon(wxArtProvider::GetIcon(wxART_HELP, wxART_FRAME_ICON));
+    SetIcons(wxArtProvider::GetIconBundle(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
@@ -225,12 +238,19 @@ void wxHtmlHelpFrame::AddGrabIfNeeded()
 #endif // __WXGTK__
 }
 
+#if wxUSE_CONFIG
 // For compatibility
 void wxHtmlHelpFrame::UseConfig(wxConfigBase *config, const wxString& rootPath)
 {
     if (m_HtmlHelpWin)
         m_HtmlHelpWin->UseConfig(config, rootPath);
 }
+#endif // wxUSE_CONFIG
+
+void wxHtmlHelpFrame::SetShouldPreventAppExit(bool enable)
+{
+    m_shouldPreventAppExit = enable;
+}
 
 #ifdef __WXMAC__
 void wxHtmlHelpFrame::OnClose(wxCommandEvent& WXUNUSED(event))