added wOnAssert(..., wxCStrData) overload to fix compilation of code using wxASSERT...

[wxWidgets.git] / wxPython / wx / tools / helpviewer.py

diff --git a/wxPython/wx/tools/helpviewer.py b/wxPython/wx/tools/helpviewer.py
index b025eccce1c0fc50ac68442555fa60f61dcabda3..48fe6ef5c57584689a24b2e6fb73d941b6a4f02a 100644 (file)
--- a/wxPython/wx/tools/helpviewer.py
+++ b/wxPython/wx/tools/helpviewer.py
@@ -1,5 +1,5 @@
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------

-# Name:        wxPython.tools.helpviewer
+# Name:        wx.tools.helpviewer

 # Purpose:     HTML Help viewer
 #
 # Author:      Robin Dunn
 # Purpose:     HTML Help viewer
 #
 # Author:      Robin Dunn


@@ -26,6 +26,12 @@ import sys, os
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

+def makeOtherFrame(helpctrl):
+    import wx
+    parent = helpctrl.GetFrame()
+    otherFrame = wx.Frame(parent)
+    
+

 def main(args=sys.argv):
     if len(args) < 2:
         print __doc__
 def main(args=sys.argv):
     if len(args) < 2:
         print __doc__


@@ -66,6 +72,14 @@ def main(args=sys.argv):
         print "Adding %s..." % helpfile
         helpctrl.AddBook(helpfile, 1)
 
         print "Adding %s..." % helpfile
         helpctrl.AddBook(helpfile, 1)
 

+    # The frame used by the HtmlHelpController is set to not prevent
+    # app exit, so in the case of a standalone helpviewer like this
+    # when the about box or search box is closed the help frame will
+    # be the only one left and the app will close unexpectedly.  To
+    # work around this we'll create another frame that is never shown,
+    # but which will be closed when the helpviewer frame is closed.
+    wx.CallAfter(makeOtherFrame, helpctrl)
+

     # start it up!
     helpctrl.DisplayContents()
     app.MainLoop()
     # start it up!
     helpctrl.DisplayContents()
     app.MainLoop()