From eb86f7ab808f831ed6f378038b8e394bfaa9719f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 25 Sep 2006 17:22:51 +0000 Subject: [PATCH] fix attribute errors when importing wxPython.wx git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/wxPython/_controls.py | 2 -- wxPython/wxPython/_misc.py | 6 +++--- wxPython/wxPython/_windows.py | 3 +++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/wxPython/wxPython/_controls.py b/wxPython/wxPython/_controls.py index 842703bad4..87773869bc 100644 --- a/wxPython/wxPython/_controls.py +++ b/wxPython/wxPython/_controls.py @@ -438,8 +438,6 @@ wxDirFilterListCtrl = wx._controls.DirFilterListCtrl wxPreDirFilterListCtrl = wx._controls.PreDirFilterListCtrl wxPyControl = wx._controls.PyControl wxPrePyControl = wx._controls.PrePyControl -wxFRAME_EX_CONTEXTHELP = wx._controls.FRAME_EX_CONTEXTHELP -wxDIALOG_EX_CONTEXTHELP = wx._controls.DIALOG_EX_CONTEXTHELP wxEVT_HELP = wx._controls.wxEVT_HELP wxEVT_DETAILED_HELP = wx._controls.wxEVT_DETAILED_HELP wxHelpEvent = wx._controls.HelpEvent diff --git a/wxPython/wxPython/_misc.py b/wxPython/wxPython/_misc.py index 9ec340eb08..b5c0a32956 100644 --- a/wxPython/wxPython/_misc.py +++ b/wxPython/wxPython/_misc.py @@ -423,9 +423,9 @@ wxART_FIND = wx._misc.ART_FIND wxART_FIND_AND_REPLACE = wx._misc.ART_FIND_AND_REPLACE wxArtProvider = wx._misc.ArtProvider wxArtProvider = wx._misc.ArtProvider -wxArtProvider_PushProvider = wx._misc.ArtProvider_PushProvider -wxArtProvider_PopProvider = wx._misc.ArtProvider_PopProvider -wxArtProvider_RemoveProvider = wx._misc.ArtProvider_RemoveProvider +wxArtProvider_PushProvider = wx._misc.ArtProvider_Push +wxArtProvider_PopProvider = wx._misc.ArtProvider_Pop +wxArtProvider_RemoveProvider = wx._misc.ArtProvider_Delete wxArtProvider_GetBitmap = wx._misc.ArtProvider_GetBitmap wxArtProvider_GetIcon = wx._misc.ArtProvider_GetIcon wxArtProvider_GetSizeHint = wx._misc.ArtProvider_GetSizeHint diff --git a/wxPython/wxPython/_windows.py b/wxPython/wxPython/_windows.py index e79cb88ccd..b30036553b 100644 --- a/wxPython/wxPython/_windows.py +++ b/wxPython/wxPython/_windows.py @@ -294,6 +294,9 @@ wxPyPrintPreview = wx._windows.PyPrintPreview wxPyPreviewFrame = wx._windows.PyPreviewFrame wxPyPreviewControlBar = wx._windows.PyPreviewControlBar +wxFRAME_EX_CONTEXTHELP = wx._windows.FRAME_EX_CONTEXTHELP +wxDIALOG_EX_CONTEXTHELP = wx._windows.DIALOG_EX_CONTEXTHELP + d = globals() for k, v in wx._windows.__dict__.iteritems():