wx namespace

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/tools/helpviewer.py b/wxPython/wx/tools/helpviewer.py
index 0d35e5ae3abec74e04119b699a9494f9aeb1213a..b025eccce1c0fc50ac68442555fa60f61dcabda3 100644 (file)
--- a/wxPython/wx/tools/helpviewer.py
+++ b/wxPython/wx/tools/helpviewer.py
@@ -41,28 +41,23 @@ def main(args=sys.argv):
         print __doc__
         return
 
         print __doc__
         return
 

-    from wxPython.wx import wxPySimpleApp, wxConfigBase_Get, \
-         wxLog_SetActiveTarget, wxLogStderr, \
-         wxLog_SetLogLevel, wxLOG_Error, \
-         wxFileSystem_AddHandler, wxZipFSHandler
-    import wxPython.html
-    from wxPython.htmlhelp import wxHtmlHelpController
+    import wx
+    import wx.html

 
 

-
-    app = wxPySimpleApp()
-    #wxLog_SetActiveTarget(wxLogStderr())
-    wxLog_SetLogLevel(wxLOG_Error)
+    app = wx.PySimpleApp()
+    #wx.Log.SetActiveTarget(wx.LogStderr())
+    wx.Log.SetLogLevel(wx.LOG_Error)

 
     # Set up the default config so the htmlhelp frame can save its preferences
     app.SetVendorName('wxWindows')
     app.SetAppName('helpviewer')
 
     # Set up the default config so the htmlhelp frame can save its preferences
     app.SetVendorName('wxWindows')
     app.SetAppName('helpviewer')

-    cfg = wxConfigBase_Get()
+    cfg = wx.ConfigBase.Get()

 
     # Add the Zip filesystem
 
     # Add the Zip filesystem

-    wxFileSystem_AddHandler(wxZipFSHandler())
+    wx.FileSystem.AddHandler(wx.ZipFSHandler())

 
     # Create the viewer
 
     # Create the viewer

-    helpctrl = wxHtmlHelpController()
+    helpctrl = wx.html.HtmlHelpController()

     if cachedir:
         helpctrl.SetTempDir(cachedir)
 
     if cachedir:
         helpctrl.SetTempDir(cachedir)
 


@@ -78,3 +73,5 @@ def main(args=sys.argv):
 
 if __name__ == '__main__':
     main()
 
 if __name__ == '__main__':
     main()

+
+