fixing osx_carbon

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

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index c70f5f24aa4176e461f9519bc1dadb3244ffcc25..66c903a364520b7f73162340cbdb998d80d4eaa9 100644 (file)
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpctrl.cpp
+// Name:        src/html/helpctrl.cpp

 // Purpose:     wxHtmlHelpController
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Purpose:     wxHtmlHelpController
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik


@@ -46,16 +46,21 @@ wxHtmlHelpController::wxHtmlHelpController(int style, wxWindow* parentWindow):
     m_helpWindow = NULL;
     m_helpFrame = NULL;
     m_helpDialog = NULL;
     m_helpWindow = NULL;
     m_helpFrame = NULL;
     m_helpDialog = NULL;

+#if wxUSE_CONFIG

     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;
     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;

+#endif // wxUSE_CONFIG

     m_titleFormat = _("Help: %s");
     m_FrameStyle = style;
     m_titleFormat = _("Help: %s");
     m_FrameStyle = style;

+    m_shouldPreventAppExit = false;

 }
 
 wxHtmlHelpController::~wxHtmlHelpController()
 {
 }
 
 wxHtmlHelpController::~wxHtmlHelpController()
 {

+#if wxUSE_CONFIG

     if (m_Config)
         WriteCustomization(m_Config, m_ConfigRoot);
     if (m_Config)
         WriteCustomization(m_Config, m_ConfigRoot);

+#endif // wxUSE_CONFIG

     if (m_helpWindow)
         DestroyHelpWindow();
 }
     if (m_helpWindow)
         DestroyHelpWindow();
 }


@@ -85,8 +90,10 @@ void wxHtmlHelpController::DestroyHelpWindow()
 
 void wxHtmlHelpController::OnCloseFrame(wxCloseEvent& evt)
 {
 
 void wxHtmlHelpController::OnCloseFrame(wxCloseEvent& evt)
 {

+#if wxUSE_CONFIG

     if (m_Config)
         WriteCustomization(m_Config, m_ConfigRoot);
     if (m_Config)
         WriteCustomization(m_Config, m_ConfigRoot);

+#endif // wxUSE_CONFIG

 
     evt.Skip();
 
 
     evt.Skip();
 


@@ -99,6 +106,13 @@ void wxHtmlHelpController::OnCloseFrame(wxCloseEvent& evt)
     m_helpFrame = NULL;
 }
 
     m_helpFrame = NULL;
 }
 

+void wxHtmlHelpController::SetShouldPreventAppExit(bool enable)
+{
+    m_shouldPreventAppExit = enable;
+    if ( m_helpFrame )
+        m_helpFrame->SetShouldPreventAppExit(enable);
+}
+

 void wxHtmlHelpController::SetTitleFormat(const wxString& title)
 {
     m_titleFormat = title;
 void wxHtmlHelpController::SetTitleFormat(const wxString& title)
 {
     m_titleFormat = title;


@@ -151,8 +165,13 @@ wxHtmlHelpFrame* wxHtmlHelpController::CreateHelpFrame(wxHtmlHelpData *data)
 {
     wxHtmlHelpFrame* frame = new wxHtmlHelpFrame(data);
     frame->SetController(this);
 {
     wxHtmlHelpFrame* frame = new wxHtmlHelpFrame(data);
     frame->SetController(this);

-    frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle, m_Config, m_ConfigRoot);
+    frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle
+#if wxUSE_CONFIG
+        , m_Config, m_ConfigRoot
+#endif // wxUSE_CONFIG
+        );

     frame->SetTitleFormat(m_titleFormat);
     frame->SetTitleFormat(m_titleFormat);

+    frame->SetShouldPreventAppExit(m_shouldPreventAppExit);

     m_helpFrame = frame;
     return frame;
 }
     m_helpFrame = frame;
     return frame;
 }


@@ -180,12 +199,14 @@ wxWindow* wxHtmlHelpController::CreateHelpWindow()
         return m_helpWindow;
     }
 
         return m_helpWindow;
     }
 

+#if wxUSE_CONFIG

     if (m_Config == NULL)
     {
         m_Config = wxConfigBase::Get(false);
         if (m_Config != NULL)
     if (m_Config == NULL)
     {
         m_Config = wxConfigBase::Get(false);
         if (m_Config != NULL)

-            m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
+            m_ConfigRoot = wxT("wxWindows/wxHtmlHelpController");

     }
     }

+#endif // wxUSE_CONFIG

 
     if (m_FrameStyle & wxHF_DIALOG)
     {
 
     if (m_FrameStyle & wxHF_DIALOG)
     {


@@ -207,6 +228,7 @@ wxWindow* wxHtmlHelpController::CreateHelpWindow()
     return m_helpWindow;
 }
 
     return m_helpWindow;
 }
 

+#if wxUSE_CONFIG

 void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString& path)
 {
     /* should not be called by the user; call UseConfig, and the controller
 void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString& path)
 {
     /* should not be called by the user; call UseConfig, and the controller


@@ -229,6 +251,7 @@ void wxHtmlHelpController::UseConfig(wxConfigBase *config, const wxString& rootp
     if (m_helpWindow) m_helpWindow->UseConfig(config, rootpath);
     ReadCustomization(config, rootpath);
 }
     if (m_helpWindow) m_helpWindow->UseConfig(config, rootpath);
     ReadCustomization(config, rootpath);
 }

+#endif // wxUSE_CONFIG

 
 //// Backward compatibility with wxHelpController API
 
 
 //// Backward compatibility with wxHelpController API