From dd7a18f3e93730193216e46520802706cf37d241 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 24 Oct 2006 00:35:31 +0000 Subject: [PATCH] fix name errors git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/wxPython/animate.py | 7 ++----- wxPython/wxPython/help.py | 5 ----- wxPython/wxPython/html.py | 14 +++++++------- wxPython/wxPython/htmlhelp.py | 10 ---------- wxPython/wxPython/stc.py | 4 ++-- 5 files changed, 11 insertions(+), 29 deletions(-) diff --git a/wxPython/wxPython/animate.py b/wxPython/wxPython/animate.py index 9ae73bda6b..ce364cd113 100644 --- a/wxPython/wxPython/animate.py +++ b/wxPython/wxPython/animate.py @@ -19,16 +19,13 @@ del sys, _wx # Now assign all the reverse-renamed names: -wxAnimationControlNameStr = wx.animate.AnimationControlNameStr wxANIM_UNSPECIFIED = wx.animate.ANIM_UNSPECIFIED wxANIM_DONOTREMOVE = wx.animate.ANIM_DONOTREMOVE wxANIM_TOBACKGROUND = wx.animate.ANIM_TOBACKGROUND wxANIM_TOPREVIOUS = wx.animate.ANIM_TOPREVIOUS -wxAnimationPlayer = wx.animate.AnimationPlayer +wxAnimation = wx.animate.Animation +wxAnimationCtrl = wx.animate.AnimationCtrl wxAnimationBase = wx.animate.AnimationBase -wxGIFAnimation = wx.animate.GIFAnimation -wxAN_FIT_ANIMATION = wx.animate.AN_FIT_ANIMATION wxGIFAnimationCtrl = wx.animate.GIFAnimationCtrl -wxPreGIFAnimationCtrl = wx.animate.PreGIFAnimationCtrl diff --git a/wxPython/wxPython/help.py b/wxPython/wxPython/help.py index 2d93a940ce..23c27fb342 100644 --- a/wxPython/wxPython/help.py +++ b/wxPython/wxPython/help.py @@ -10,15 +10,10 @@ EVT_HELP = wxPython.wx.EVT_HELP EVT_HELP_RANGE = wxPython.wx.EVT_HELP_RANGE EVT_DETAILED_HELP = wxPython.wx.EVT_DETAILED_HELP EVT_DETAILED_HELP_RANGE = wxPython.wx.EVT_DETAILED_HELP_RANGE -wxHelpEventPtr = wxPython.wx.wxHelpEventPtr wxHelpEvent = wxPython.wx.wxHelpEvent -wxContextHelpPtr = wxPython.wx.wxContextHelpPtr wxContextHelp = wxPython.wx.wxContextHelp -wxContextHelpButtonPtr = wxPython.wx.wxContextHelpButtonPtr wxContextHelpButton = wxPython.wx.wxContextHelpButton -wxHelpProviderPtr = wxPython.wx.wxHelpProviderPtr wxHelpProvider = wxPython.wx.wxHelpProvider -wxSimpleHelpProviderPtr = wxPython.wx.wxSimpleHelpProviderPtr wxSimpleHelpProvider = wxPython.wx.wxSimpleHelpProvider wxHelpProvider_Set = wxPython.wx.wxHelpProvider_Set wxHelpProvider_Get = wxPython.wx.wxHelpProvider_Get diff --git a/wxPython/wxPython/html.py b/wxPython/wxPython/html.py index 2d2999a16b..44ac756993 100644 --- a/wxPython/wxPython/html.py +++ b/wxPython/wxPython/html.py @@ -41,13 +41,13 @@ wxHTML_INDENT_ALL = wx.html.HTML_INDENT_ALL wxHTML_COND_ISANCHOR = wx.html.HTML_COND_ISANCHOR wxHTML_COND_ISIMAGEMAP = wx.html.HTML_COND_ISIMAGEMAP wxHTML_COND_USER = wx.html.HTML_COND_USER -wxHTML_FONT_SIZE_1 = wx.html.HTML_FONT_SIZE_1 -wxHTML_FONT_SIZE_2 = wx.html.HTML_FONT_SIZE_2 -wxHTML_FONT_SIZE_3 = wx.html.HTML_FONT_SIZE_3 -wxHTML_FONT_SIZE_4 = wx.html.HTML_FONT_SIZE_4 -wxHTML_FONT_SIZE_5 = wx.html.HTML_FONT_SIZE_5 -wxHTML_FONT_SIZE_6 = wx.html.HTML_FONT_SIZE_6 -wxHTML_FONT_SIZE_7 = wx.html.HTML_FONT_SIZE_7 +wxHTML_FONT_SIZE_1 = 0 +wxHTML_FONT_SIZE_2 = 0 +wxHTML_FONT_SIZE_3 = 0 +wxHTML_FONT_SIZE_4 = 0 +wxHTML_FONT_SIZE_5 = 0 +wxHTML_FONT_SIZE_6 = 0 +wxHTML_FONT_SIZE_7 = 0 wxHW_SCROLLBAR_NEVER = wx.html.HW_SCROLLBAR_NEVER wxHW_SCROLLBAR_AUTO = wx.html.HW_SCROLLBAR_AUTO wxHW_NO_SELECTION = wx.html.HW_NO_SELECTION diff --git a/wxPython/wxPython/htmlhelp.py b/wxPython/wxPython/htmlhelp.py index 06fa791ad5..5fc0e6bd87 100644 --- a/wxPython/wxPython/htmlhelp.py +++ b/wxPython/wxPython/htmlhelp.py @@ -7,24 +7,14 @@ import wxPython.wx import wxPython.html -wxHtmlBookRecordPtr = wxPython.html.wxHtmlBookRecordPtr wxHtmlBookRecord = wxPython.html.wxHtmlBookRecord -wxHtmlContentsItemPtr = wxPython.html.wxHtmlContentsItemPtr -wxHtmlContentsItem = wxPython.html.wxHtmlContentsItem -wxHtmlSearchStatusPtr = wxPython.html.wxHtmlSearchStatusPtr wxHtmlSearchStatus = wxPython.html.wxHtmlSearchStatus -wxHtmlHelpDataPtr = wxPython.html.wxHtmlHelpDataPtr wxHtmlHelpData = wxPython.html.wxHtmlHelpData -wxHtmlHelpFramePtr = wxPython.html.wxHtmlHelpFramePtr wxHtmlHelpFrame = wxPython.html.wxHtmlHelpFrame -wxHtmlHelpControllerPtr = wxPython.html.wxHtmlHelpControllerPtr wxHtmlHelpController = wxPython.html.wxHtmlHelpController wxHF_TOOLBAR = wxPython.html.wxHF_TOOLBAR -wxHF_FLATTOOLBAR = wxPython.html.wxHF_FLATTOOLBAR wxHF_CONTENTS = wxPython.html.wxHF_CONTENTS wxHF_INDEX = wxPython.html.wxHF_INDEX wxHF_SEARCH = wxPython.html.wxHF_SEARCH wxHF_BOOKMARKS = wxPython.html.wxHF_BOOKMARKS -wxHF_OPENFILES = wxPython.html.wxHF_OPENFILES wxHF_PRINT = wxPython.html.wxHF_PRINT -wxHF_DEFAULTSTYLE = wxPython.html.wxHF_DEFAULTSTYLE diff --git a/wxPython/wxPython/stc.py b/wxPython/wxPython/stc.py index 52d74cdbd6..377fc7c9e8 100644 --- a/wxPython/wxPython/stc.py +++ b/wxPython/wxPython/stc.py @@ -279,8 +279,8 @@ wxSTC_LEX_SMALLTALK = wx.stc.STC_LEX_SMALLTALK wxSTC_LEX_FLAGSHIP = wx.stc.STC_LEX_FLAGSHIP wxSTC_LEX_CSOUND = wx.stc.STC_LEX_CSOUND wxSTC_LEX_FREEBASIC = wx.stc.STC_LEX_FREEBASIC -wxSTC_LEX_ASP = wx.stc.STC_LEX_ASP -wxSTC_LEX_PHP = wx.stc.STC_LEX_PHP +wxSTC_LEX_ASP = 0 +wxSTC_LEX_PHP = 0 wxSTC_LEX_AUTOMATIC = wx.stc.STC_LEX_AUTOMATIC wxSTC_P_DEFAULT = wx.stc.STC_P_DEFAULT wxSTC_P_COMMENTLINE = wx.stc.STC_P_COMMENTLINE -- 2.45.2