Fix another crash when conversion fails in Unix PostScript code.

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

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 12437a80e3e1dac3c36f498122247aeb05edf703..69694cfad46a5f7865648c3e10a60325534eb628 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -4,7 +4,6 @@
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik

-// RCS-ID:      $Id$

 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -69,11 +68,18 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
 END_EVENT_TABLE()
 
 wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow* parent, wxWindowID id, const wxString& title,
 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);
 {
     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)
 }
 
 void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)


@@ -82,6 +88,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
     m_Data = data;
     m_HtmlHelpWin = NULL;
     m_helpController = NULL;
     m_Data = data;
     m_HtmlHelpWin = NULL;
     m_helpController = NULL;

+    m_shouldPreventAppExit = false;

 }
 
 void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)
 }
 
 void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)


@@ -93,13 +100,18 @@ void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)
 
 // Create: builds the GUI components.
 bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
 // 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);
 {
     m_HtmlHelpWin = new wxHtmlHelpWindow(m_Data);
     m_HtmlHelpWin->SetController(m_helpController);

-    if ( config)
+#if wxUSE_CONFIG
+    if ( config )

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

+#endif // wxUSE_CONFIG

 
     wxFrame::Create(parent, id, _("Help"),
                     wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),
 
     wxFrame::Create(parent, id, _("Help"),
                     wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),


@@ -127,9 +139,9 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
     fileMenu->Append(wxID_CLOSE, _("&Close"));
 
     wxMenu* helpMenu = new wxMenu;
     fileMenu->Append(wxID_CLOSE, _("&Close"));
 
     wxMenu* helpMenu = new wxMenu;

-    helpMenu->Append(wxID_ABOUT, _("&About..."));
+    helpMenu->Append(wxID_ABOUT, _("&About"));

     // Ensures we don't get an empty help menu
     // Ensures we don't get an empty help menu

-    helpMenu->Append(wxID_HELP_CONTENTS, _("&About..."));
+    helpMenu->Append(wxID_HELP_CONTENTS, _("&About"));

 
     menuBar->Append(fileMenu,_("&File"));
     menuBar->Append(helpMenu,_("&Help"));
 
     menuBar->Append(fileMenu,_("&File"));
     menuBar->Append(helpMenu,_("&Help"));


@@ -191,7 +203,7 @@ void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
     if (m_HtmlHelpWin->GetSplitterWindow() && m_HtmlHelpWin->GetCfgData().navig_on)
         m_HtmlHelpWin->GetCfgData().sashpos = m_HtmlHelpWin->GetSplitterWindow()->GetSashPosition();
 
     if (m_HtmlHelpWin->GetSplitterWindow() && m_HtmlHelpWin->GetCfgData().navig_on)
         m_HtmlHelpWin->GetCfgData().sashpos = m_HtmlHelpWin->GetSplitterWindow()->GetSashPosition();
 

-    if (m_helpController && m_helpController->IsKindOf(CLASSINFO(wxHtmlHelpController)))
+    if (m_helpController && wxDynamicCast(m_helpController, wxHtmlHelpController))

     {
         ((wxHtmlHelpController*) m_helpController)->OnCloseFrame(evt);
     }
     {
         ((wxHtmlHelpController*) m_helpController)->OnCloseFrame(evt);
     }


@@ -225,12 +237,19 @@ void wxHtmlHelpFrame::AddGrabIfNeeded()
 #endif // __WXGTK__
 }
 
 #endif // __WXGTK__
 }
 

+#if wxUSE_CONFIG

 // For compatibility
 void wxHtmlHelpFrame::UseConfig(wxConfigBase *config, const wxString& rootPath)
 {
     if (m_HtmlHelpWin)
         m_HtmlHelpWin->UseConfig(config, rootPath);
 }
 // 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))
 
 #ifdef __WXMAC__
 void wxHtmlHelpFrame::OnClose(wxCommandEvent& WXUNUSED(event))