From: Robin Dunn Date: Thu, 23 Mar 2006 15:56:22 +0000 (+0000) Subject: no longer need reverse renamers for the *Ptr classes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6cfc5ebfa7c041f298f0c87b30aac6a34ae54b3c no longer need reverse renamers for the *Ptr classes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/config.py b/wxPython/config.py index 0188ea6fd0..c25ce4f35d 100644 --- a/wxPython/config.py +++ b/wxPython/config.py @@ -1051,7 +1051,6 @@ class BuildRenamers: # do a depth first iteration over what's left for node in topnode: doRename = False - doPtr = False addWX = False revOnly = False @@ -1060,7 +1059,6 @@ class BuildRenamers: lastClassName = name = self.GetAttr(node, "name") lastClassSymName = sym_name = self.GetAttr(node, "sym_name") doRename = True - doPtr = True if sym_name != name: name = sym_name addWX = True @@ -1118,8 +1116,6 @@ class BuildRenamers: if addWX and not old.startswith('wx'): old = 'wx'+old pyFile.write("%s = wx.%s.%s\n" % (old, modname, new)) - if doPtr: - pyFile.write("%sPtr = wx.%s.%sPtr\n" % (old, modname, new)) #--------------------------------------------------------------------------- diff --git a/wxPython/wxPython/_controls.py b/wxPython/wxPython/_controls.py index ddf343e7c0..1587864f41 100644 --- a/wxPython/wxPython/_controls.py +++ b/wxPython/wxPython/_controls.py @@ -28,12 +28,10 @@ wxBU_ALIGN_MASK = wx._controls.BU_ALIGN_MASK wxBU_EXACTFIT = wx._controls.BU_EXACTFIT wxBU_AUTODRAW = wx._controls.BU_AUTODRAW wxButton = wx._controls.Button -wxButtonPtr = wx._controls.ButtonPtr wxPreButton = wx._controls.PreButton wxButton_GetDefaultSize = wx._controls.Button_GetDefaultSize wxButton_GetClassDefaultAttributes = wx._controls.Button_GetClassDefaultAttributes wxBitmapButton = wx._controls.BitmapButton -wxBitmapButtonPtr = wx._controls.BitmapButtonPtr wxPreBitmapButton = wx._controls.PreBitmapButton wxCheckBoxNameStr = wx._controls.CheckBoxNameStr wxCHK_2STATE = wx._controls.CHK_2STATE @@ -43,17 +41,14 @@ wxCHK_UNCHECKED = wx._controls.CHK_UNCHECKED wxCHK_CHECKED = wx._controls.CHK_CHECKED wxCHK_UNDETERMINED = wx._controls.CHK_UNDETERMINED wxCheckBox = wx._controls.CheckBox -wxCheckBoxPtr = wx._controls.CheckBoxPtr wxPreCheckBox = wx._controls.PreCheckBox wxCheckBox_GetClassDefaultAttributes = wx._controls.CheckBox_GetClassDefaultAttributes wxChoiceNameStr = wx._controls.ChoiceNameStr wxChoice = wx._controls.Choice -wxChoicePtr = wx._controls.ChoicePtr wxPreChoice = wx._controls.PreChoice wxChoice_GetClassDefaultAttributes = wx._controls.Choice_GetClassDefaultAttributes wxComboBoxNameStr = wx._controls.ComboBoxNameStr wxComboBox = wx._controls.ComboBox -wxComboBoxPtr = wx._controls.ComboBoxPtr wxPreComboBox = wx._controls.PreComboBox wxComboBox_GetClassDefaultAttributes = wx._controls.ComboBox_GetClassDefaultAttributes wxGaugeNameStr = wx._controls.GaugeNameStr @@ -62,36 +57,29 @@ wxGA_VERTICAL = wx._controls.GA_VERTICAL wxGA_SMOOTH = wx._controls.GA_SMOOTH wxGA_PROGRESSBAR = wx._controls.GA_PROGRESSBAR wxGauge = wx._controls.Gauge -wxGaugePtr = wx._controls.GaugePtr wxPreGauge = wx._controls.PreGauge wxGauge_GetClassDefaultAttributes = wx._controls.Gauge_GetClassDefaultAttributes wxStaticBitmapNameStr = wx._controls.StaticBitmapNameStr wxStaticBoxNameStr = wx._controls.StaticBoxNameStr wxStaticTextNameStr = wx._controls.StaticTextNameStr wxStaticBox = wx._controls.StaticBox -wxStaticBoxPtr = wx._controls.StaticBoxPtr wxPreStaticBox = wx._controls.PreStaticBox wxStaticBox_GetClassDefaultAttributes = wx._controls.StaticBox_GetClassDefaultAttributes wxStaticLine = wx._controls.StaticLine -wxStaticLinePtr = wx._controls.StaticLinePtr wxPreStaticLine = wx._controls.PreStaticLine wxStaticLine_GetDefaultSize = wx._controls.StaticLine_GetDefaultSize wxStaticLine_GetClassDefaultAttributes = wx._controls.StaticLine_GetClassDefaultAttributes wxStaticText = wx._controls.StaticText -wxStaticTextPtr = wx._controls.StaticTextPtr wxPreStaticText = wx._controls.PreStaticText wxStaticText_GetClassDefaultAttributes = wx._controls.StaticText_GetClassDefaultAttributes wxStaticBitmap = wx._controls.StaticBitmap -wxStaticBitmapPtr = wx._controls.StaticBitmapPtr wxPreStaticBitmap = wx._controls.PreStaticBitmap wxStaticBitmap_GetClassDefaultAttributes = wx._controls.StaticBitmap_GetClassDefaultAttributes wxListBoxNameStr = wx._controls.ListBoxNameStr wxListBox = wx._controls.ListBox -wxListBoxPtr = wx._controls.ListBoxPtr wxPreListBox = wx._controls.PreListBox wxListBox_GetClassDefaultAttributes = wx._controls.ListBox_GetClassDefaultAttributes wxCheckListBox = wx._controls.CheckListBox -wxCheckListBoxPtr = wx._controls.CheckListBoxPtr wxPreCheckListBox = wx._controls.PreCheckListBox wxTextCtrlNameStr = wx._controls.TextCtrlNameStr wxTE_NO_VSCROLL = wx._controls.TE_NO_VSCROLL @@ -141,10 +129,8 @@ wxTE_HT_BEYOND = wx._controls.TE_HT_BEYOND wxOutOfRangeTextCoord = wx._controls.OutOfRangeTextCoord wxInvalidTextCoord = wx._controls.InvalidTextCoord wxTextAttr = wx._controls.TextAttr -wxTextAttrPtr = wx._controls.TextAttrPtr wxTextAttr_Combine = wx._controls.TextAttr_Combine wxTextCtrl = wx._controls.TextCtrl -wxTextCtrlPtr = wx._controls.TextCtrlPtr wxPreTextCtrl = wx._controls.PreTextCtrl wxTextCtrl_GetClassDefaultAttributes = wx._controls.TextCtrl_GetClassDefaultAttributes wxEVT_COMMAND_TEXT_UPDATED = wx._controls.wxEVT_COMMAND_TEXT_UPDATED @@ -152,10 +138,8 @@ wxEVT_COMMAND_TEXT_ENTER = wx._controls.wxEVT_COMMAND_TEXT_ENTER wxEVT_COMMAND_TEXT_URL = wx._controls.wxEVT_COMMAND_TEXT_URL wxEVT_COMMAND_TEXT_MAXLEN = wx._controls.wxEVT_COMMAND_TEXT_MAXLEN wxTextUrlEvent = wx._controls.TextUrlEvent -wxTextUrlEventPtr = wx._controls.TextUrlEventPtr wxScrollBarNameStr = wx._controls.ScrollBarNameStr wxScrollBar = wx._controls.ScrollBar -wxScrollBarPtr = wx._controls.ScrollBarPtr wxPreScrollBar = wx._controls.PreScrollBar wxScrollBar_GetClassDefaultAttributes = wx._controls.ScrollBar_GetClassDefaultAttributes wxSPIN_BUTTON_NAME = wx._controls.SPIN_BUTTON_NAME @@ -165,24 +149,19 @@ wxSP_VERTICAL = wx._controls.SP_VERTICAL wxSP_ARROW_KEYS = wx._controls.SP_ARROW_KEYS wxSP_WRAP = wx._controls.SP_WRAP wxSpinButton = wx._controls.SpinButton -wxSpinButtonPtr = wx._controls.SpinButtonPtr wxPreSpinButton = wx._controls.PreSpinButton wxSpinButton_GetClassDefaultAttributes = wx._controls.SpinButton_GetClassDefaultAttributes wxSpinCtrl = wx._controls.SpinCtrl -wxSpinCtrlPtr = wx._controls.SpinCtrlPtr wxPreSpinCtrl = wx._controls.PreSpinCtrl wxSpinCtrl_GetClassDefaultAttributes = wx._controls.SpinCtrl_GetClassDefaultAttributes wxSpinEvent = wx._controls.SpinEvent -wxSpinEventPtr = wx._controls.SpinEventPtr wxEVT_COMMAND_SPINCTRL_UPDATED = wx._controls.wxEVT_COMMAND_SPINCTRL_UPDATED wxRadioBoxNameStr = wx._controls.RadioBoxNameStr wxRadioButtonNameStr = wx._controls.RadioButtonNameStr wxRadioBox = wx._controls.RadioBox -wxRadioBoxPtr = wx._controls.RadioBoxPtr wxPreRadioBox = wx._controls.PreRadioBox wxRadioBox_GetClassDefaultAttributes = wx._controls.RadioBox_GetClassDefaultAttributes wxRadioButton = wx._controls.RadioButton -wxRadioButtonPtr = wx._controls.RadioButtonPtr wxPreRadioButton = wx._controls.PreRadioButton wxRadioButton_GetClassDefaultAttributes = wx._controls.RadioButton_GetClassDefaultAttributes wxSliderNameStr = wx._controls.SliderNameStr @@ -199,13 +178,11 @@ wxSL_BOTH = wx._controls.SL_BOTH wxSL_SELRANGE = wx._controls.SL_SELRANGE wxSL_INVERSE = wx._controls.SL_INVERSE wxSlider = wx._controls.Slider -wxSliderPtr = wx._controls.SliderPtr wxPreSlider = wx._controls.PreSlider wxSlider_GetClassDefaultAttributes = wx._controls.Slider_GetClassDefaultAttributes wxToggleButtonNameStr = wx._controls.ToggleButtonNameStr wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = wx._controls.wxEVT_COMMAND_TOGGLEBUTTON_CLICKED wxToggleButton = wx._controls.ToggleButton -wxToggleButtonPtr = wx._controls.ToggleButtonPtr wxPreToggleButton = wx._controls.PreToggleButton wxToggleButton_GetClassDefaultAttributes = wx._controls.ToggleButton_GetClassDefaultAttributes wxNotebookNameStr = wx._controls.NotebookNameStr @@ -216,10 +193,8 @@ wxBK_LEFT = wx._controls.BK_LEFT wxBK_RIGHT = wx._controls.BK_RIGHT wxBK_ALIGN_MASK = wx._controls.BK_ALIGN_MASK wxBookCtrlBase = wx._controls.BookCtrlBase -wxBookCtrlBasePtr = wx._controls.BookCtrlBasePtr wxBookCtrlBase_GetClassDefaultAttributes = wx._controls.BookCtrlBase_GetClassDefaultAttributes wxBookCtrlBaseEvent = wx._controls.BookCtrlBaseEvent -wxBookCtrlBaseEventPtr = wx._controls.BookCtrlBaseEventPtr wxNB_FIXEDWIDTH = wx._controls.NB_FIXEDWIDTH wxNB_TOP = wx._controls.NB_TOP wxNB_LEFT = wx._controls.NB_LEFT @@ -232,11 +207,9 @@ wxNB_HITTEST_ONICON = wx._controls.NB_HITTEST_ONICON wxNB_HITTEST_ONLABEL = wx._controls.NB_HITTEST_ONLABEL wxNB_HITTEST_ONITEM = wx._controls.NB_HITTEST_ONITEM wxNotebook = wx._controls.Notebook -wxNotebookPtr = wx._controls.NotebookPtr wxPreNotebook = wx._controls.PreNotebook wxNotebook_GetClassDefaultAttributes = wx._controls.Notebook_GetClassDefaultAttributes wxNotebookEvent = wx._controls.NotebookEvent -wxNotebookEventPtr = wx._controls.NotebookEventPtr wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING wxLB_DEFAULT = wx._controls.LB_DEFAULT @@ -246,10 +219,8 @@ wxLB_LEFT = wx._controls.LB_LEFT wxLB_RIGHT = wx._controls.LB_RIGHT wxLB_ALIGN_MASK = wx._controls.LB_ALIGN_MASK wxListbook = wx._controls.Listbook -wxListbookPtr = wx._controls.ListbookPtr wxPreListbook = wx._controls.PreListbook wxListbookEvent = wx._controls.ListbookEvent -wxListbookEventPtr = wx._controls.ListbookEventPtr wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING wxCHB_DEFAULT = wx._controls.CHB_DEFAULT @@ -259,26 +230,20 @@ wxCHB_LEFT = wx._controls.CHB_LEFT wxCHB_RIGHT = wx._controls.CHB_RIGHT wxCHB_ALIGN_MASK = wx._controls.CHB_ALIGN_MASK wxChoicebook = wx._controls.Choicebook -wxChoicebookPtr = wx._controls.ChoicebookPtr wxPreChoicebook = wx._controls.PreChoicebook wxChoicebookEvent = wx._controls.ChoicebookEvent -wxChoicebookEventPtr = wx._controls.ChoicebookEventPtr wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING wxTreebook = wx._controls.Treebook -wxTreebookPtr = wx._controls.TreebookPtr wxPreTreebook = wx._controls.PreTreebook wxTreebookEvent = wx._controls.TreebookEvent -wxTreebookEventPtr = wx._controls.TreebookEventPtr wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED = wx._controls.wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED = wx._controls.wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED wxToolbook = wx._controls.Toolbook -wxToolbookPtr = wx._controls.ToolbookPtr wxPreToolbook = wx._controls.PreToolbook wxToolbookEvent = wx._controls.ToolbookEvent -wxToolbookEventPtr = wx._controls.ToolbookEventPtr wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING wxTOOL_STYLE_BUTTON = wx._controls.TOOL_STYLE_BUTTON @@ -296,11 +261,8 @@ wxTB_NOALIGN = wx._controls.TB_NOALIGN wxTB_HORZ_LAYOUT = wx._controls.TB_HORZ_LAYOUT wxTB_HORZ_TEXT = wx._controls.TB_HORZ_TEXT wxToolBarToolBase = wx._controls.ToolBarToolBase -wxToolBarToolBasePtr = wx._controls.ToolBarToolBasePtr wxToolBarBase = wx._controls.ToolBarBase -wxToolBarBasePtr = wx._controls.ToolBarBasePtr wxToolBar = wx._controls.ToolBar -wxToolBarPtr = wx._controls.ToolBarPtr wxPreToolBar = wx._controls.PreToolBar wxToolBar_GetClassDefaultAttributes = wx._controls.ToolBar_GetClassDefaultAttributes wxListCtrlNameStr = wx._controls.ListCtrlNameStr @@ -373,11 +335,8 @@ wxLIST_FIND_DOWN = wx._controls.LIST_FIND_DOWN wxLIST_FIND_LEFT = wx._controls.LIST_FIND_LEFT wxLIST_FIND_RIGHT = wx._controls.LIST_FIND_RIGHT wxListItemAttr = wx._controls.ListItemAttr -wxListItemAttrPtr = wx._controls.ListItemAttrPtr wxListItem = wx._controls.ListItem -wxListItemPtr = wx._controls.ListItemPtr wxListEvent = wx._controls.ListEvent -wxListEventPtr = wx._controls.ListEventPtr wxEVT_COMMAND_LIST_BEGIN_DRAG = wx._controls.wxEVT_COMMAND_LIST_BEGIN_DRAG wxEVT_COMMAND_LIST_BEGIN_RDRAG = wx._controls.wxEVT_COMMAND_LIST_BEGIN_RDRAG wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wx._controls.wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT @@ -399,12 +358,10 @@ wxEVT_COMMAND_LIST_COL_DRAGGING = wx._controls.wxEVT_COMMAND_LIST_COL_DRAGGING wxEVT_COMMAND_LIST_COL_END_DRAG = wx._controls.wxEVT_COMMAND_LIST_COL_END_DRAG wxEVT_COMMAND_LIST_ITEM_FOCUSED = wx._controls.wxEVT_COMMAND_LIST_ITEM_FOCUSED wxListCtrl = wx._controls.ListCtrl -wxListCtrlPtr = wx._controls.ListCtrlPtr wxListCtrl = wx._controls.ListCtrl wxPreListCtrl = wx._controls.PreListCtrl wxListCtrl_GetClassDefaultAttributes = wx._controls.ListCtrl_GetClassDefaultAttributes wxListView = wx._controls.ListView -wxListViewPtr = wx._controls.ListViewPtr wxPreListView = wx._controls.PreListView wxTreeCtrlNameStr = wx._controls.TreeCtrlNameStr wxTR_NO_BUTTONS = wx._controls.TR_NO_BUTTONS @@ -443,9 +400,7 @@ wxTREE_HITTEST_ONITEMUPPERPART = wx._controls.TREE_HITTEST_ONITEMUPPERPART wxTREE_HITTEST_ONITEMLOWERPART = wx._controls.TREE_HITTEST_ONITEMLOWERPART wxTREE_HITTEST_ONITEM = wx._controls.TREE_HITTEST_ONITEM wxTreeItemId = wx._controls.TreeItemId -wxTreeItemIdPtr = wx._controls.TreeItemIdPtr wxTreeItemData = wx._controls.TreeItemData -wxTreeItemDataPtr = wx._controls.TreeItemDataPtr wxTreeItemData = wx._controls.TreeItemData wxEVT_COMMAND_TREE_BEGIN_DRAG = wx._controls.wxEVT_COMMAND_TREE_BEGIN_DRAG wxEVT_COMMAND_TREE_BEGIN_RDRAG = wx._controls.wxEVT_COMMAND_TREE_BEGIN_RDRAG @@ -469,9 +424,7 @@ wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK = wx._controls.wxEVT_COMMAND_TREE_STATE_IMA wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP = wx._controls.wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP wxEVT_COMMAND_TREE_ITEM_MENU = wx._controls.wxEVT_COMMAND_TREE_ITEM_MENU wxTreeEvent = wx._controls.TreeEvent -wxTreeEventPtr = wx._controls.TreeEventPtr wxTreeCtrl = wx._controls.TreeCtrl -wxTreeCtrlPtr = wx._controls.TreeCtrlPtr wxTreeCtrl = wx._controls.TreeCtrl wxPreTreeCtrl = wx._controls.PreTreeCtrl wxTreeCtrl_GetClassDefaultAttributes = wx._controls.TreeCtrl_GetClassDefaultAttributes @@ -482,32 +435,23 @@ wxDIRCTRL_SHOW_FILTERS = wx._controls.DIRCTRL_SHOW_FILTERS wxDIRCTRL_3D_INTERNAL = wx._controls.DIRCTRL_3D_INTERNAL wxDIRCTRL_EDIT_LABELS = wx._controls.DIRCTRL_EDIT_LABELS wxGenericDirCtrl = wx._controls.GenericDirCtrl -wxGenericDirCtrlPtr = wx._controls.GenericDirCtrlPtr wxPreGenericDirCtrl = wx._controls.PreGenericDirCtrl wxDirFilterListCtrl = wx._controls.DirFilterListCtrl -wxDirFilterListCtrlPtr = wx._controls.DirFilterListCtrlPtr wxPreDirFilterListCtrl = wx._controls.PreDirFilterListCtrl wxPyControl = wx._controls.PyControl -wxPyControlPtr = wx._controls.PyControlPtr 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 -wxHelpEventPtr = wx._controls.HelpEventPtr wxContextHelp = wx._controls.ContextHelp -wxContextHelpPtr = wx._controls.ContextHelpPtr wxContextHelpButton = wx._controls.ContextHelpButton -wxContextHelpButtonPtr = wx._controls.ContextHelpButtonPtr wxHelpProvider = wx._controls.HelpProvider -wxHelpProviderPtr = wx._controls.HelpProviderPtr wxHelpProvider_Set = wx._controls.HelpProvider_Set wxHelpProvider_Get = wx._controls.HelpProvider_Get wxSimpleHelpProvider = wx._controls.SimpleHelpProvider -wxSimpleHelpProviderPtr = wx._controls.SimpleHelpProviderPtr wxDragImage = wx._controls.DragImage -wxDragImagePtr = wx._controls.DragImagePtr wxDragImage = wx._controls.DragImage wxDragIcon = wx._controls.DragIcon wxDragString = wx._controls.DragString @@ -520,7 +464,6 @@ wxDP_DROPDOWN = wx._controls.DP_DROPDOWN wxDP_SHOWCENTURY = wx._controls.DP_SHOWCENTURY wxDP_ALLOWNONE = wx._controls.DP_ALLOWNONE wxDatePickerCtrl = wx._controls.DatePickerCtrl -wxDatePickerCtrlPtr = wx._controls.DatePickerCtrlPtr wxPreDatePickerCtrl = wx._controls.PreDatePickerCtrl diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py index 1de9c20c89..ca9b910bdf 100644 --- a/wxPython/wxPython/_core.py +++ b/wxPython/wxPython/_core.py @@ -632,7 +632,6 @@ wxUPDATE_UI_RECURSE = wx._core.UPDATE_UI_RECURSE wxUPDATE_UI_FROMIDLE = wx._core.UPDATE_UI_FROMIDLE wxEmptyString = wx._core.EmptyString wxObject = wx._core.Object -wxObjectPtr = wx._core.ObjectPtr wxBITMAP_TYPE_INVALID = wx._core.BITMAP_TYPE_INVALID wxBITMAP_TYPE_BMP = wx._core.BITMAP_TYPE_BMP wxBITMAP_TYPE_ICO = wx._core.BITMAP_TYPE_ICO @@ -685,19 +684,14 @@ wxCURSOR_COPY_ARROW = wx._core.CURSOR_COPY_ARROW wxCURSOR_ARROWWAIT = wx._core.CURSOR_ARROWWAIT wxCURSOR_MAX = wx._core.CURSOR_MAX wxSize = wx._core.Size -wxSizePtr = wx._core.SizePtr wxRealPoint = wx._core.RealPoint -wxRealPointPtr = wx._core.RealPointPtr wxPoint = wx._core.Point -wxPointPtr = wx._core.PointPtr wxRect = wx._core.Rect -wxRectPtr = wx._core.RectPtr wxRectPP = wx._core.RectPP wxRectPS = wx._core.RectPS wxRectS = wx._core.RectS wxIntersectRect = wx._core.IntersectRect wxPoint2D = wx._core.Point2D -wxPoint2DPtr = wx._core.Point2DPtr wxPoint2DCopy = wx._core.Point2DCopy wxPoint2DFromPoint = wx._core.Point2DFromPoint wxDefaultPosition = wx._core.DefaultPosition @@ -706,49 +700,34 @@ wxFromStart = wx._core.FromStart wxFromCurrent = wx._core.FromCurrent wxFromEnd = wx._core.FromEnd wxInputStream = wx._core.InputStream -wxInputStreamPtr = wx._core.InputStreamPtr wxInputStream = wx._core.InputStream wxOutputStream = wx._core.OutputStream -wxOutputStreamPtr = wx._core.OutputStreamPtr wxFSFile = wx._core.FSFile -wxFSFilePtr = wx._core.FSFilePtr wxCPPFileSystemHandler = wx._core.CPPFileSystemHandler -wxCPPFileSystemHandlerPtr = wx._core.CPPFileSystemHandlerPtr wxFileSystemHandler = wx._core.FileSystemHandler -wxFileSystemHandlerPtr = wx._core.FileSystemHandlerPtr wxFileSystemHandler = wx._core.FileSystemHandler wxFileSystem = wx._core.FileSystem -wxFileSystemPtr = wx._core.FileSystemPtr wxFileSystem_AddHandler = wx._core.FileSystem_AddHandler wxFileSystem_CleanUpHandlers = wx._core.FileSystem_CleanUpHandlers wxFileSystem_FileNameToURL = wx._core.FileSystem_FileNameToURL wxFileSystem_URLToFileName = wx._core.FileSystem_URLToFileName wxInternetFSHandler = wx._core.InternetFSHandler -wxInternetFSHandlerPtr = wx._core.InternetFSHandlerPtr wxZipFSHandler = wx._core.ZipFSHandler -wxZipFSHandlerPtr = wx._core.ZipFSHandlerPtr __wxMemoryFSHandler_AddFile_wxImage = wx._core.__wxMemoryFSHandler_AddFile_wxImage __wxMemoryFSHandler_AddFile_wxBitmap = wx._core.__wxMemoryFSHandler_AddFile_wxBitmap __wxMemoryFSHandler_AddFile_Data = wx._core.__wxMemoryFSHandler_AddFile_Data wxMemoryFSHandler = wx._core.MemoryFSHandler -wxMemoryFSHandlerPtr = wx._core.MemoryFSHandlerPtr wxMemoryFSHandler_RemoveFile = wx._core.MemoryFSHandler_RemoveFile wxIMAGE_ALPHA_TRANSPARENT = wx._core.IMAGE_ALPHA_TRANSPARENT wxIMAGE_ALPHA_THRESHOLD = wx._core.IMAGE_ALPHA_THRESHOLD wxIMAGE_ALPHA_OPAQUE = wx._core.IMAGE_ALPHA_OPAQUE wxImageHandler = wx._core.ImageHandler -wxImageHandlerPtr = wx._core.ImageHandlerPtr wxPyImageHandler = wx._core.PyImageHandler -wxPyImageHandlerPtr = wx._core.PyImageHandlerPtr wxImageHistogram = wx._core.ImageHistogram -wxImageHistogramPtr = wx._core.ImageHistogramPtr wxImageHistogram_MakeKey = wx._core.ImageHistogram_MakeKey wxImage_RGBValue = wx._core.Image_RGBValue -wxImage_RGBValuePtr = wx._core.Image_RGBValuePtr wxImage_HSVValue = wx._core.Image_HSVValue -wxImage_HSVValuePtr = wx._core.Image_HSVValuePtr wxImage = wx._core.Image -wxImagePtr = wx._core.ImagePtr wxImageFromMime = wx._core.ImageFromMime wxImageFromStream = wx._core.ImageFromStream wxImageFromStreamMime = wx._core.ImageFromStreamMime @@ -797,34 +776,21 @@ wxBMP_4BPP = wx._core.BMP_4BPP wxBMP_1BPP = wx._core.BMP_1BPP wxBMP_1BPP_BW = wx._core.BMP_1BPP_BW wxBMPHandler = wx._core.BMPHandler -wxBMPHandlerPtr = wx._core.BMPHandlerPtr wxICOHandler = wx._core.ICOHandler -wxICOHandlerPtr = wx._core.ICOHandlerPtr wxCURHandler = wx._core.CURHandler -wxCURHandlerPtr = wx._core.CURHandlerPtr wxANIHandler = wx._core.ANIHandler -wxANIHandlerPtr = wx._core.ANIHandlerPtr wxPNGHandler = wx._core.PNGHandler -wxPNGHandlerPtr = wx._core.PNGHandlerPtr wxGIFHandler = wx._core.GIFHandler -wxGIFHandlerPtr = wx._core.GIFHandlerPtr wxPCXHandler = wx._core.PCXHandler -wxPCXHandlerPtr = wx._core.PCXHandlerPtr wxJPEGHandler = wx._core.JPEGHandler -wxJPEGHandlerPtr = wx._core.JPEGHandlerPtr wxPNMHandler = wx._core.PNMHandler -wxPNMHandlerPtr = wx._core.PNMHandlerPtr wxXPMHandler = wx._core.XPMHandler -wxXPMHandlerPtr = wx._core.XPMHandlerPtr wxTIFFHandler = wx._core.TIFFHandler -wxTIFFHandlerPtr = wx._core.TIFFHandlerPtr wxQUANTIZE_INCLUDE_WINDOWS_COLOURS = wx._core.QUANTIZE_INCLUDE_WINDOWS_COLOURS wxQUANTIZE_FILL_DESTINATION_IMAGE = wx._core.QUANTIZE_FILL_DESTINATION_IMAGE wxQuantize = wx._core.Quantize -wxQuantizePtr = wx._core.QuantizePtr wxQuantize_Quantize = wx._core.Quantize_Quantize wxEvtHandler = wx._core.EvtHandler -wxEvtHandlerPtr = wx._core.EvtHandlerPtr wxEVENT_PROPAGATE_NONE = wx._core.EVENT_PROPAGATE_NONE wxEVENT_PROPAGATE_MAX = wx._core.EVENT_PROPAGATE_MAX wxNewEventType = wx._core.NewEventType @@ -944,64 +910,38 @@ wxEVT_COMMAND_SET_FOCUS = wx._core.wxEVT_COMMAND_SET_FOCUS wxEVT_COMMAND_KILL_FOCUS = wx._core.wxEVT_COMMAND_KILL_FOCUS wxEVT_COMMAND_ENTER = wx._core.wxEVT_COMMAND_ENTER wxEvent = wx._core.Event -wxEventPtr = wx._core.EventPtr wxPropagationDisabler = wx._core.PropagationDisabler -wxPropagationDisablerPtr = wx._core.PropagationDisablerPtr wxPropagateOnce = wx._core.PropagateOnce -wxPropagateOncePtr = wx._core.PropagateOncePtr wxCommandEvent = wx._core.CommandEvent -wxCommandEventPtr = wx._core.CommandEventPtr wxNotifyEvent = wx._core.NotifyEvent -wxNotifyEventPtr = wx._core.NotifyEventPtr wxScrollEvent = wx._core.ScrollEvent -wxScrollEventPtr = wx._core.ScrollEventPtr wxScrollWinEvent = wx._core.ScrollWinEvent -wxScrollWinEventPtr = wx._core.ScrollWinEventPtr wxMOUSE_BTN_ANY = wx._core.MOUSE_BTN_ANY wxMOUSE_BTN_NONE = wx._core.MOUSE_BTN_NONE wxMOUSE_BTN_LEFT = wx._core.MOUSE_BTN_LEFT wxMOUSE_BTN_MIDDLE = wx._core.MOUSE_BTN_MIDDLE wxMOUSE_BTN_RIGHT = wx._core.MOUSE_BTN_RIGHT wxMouseEvent = wx._core.MouseEvent -wxMouseEventPtr = wx._core.MouseEventPtr wxSetCursorEvent = wx._core.SetCursorEvent -wxSetCursorEventPtr = wx._core.SetCursorEventPtr wxKeyEvent = wx._core.KeyEvent -wxKeyEventPtr = wx._core.KeyEventPtr wxSizeEvent = wx._core.SizeEvent -wxSizeEventPtr = wx._core.SizeEventPtr wxMoveEvent = wx._core.MoveEvent -wxMoveEventPtr = wx._core.MoveEventPtr wxPaintEvent = wx._core.PaintEvent -wxPaintEventPtr = wx._core.PaintEventPtr wxNcPaintEvent = wx._core.NcPaintEvent -wxNcPaintEventPtr = wx._core.NcPaintEventPtr wxEraseEvent = wx._core.EraseEvent -wxEraseEventPtr = wx._core.EraseEventPtr wxFocusEvent = wx._core.FocusEvent -wxFocusEventPtr = wx._core.FocusEventPtr wxChildFocusEvent = wx._core.ChildFocusEvent -wxChildFocusEventPtr = wx._core.ChildFocusEventPtr wxActivateEvent = wx._core.ActivateEvent -wxActivateEventPtr = wx._core.ActivateEventPtr wxInitDialogEvent = wx._core.InitDialogEvent -wxInitDialogEventPtr = wx._core.InitDialogEventPtr wxMenuEvent = wx._core.MenuEvent -wxMenuEventPtr = wx._core.MenuEventPtr wxCloseEvent = wx._core.CloseEvent -wxCloseEventPtr = wx._core.CloseEventPtr wxShowEvent = wx._core.ShowEvent -wxShowEventPtr = wx._core.ShowEventPtr wxIconizeEvent = wx._core.IconizeEvent -wxIconizeEventPtr = wx._core.IconizeEventPtr wxMaximizeEvent = wx._core.MaximizeEvent -wxMaximizeEventPtr = wx._core.MaximizeEventPtr wxDropFilesEvent = wx._core.DropFilesEvent -wxDropFilesEventPtr = wx._core.DropFilesEventPtr wxUPDATE_UI_PROCESS_ALL = wx._core.UPDATE_UI_PROCESS_ALL wxUPDATE_UI_PROCESS_SPECIFIED = wx._core.UPDATE_UI_PROCESS_SPECIFIED wxUpdateUIEvent = wx._core.UpdateUIEvent -wxUpdateUIEventPtr = wx._core.UpdateUIEventPtr wxUpdateUIEvent_SetUpdateInterval = wx._core.UpdateUIEvent_SetUpdateInterval wxUpdateUIEvent_GetUpdateInterval = wx._core.UpdateUIEvent_GetUpdateInterval wxUpdateUIEvent_CanUpdate = wx._core.UpdateUIEvent_CanUpdate @@ -1009,36 +949,23 @@ wxUpdateUIEvent_ResetUpdateTime = wx._core.UpdateUIEvent_ResetUpdateTime wxUpdateUIEvent_SetMode = wx._core.UpdateUIEvent_SetMode wxUpdateUIEvent_GetMode = wx._core.UpdateUIEvent_GetMode wxSysColourChangedEvent = wx._core.SysColourChangedEvent -wxSysColourChangedEventPtr = wx._core.SysColourChangedEventPtr wxMouseCaptureChangedEvent = wx._core.MouseCaptureChangedEvent -wxMouseCaptureChangedEventPtr = wx._core.MouseCaptureChangedEventPtr wxDisplayChangedEvent = wx._core.DisplayChangedEvent -wxDisplayChangedEventPtr = wx._core.DisplayChangedEventPtr wxPaletteChangedEvent = wx._core.PaletteChangedEvent -wxPaletteChangedEventPtr = wx._core.PaletteChangedEventPtr wxQueryNewPaletteEvent = wx._core.QueryNewPaletteEvent -wxQueryNewPaletteEventPtr = wx._core.QueryNewPaletteEventPtr wxNavigationKeyEvent = wx._core.NavigationKeyEvent -wxNavigationKeyEventPtr = wx._core.NavigationKeyEventPtr wxWindowCreateEvent = wx._core.WindowCreateEvent -wxWindowCreateEventPtr = wx._core.WindowCreateEventPtr wxWindowDestroyEvent = wx._core.WindowDestroyEvent -wxWindowDestroyEventPtr = wx._core.WindowDestroyEventPtr wxContextMenuEvent = wx._core.ContextMenuEvent -wxContextMenuEventPtr = wx._core.ContextMenuEventPtr wxIDLE_PROCESS_ALL = wx._core.IDLE_PROCESS_ALL wxIDLE_PROCESS_SPECIFIED = wx._core.IDLE_PROCESS_SPECIFIED wxIdleEvent = wx._core.IdleEvent -wxIdleEventPtr = wx._core.IdleEventPtr wxIdleEvent_SetMode = wx._core.IdleEvent_SetMode wxIdleEvent_GetMode = wx._core.IdleEvent_GetMode wxIdleEvent_CanSend = wx._core.IdleEvent_CanSend wxPyEvent = wx._core.PyEvent -wxPyEventPtr = wx._core.PyEventPtr wxPyCommandEvent = wx._core.PyCommandEvent -wxPyCommandEventPtr = wx._core.PyCommandEventPtr wxDateEvent = wx._core.DateEvent -wxDateEventPtr = wx._core.DateEventPtr wxEVT_DATE_CHANGED = wx._core.wxEVT_DATE_CHANGED wxPYAPP_ASSERT_SUPPRESS = wx._core.PYAPP_ASSERT_SUPPRESS wxPYAPP_ASSERT_EXCEPTION = wx._core.PYAPP_ASSERT_EXCEPTION @@ -1047,7 +974,6 @@ wxPYAPP_ASSERT_LOG = wx._core.PYAPP_ASSERT_LOG wxPRINT_WINDOWS = wx._core.PRINT_WINDOWS wxPRINT_POSTSCRIPT = wx._core.PRINT_POSTSCRIPT wxPyApp = wx._core.PyApp -wxPyAppPtr = wx._core.PyAppPtr wxPyApp_IsMainLoopRunning = wx._core.PyApp_IsMainLoopRunning wxPyApp_GetMacSupportPCMenuShortcuts = wx._core.PyApp_GetMacSupportPCMenuShortcuts wxPyApp_GetMacAboutMenuItemId = wx._core.PyApp_GetMacAboutMenuItemId @@ -1071,27 +997,21 @@ wxGetApp = wx._core.GetApp wxSetDefaultPyEncoding = wx._core.SetDefaultPyEncoding wxGetDefaultPyEncoding = wx._core.GetDefaultPyEncoding wxEventLoop = wx._core.EventLoop -wxEventLoopPtr = wx._core.EventLoopPtr wxEventLoop_GetActive = wx._core.EventLoop_GetActive wxEventLoop_SetActive = wx._core.EventLoop_SetActive wxEventLoopActivator = wx._core.EventLoopActivator -wxEventLoopActivatorPtr = wx._core.EventLoopActivatorPtr wxAcceleratorEntry = wx._core.AcceleratorEntry -wxAcceleratorEntryPtr = wx._core.AcceleratorEntryPtr wxAcceleratorTable = wx._core.AcceleratorTable -wxAcceleratorTablePtr = wx._core.AcceleratorTablePtr wxNullAcceleratorTable = wx._core.NullAcceleratorTable wxGetAccelFromString = wx._core.GetAccelFromString wxPanelNameStr = wx._core.PanelNameStr wxVisualAttributes = wx._core.VisualAttributes -wxVisualAttributesPtr = wx._core.VisualAttributesPtr wxWINDOW_VARIANT_NORMAL = wx._core.WINDOW_VARIANT_NORMAL wxWINDOW_VARIANT_SMALL = wx._core.WINDOW_VARIANT_SMALL wxWINDOW_VARIANT_MINI = wx._core.WINDOW_VARIANT_MINI wxWINDOW_VARIANT_LARGE = wx._core.WINDOW_VARIANT_LARGE wxWINDOW_VARIANT_MAX = wx._core.WINDOW_VARIANT_MAX wxWindow = wx._core.Window -wxWindowPtr = wx._core.WindowPtr wxPreWindow = wx._core.PreWindow wxWindow_NewControlId = wx._core.Window_NewControlId wxWindow_NextControlId = wx._core.Window_NextControlId @@ -1105,65 +1025,45 @@ wxFindWindowByLabel = wx._core.FindWindowByLabel wxWindow_FromHWND = wx._core.Window_FromHWND GetTopLevelWindows = wx._core.GetTopLevelWindows wxValidator = wx._core.Validator -wxValidatorPtr = wx._core.ValidatorPtr wxValidator_IsSilent = wx._core.Validator_IsSilent wxValidator_SetBellOnError = wx._core.Validator_SetBellOnError wxPyValidator = wx._core.PyValidator -wxPyValidatorPtr = wx._core.PyValidatorPtr wxDefaultValidator = wx._core.DefaultValidator wxMenu = wx._core.Menu -wxMenuPtr = wx._core.MenuPtr wxMenuBar = wx._core.MenuBar -wxMenuBarPtr = wx._core.MenuBarPtr wxMenuBar_SetAutoWindowMenu = wx._core.MenuBar_SetAutoWindowMenu wxMenuBar_GetAutoWindowMenu = wx._core.MenuBar_GetAutoWindowMenu wxMenuItem = wx._core.MenuItem -wxMenuItemPtr = wx._core.MenuItemPtr wxMenuItem_GetLabelFromText = wx._core.MenuItem_GetLabelFromText wxMenuItem_GetDefaultMarginWidth = wx._core.MenuItem_GetDefaultMarginWidth wxControlNameStr = wx._core.ControlNameStr wxControl = wx._core.Control -wxControlPtr = wx._core.ControlPtr wxPreControl = wx._core.PreControl wxControl_GetClassDefaultAttributes = wx._core.Control_GetClassDefaultAttributes wxItemContainer = wx._core.ItemContainer -wxItemContainerPtr = wx._core.ItemContainerPtr wxControlWithItems = wx._core.ControlWithItems -wxControlWithItemsPtr = wx._core.ControlWithItemsPtr wxSizerItem = wx._core.SizerItem -wxSizerItemPtr = wx._core.SizerItemPtr wxSizerItemWindow = wx._core.SizerItemWindow wxSizerItemSpacer = wx._core.SizerItemSpacer wxSizerItemSizer = wx._core.SizerItemSizer wxSizer = wx._core.Sizer -wxSizerPtr = wx._core.SizerPtr wxPySizer = wx._core.PySizer -wxPySizerPtr = wx._core.PySizerPtr wxBoxSizer = wx._core.BoxSizer -wxBoxSizerPtr = wx._core.BoxSizerPtr wxStaticBoxSizer = wx._core.StaticBoxSizer -wxStaticBoxSizerPtr = wx._core.StaticBoxSizerPtr wxGridSizer = wx._core.GridSizer -wxGridSizerPtr = wx._core.GridSizerPtr wxFLEX_GROWMODE_NONE = wx._core.FLEX_GROWMODE_NONE wxFLEX_GROWMODE_SPECIFIED = wx._core.FLEX_GROWMODE_SPECIFIED wxFLEX_GROWMODE_ALL = wx._core.FLEX_GROWMODE_ALL wxFlexGridSizer = wx._core.FlexGridSizer -wxFlexGridSizerPtr = wx._core.FlexGridSizerPtr wxStdDialogButtonSizer = wx._core.StdDialogButtonSizer -wxStdDialogButtonSizerPtr = wx._core.StdDialogButtonSizerPtr wxGBPosition = wx._core.GBPosition -wxGBPositionPtr = wx._core.GBPositionPtr wxGBSpan = wx._core.GBSpan -wxGBSpanPtr = wx._core.GBSpanPtr wxDefaultSpan = wx._core.DefaultSpan wxGBSizerItem = wx._core.GBSizerItem -wxGBSizerItemPtr = wx._core.GBSizerItemPtr wxGBSizerItemWindow = wx._core.GBSizerItemWindow wxGBSizerItemSizer = wx._core.GBSizerItemSizer wxGBSizerItemSpacer = wx._core.GBSizerItemSpacer wxGridBagSizer = wx._core.GridBagSizer -wxGridBagSizerPtr = wx._core.GridBagSizerPtr wxLeft = wx._core.Left wxTop = wx._core.Top wxRight = wx._core.Right @@ -1184,9 +1084,7 @@ wxRightOf = wx._core.RightOf wxSameAs = wx._core.SameAs wxAbsolute = wx._core.Absolute wxIndividualLayoutConstraint = wx._core.IndividualLayoutConstraint -wxIndividualLayoutConstraintPtr = wx._core.IndividualLayoutConstraintPtr wxLayoutConstraints = wx._core.LayoutConstraints -wxLayoutConstraintsPtr = wx._core.LayoutConstraintsPtr wxPyOnDemandOutputWindow = wx._core.PyOnDemandOutputWindow wxApp = wx._core.App wxGetApp = wx._core.GetApp diff --git a/wxPython/wxPython/_gdi.py b/wxPython/wxPython/_gdi.py index 3484752a3a..6236674f1e 100644 --- a/wxPython/wxPython/_gdi.py +++ b/wxPython/wxPython/_gdi.py @@ -20,53 +20,40 @@ del sys, _wx # Now assign all the reverse-renamed names: wxGDIObject = wx._gdi.GDIObject -wxGDIObjectPtr = wx._gdi.GDIObjectPtr wxColour = wx._gdi.Colour -wxColourPtr = wx._gdi.ColourPtr wxNamedColour = wx._gdi.NamedColour wxColourRGB = wx._gdi.ColourRGB wxPalette = wx._gdi.Palette -wxPalettePtr = wx._gdi.PalettePtr wxPen = wx._gdi.Pen -wxPenPtr = wx._gdi.PenPtr wxBrush = wx._gdi.Brush -wxBrushPtr = wx._gdi.BrushPtr wxBrushFromBitmap = wx._gdi.BrushFromBitmap wxBitmap = wx._gdi.Bitmap -wxBitmapPtr = wx._gdi.BitmapPtr wxEmptyBitmap = wx._gdi.EmptyBitmap wxBitmapFromIcon = wx._gdi.BitmapFromIcon wxBitmapFromImage = wx._gdi.BitmapFromImage wxBitmapFromXPMData = wx._gdi.BitmapFromXPMData wxBitmapFromBits = wx._gdi.BitmapFromBits wxMask = wx._gdi.Mask -wxMaskPtr = wx._gdi.MaskPtr wxIcon = wx._gdi.Icon -wxIconPtr = wx._gdi.IconPtr wxEmptyIcon = wx._gdi.EmptyIcon wxIconFromLocation = wx._gdi.IconFromLocation wxIconFromBitmap = wx._gdi.IconFromBitmap wxIconFromXPMData = wx._gdi.IconFromXPMData wxIconLocation = wx._gdi.IconLocation -wxIconLocationPtr = wx._gdi.IconLocationPtr wxIconBundle = wx._gdi.IconBundle -wxIconBundlePtr = wx._gdi.IconBundlePtr wxIconBundleFromFile = wx._gdi.IconBundleFromFile wxIconBundleFromIcon = wx._gdi.IconBundleFromIcon wxCursor = wx._gdi.Cursor -wxCursorPtr = wx._gdi.CursorPtr wxStockCursor = wx._gdi.StockCursor wxCursorFromImage = wx._gdi.CursorFromImage wxOutRegion = wx._gdi.OutRegion wxPartRegion = wx._gdi.PartRegion wxInRegion = wx._gdi.InRegion wxRegion = wx._gdi.Region -wxRegionPtr = wx._gdi.RegionPtr wxRegionFromBitmap = wx._gdi.RegionFromBitmap wxRegionFromBitmapColour = wx._gdi.RegionFromBitmapColour wxRegionFromPoints = wx._gdi.RegionFromPoints wxRegionIterator = wx._gdi.RegionIterator -wxRegionIteratorPtr = wx._gdi.RegionIteratorPtr wxFONTFAMILY_DEFAULT = wx._gdi.FONTFAMILY_DEFAULT wxFONTFAMILY_DECORATIVE = wx._gdi.FONTFAMILY_DECORATIVE wxFONTFAMILY_ROMAN = wx._gdi.FONTFAMILY_ROMAN @@ -192,13 +179,10 @@ wxFONTENCODING_GB2312 = wx._gdi.FONTENCODING_GB2312 wxFONTENCODING_BIG5 = wx._gdi.FONTENCODING_BIG5 wxFONTENCODING_SHIFT_JIS = wx._gdi.FONTENCODING_SHIFT_JIS wxNativeFontInfo = wx._gdi.NativeFontInfo -wxNativeFontInfoPtr = wx._gdi.NativeFontInfoPtr wxNativeEncodingInfo = wx._gdi.NativeEncodingInfo -wxNativeEncodingInfoPtr = wx._gdi.NativeEncodingInfoPtr wxGetNativeFontEncoding = wx._gdi.GetNativeFontEncoding wxTestFontEncoding = wx._gdi.TestFontEncoding wxFontMapper = wx._gdi.FontMapper -wxFontMapperPtr = wx._gdi.FontMapperPtr wxFontMapper_Get = wx._gdi.FontMapper_Get wxFontMapper_Set = wx._gdi.FontMapper_Set wxFontMapper_GetSupportedEncodingsCount = wx._gdi.FontMapper_GetSupportedEncodingsCount @@ -208,7 +192,6 @@ wxFontMapper_GetEncodingDescription = wx._gdi.FontMapper_GetEncodingDescription wxFontMapper_GetEncodingFromName = wx._gdi.FontMapper_GetEncodingFromName wxFontMapper_GetDefaultConfigPath = wx._gdi.FontMapper_GetDefaultConfigPath wxFont = wx._gdi.Font -wxFontPtr = wx._gdi.FontPtr wxFontFromNativeInfo = wx._gdi.FontFromNativeInfo wxFontFromNativeInfoString = wx._gdi.FontFromNativeInfoString wxFFont = wx._gdi.FFont @@ -217,7 +200,6 @@ wxFFontFromPixelSize = wx._gdi.FFontFromPixelSize wxFont_GetDefaultEncoding = wx._gdi.Font_GetDefaultEncoding wxFont_SetDefaultEncoding = wx._gdi.Font_SetDefaultEncoding wxFontEnumerator = wx._gdi.FontEnumerator -wxFontEnumeratorPtr = wx._gdi.FontEnumeratorPtr wxFontEnumerator = wx._gdi.FontEnumerator wxLANGUAGE_DEFAULT = wx._gdi.LANGUAGE_DEFAULT wxLANGUAGE_UNKNOWN = wx._gdi.LANGUAGE_UNKNOWN @@ -451,7 +433,6 @@ wxLANGUAGE_ZHUANG = wx._gdi.LANGUAGE_ZHUANG wxLANGUAGE_ZULU = wx._gdi.LANGUAGE_ZULU wxLANGUAGE_USER_DEFINED = wx._gdi.LANGUAGE_USER_DEFINED wxLanguageInfo = wx._gdi.LanguageInfo -wxLanguageInfoPtr = wx._gdi.LanguageInfoPtr wxLOCALE_CAT_NUMBER = wx._gdi.LOCALE_CAT_NUMBER wxLOCALE_CAT_DATE = wx._gdi.LOCALE_CAT_DATE wxLOCALE_CAT_MONEY = wx._gdi.LOCALE_CAT_MONEY @@ -461,7 +442,6 @@ wxLOCALE_DECIMAL_POINT = wx._gdi.LOCALE_DECIMAL_POINT wxLOCALE_LOAD_DEFAULT = wx._gdi.LOCALE_LOAD_DEFAULT wxLOCALE_CONV_ENCODING = wx._gdi.LOCALE_CONV_ENCODING wxLocale = wx._gdi.Locale -wxLocalePtr = wx._gdi.LocalePtr wxLocale_GetSystemLanguage = wx._gdi.Locale_GetSystemLanguage wxLocale_GetSystemEncoding = wx._gdi.Locale_GetSystemEncoding wxLocale_GetSystemEncodingName = wx._gdi.Locale_GetSystemEncodingName @@ -481,41 +461,27 @@ wxPLATFORM_WINDOWS = wx._gdi.PLATFORM_WINDOWS wxPLATFORM_OS2 = wx._gdi.PLATFORM_OS2 wxPLATFORM_MAC = wx._gdi.PLATFORM_MAC wxEncodingConverter = wx._gdi.EncodingConverter -wxEncodingConverterPtr = wx._gdi.EncodingConverterPtr wxEncodingConverter_GetPlatformEquivalents = wx._gdi.EncodingConverter_GetPlatformEquivalents wxEncodingConverter_GetAllEquivalents = wx._gdi.EncodingConverter_GetAllEquivalents wxEncodingConverter_CanConvert = wx._gdi.EncodingConverter_CanConvert wxDC = wx._gdi.DC -wxDCPtr = wx._gdi.DCPtr wxMemoryDC = wx._gdi.MemoryDC -wxMemoryDCPtr = wx._gdi.MemoryDCPtr wxMemoryDCFromDC = wx._gdi.MemoryDCFromDC wxBUFFER_VIRTUAL_AREA = wx._gdi.BUFFER_VIRTUAL_AREA wxBUFFER_CLIENT_AREA = wx._gdi.BUFFER_CLIENT_AREA wxBufferedDC = wx._gdi.BufferedDC -wxBufferedDCPtr = wx._gdi.BufferedDCPtr wxBufferedPaintDC = wx._gdi.BufferedPaintDC -wxBufferedPaintDCPtr = wx._gdi.BufferedPaintDCPtr wxScreenDC = wx._gdi.ScreenDC -wxScreenDCPtr = wx._gdi.ScreenDCPtr wxClientDC = wx._gdi.ClientDC -wxClientDCPtr = wx._gdi.ClientDCPtr wxPaintDC = wx._gdi.PaintDC -wxPaintDCPtr = wx._gdi.PaintDCPtr wxWindowDC = wx._gdi.WindowDC -wxWindowDCPtr = wx._gdi.WindowDCPtr wxMirrorDC = wx._gdi.MirrorDC -wxMirrorDCPtr = wx._gdi.MirrorDCPtr wxPostScriptDC = wx._gdi.PostScriptDC -wxPostScriptDCPtr = wx._gdi.PostScriptDCPtr wxPostScriptDC_SetResolution = wx._gdi.PostScriptDC_SetResolution wxPostScriptDC_GetResolution = wx._gdi.PostScriptDC_GetResolution wxMetaFile = wx._gdi.MetaFile -wxMetaFilePtr = wx._gdi.MetaFilePtr wxMetaFileDC = wx._gdi.MetaFileDC -wxMetaFileDCPtr = wx._gdi.MetaFileDCPtr wxPrinterDC = wx._gdi.PrinterDC -wxPrinterDCPtr = wx._gdi.PrinterDCPtr wxIMAGELIST_DRAW_NORMAL = wx._gdi.IMAGELIST_DRAW_NORMAL wxIMAGELIST_DRAW_TRANSPARENT = wx._gdi.IMAGELIST_DRAW_TRANSPARENT wxIMAGELIST_DRAW_SELECTED = wx._gdi.IMAGELIST_DRAW_SELECTED @@ -524,7 +490,6 @@ wxIMAGE_LIST_NORMAL = wx._gdi.IMAGE_LIST_NORMAL wxIMAGE_LIST_SMALL = wx._gdi.IMAGE_LIST_SMALL wxIMAGE_LIST_STATE = wx._gdi.IMAGE_LIST_STATE wxImageList = wx._gdi.ImageList -wxImageListPtr = wx._gdi.ImageListPtr wxNORMAL_FONT = wx._gdi.NORMAL_FONT wxSMALL_FONT = wx._gdi.SMALL_FONT wxITALIC_FONT = wx._gdi.ITALIC_FONT @@ -568,19 +533,14 @@ wxNullPalette = wx._gdi.NullPalette wxNullFont = wx._gdi.NullFont wxNullColour = wx._gdi.NullColour wxPenList = wx._gdi.PenList -wxPenListPtr = wx._gdi.PenListPtr wxBrushList = wx._gdi.BrushList -wxBrushListPtr = wx._gdi.BrushListPtr wxColourDatabase = wx._gdi.ColourDatabase -wxColourDatabasePtr = wx._gdi.ColourDatabasePtr wxFontList = wx._gdi.FontList -wxFontListPtr = wx._gdi.FontListPtr wxTheFontList = wx._gdi.TheFontList wxThePenList = wx._gdi.ThePenList wxTheBrushList = wx._gdi.TheBrushList wxTheColourDatabase = wx._gdi.TheColourDatabase wxEffects = wx._gdi.Effects -wxEffectsPtr = wx._gdi.EffectsPtr wxCONTROL_DISABLED = wx._gdi.CONTROL_DISABLED wxCONTROL_FOCUSED = wx._gdi.CONTROL_FOCUSED wxCONTROL_PRESSED = wx._gdi.CONTROL_PRESSED @@ -595,12 +555,9 @@ wxCONTROL_UNDETERMINED = wx._gdi.CONTROL_UNDETERMINED wxCONTROL_FLAGS_MASK = wx._gdi.CONTROL_FLAGS_MASK wxCONTROL_DIRTY = wx._gdi.CONTROL_DIRTY wxSplitterRenderParams = wx._gdi.SplitterRenderParams -wxSplitterRenderParamsPtr = wx._gdi.SplitterRenderParamsPtr wxRendererVersion = wx._gdi.RendererVersion -wxRendererVersionPtr = wx._gdi.RendererVersionPtr wxRendererVersion_IsCompatible = wx._gdi.RendererVersion_IsCompatible wxRendererNative = wx._gdi.RendererNative -wxRendererNativePtr = wx._gdi.RendererNativePtr wxRendererNative_Get = wx._gdi.RendererNative_Get wxRendererNative_GetGeneric = wx._gdi.RendererNative_GetGeneric wxRendererNative_GetDefault = wx._gdi.RendererNative_GetDefault diff --git a/wxPython/wxPython/_misc.py b/wxPython/wxPython/_misc.py index e1c59a7bce..b4be23ede6 100644 --- a/wxPython/wxPython/_misc.py +++ b/wxPython/wxPython/_misc.py @@ -112,7 +112,6 @@ wxSYS_SCREEN_PDA = wx._misc.SYS_SCREEN_PDA wxSYS_SCREEN_SMALL = wx._misc.SYS_SCREEN_SMALL wxSYS_SCREEN_DESKTOP = wx._misc.SYS_SCREEN_DESKTOP wxSystemSettings = wx._misc.SystemSettings -wxSystemSettingsPtr = wx._misc.SystemSettingsPtr wxSystemSettings_GetColour = wx._misc.SystemSettings_GetColour wxSystemSettings_GetFont = wx._misc.SystemSettings_GetFont wxSystemSettings_GetMetric = wx._misc.SystemSettings_GetMetric @@ -121,7 +120,6 @@ wxSystemSettings_GetScreenType = wx._misc.SystemSettings_GetScreenType wxSystemSettings_SetScreenType = wx._misc.SystemSettings_SetScreenType wxWINDOW_DEFAULT_VARIANT = wx._misc.WINDOW_DEFAULT_VARIANT wxSystemOptions = wx._misc.SystemOptions -wxSystemOptionsPtr = wx._misc.SystemOptionsPtr wxSystemOptions_SetOption = wx._misc.SystemOptions_SetOption wxSystemOptions_SetOptionInt = wx._misc.SystemOptions_SetOptionInt wxSystemOptions_GetOption = wx._misc.SystemOptions_GetOption @@ -194,52 +192,37 @@ wxGetTopLevelParent = wx._misc.GetTopLevelParent wxLaunchDefaultBrowser = wx._misc.LaunchDefaultBrowser wxGetKeyState = wx._misc.GetKeyState wxMouseState = wx._misc.MouseState -wxMouseStatePtr = wx._misc.MouseStatePtr wxGetMouseState = wx._misc.GetMouseState wxWakeUpMainThread = wx._misc.WakeUpMainThread wxMutexGuiEnter = wx._misc.MutexGuiEnter wxMutexGuiLeave = wx._misc.MutexGuiLeave wxMutexGuiLocker = wx._misc.MutexGuiLocker -wxMutexGuiLockerPtr = wx._misc.MutexGuiLockerPtr wxThread_IsMain = wx._misc.Thread_IsMain wxToolTip = wx._misc.ToolTip -wxToolTipPtr = wx._misc.ToolTipPtr wxToolTip_Enable = wx._misc.ToolTip_Enable wxToolTip_SetDelay = wx._misc.ToolTip_SetDelay wxCaret = wx._misc.Caret -wxCaretPtr = wx._misc.CaretPtr wxCaret_GetBlinkTime = wx._misc.Caret_GetBlinkTime wxCaret_SetBlinkTime = wx._misc.Caret_SetBlinkTime wxBusyCursor = wx._misc.BusyCursor -wxBusyCursorPtr = wx._misc.BusyCursorPtr wxWindowDisabler = wx._misc.WindowDisabler -wxWindowDisablerPtr = wx._misc.WindowDisablerPtr wxBusyInfo = wx._misc.BusyInfo -wxBusyInfoPtr = wx._misc.BusyInfoPtr wxStopWatch = wx._misc.StopWatch -wxStopWatchPtr = wx._misc.StopWatchPtr wxFileHistory = wx._misc.FileHistory -wxFileHistoryPtr = wx._misc.FileHistoryPtr wxSingleInstanceChecker = wx._misc.SingleInstanceChecker -wxSingleInstanceCheckerPtr = wx._misc.SingleInstanceCheckerPtr wxPreSingleInstanceChecker = wx._misc.PreSingleInstanceChecker wxDrawWindowOnDC = wx._misc.DrawWindowOnDC wxTipProvider = wx._misc.TipProvider -wxTipProviderPtr = wx._misc.TipProviderPtr wxPyTipProvider = wx._misc.PyTipProvider -wxPyTipProviderPtr = wx._misc.PyTipProviderPtr wxShowTip = wx._misc.ShowTip wxCreateFileTipProvider = wx._misc.CreateFileTipProvider wxTIMER_CONTINUOUS = wx._misc.TIMER_CONTINUOUS wxTIMER_ONE_SHOT = wx._misc.TIMER_ONE_SHOT wxEVT_TIMER = wx._misc.wxEVT_TIMER wxTimer = wx._misc.Timer -wxTimerPtr = wx._misc.TimerPtr wxTimer = wx._misc.Timer wxTimerEvent = wx._misc.TimerEvent -wxTimerEventPtr = wx._misc.TimerEventPtr wxTimerRunner = wx._misc.TimerRunner -wxTimerRunnerPtr = wx._misc.TimerRunnerPtr wxLOG_FatalError = wx._misc.LOG_FatalError wxLOG_Error = wx._misc.LOG_Error wxLOG_Warning = wx._misc.LOG_Warning @@ -262,7 +245,6 @@ wxTraceResAlloc = wx._misc.TraceResAlloc wxTraceRefCount = wx._misc.TraceRefCount wxTraceOleCalls = wx._misc.TraceOleCalls wxLog = wx._misc.Log -wxLogPtr = wx._misc.LogPtr wxLog_IsEnabled = wx._misc.Log_IsEnabled wxLog_EnableLogging = wx._misc.Log_EnableLogging wxLog_OnLog = wx._misc.Log_OnLog @@ -287,17 +269,11 @@ wxLog_GetLogLevel = wx._misc.Log_GetLogLevel wxLog_GetTimestamp = wx._misc.Log_GetTimestamp wxLog_TimeStamp = wx._misc.Log_TimeStamp wxLogStderr = wx._misc.LogStderr -wxLogStderrPtr = wx._misc.LogStderrPtr wxLogTextCtrl = wx._misc.LogTextCtrl -wxLogTextCtrlPtr = wx._misc.LogTextCtrlPtr wxLogGui = wx._misc.LogGui -wxLogGuiPtr = wx._misc.LogGuiPtr wxLogWindow = wx._misc.LogWindow -wxLogWindowPtr = wx._misc.LogWindowPtr wxLogChain = wx._misc.LogChain -wxLogChainPtr = wx._misc.LogChainPtr wxLogBuffer = wx._misc.LogBuffer -wxLogBufferPtr = wx._misc.LogBufferPtr wxSysErrorCode = wx._misc.SysErrorCode wxSysErrorMsg = wx._misc.SysErrorMsg wxLogFatalError = wx._misc.LogFatalError @@ -315,9 +291,7 @@ wxLogTrace = wx._misc.LogTrace wxLogTrace = wx._misc.LogTrace wxSafeShowMessage = wx._misc.SafeShowMessage wxLogNull = wx._misc.LogNull -wxLogNullPtr = wx._misc.LogNullPtr wxPyLog = wx._misc.PyLog -wxPyLogPtr = wx._misc.PyLogPtr wxPROCESS_DEFAULT = wx._misc.PROCESS_DEFAULT wxPROCESS_REDIRECT = wx._misc.PROCESS_REDIRECT wxKILL_OK = wx._misc.KILL_OK @@ -345,13 +319,11 @@ wxSIGPIPE = wx._misc.SIGPIPE wxSIGALRM = wx._misc.SIGALRM wxSIGTERM = wx._misc.SIGTERM wxProcess = wx._misc.Process -wxProcessPtr = wx._misc.ProcessPtr wxProcess_Kill = wx._misc.Process_Kill wxProcess_Exists = wx._misc.Process_Exists wxProcess_Open = wx._misc.Process_Open wxProcess = wx._misc.Process wxProcessEvent = wx._misc.ProcessEvent -wxProcessEventPtr = wx._misc.ProcessEventPtr wxEVT_END_PROCESS = wx._misc.wxEVT_END_PROCESS wxEXEC_ASYNC = wx._misc.EXEC_ASYNC wxEXEC_SYNC = wx._misc.EXEC_SYNC @@ -368,18 +340,15 @@ wxJOY_BUTTON2 = wx._misc.JOY_BUTTON2 wxJOY_BUTTON3 = wx._misc.JOY_BUTTON3 wxJOY_BUTTON4 = wx._misc.JOY_BUTTON4 wxJoystick = wx._misc.Joystick -wxJoystickPtr = wx._misc.JoystickPtr wxEVT_JOY_BUTTON_DOWN = wx._misc.wxEVT_JOY_BUTTON_DOWN wxEVT_JOY_BUTTON_UP = wx._misc.wxEVT_JOY_BUTTON_UP wxEVT_JOY_MOVE = wx._misc.wxEVT_JOY_MOVE wxEVT_JOY_ZMOVE = wx._misc.wxEVT_JOY_ZMOVE wxJoystickEvent = wx._misc.JoystickEvent -wxJoystickEventPtr = wx._misc.JoystickEventPtr wxSOUND_SYNC = wx._misc.SOUND_SYNC wxSOUND_ASYNC = wx._misc.SOUND_ASYNC wxSOUND_LOOP = wx._misc.SOUND_LOOP wxSound = wx._misc.Sound -wxSoundPtr = wx._misc.SoundPtr wxSoundFromData = wx._misc.SoundFromData wxSound_PlaySound = wx._misc.Sound_PlaySound wxSound_Stop = wx._misc.Sound_Stop @@ -389,15 +358,12 @@ wxMAILCAP_KDE = wx._misc.MAILCAP_KDE wxMAILCAP_GNOME = wx._misc.MAILCAP_GNOME wxMAILCAP_ALL = wx._misc.MAILCAP_ALL wxFileTypeInfo = wx._misc.FileTypeInfo -wxFileTypeInfoPtr = wx._misc.FileTypeInfoPtr wxFileTypeInfoSequence = wx._misc.FileTypeInfoSequence wxNullFileTypeInfo = wx._misc.NullFileTypeInfo wxFileType = wx._misc.FileType -wxFileTypePtr = wx._misc.FileTypePtr wxFileType_ExpandCommand = wx._misc.FileType_ExpandCommand wxTheMimeTypesManager = wx._misc.TheMimeTypesManager wxMimeTypesManager = wx._misc.MimeTypesManager -wxMimeTypesManagerPtr = wx._misc.MimeTypesManagerPtr wxMimeTypesManager_IsOfType = wx._misc.MimeTypesManager_IsOfType wxART_TOOLBAR = wx._misc.ART_TOOLBAR wxART_MENU = wx._misc.ART_MENU @@ -456,7 +422,6 @@ wxART_QUIT = wx._misc.ART_QUIT wxART_FIND = wx._misc.ART_FIND wxART_FIND_AND_REPLACE = wx._misc.ART_FIND_AND_REPLACE wxArtProvider = wx._misc.ArtProvider -wxArtProviderPtr = wx._misc.ArtProviderPtr wxArtProvider = wx._misc.ArtProvider wxArtProvider_PushProvider = wx._misc.ArtProvider_PushProvider wxArtProvider_PopProvider = wx._misc.ArtProvider_PopProvider @@ -469,22 +434,17 @@ wxCONFIG_USE_GLOBAL_FILE = wx._misc.CONFIG_USE_GLOBAL_FILE wxCONFIG_USE_RELATIVE_PATH = wx._misc.CONFIG_USE_RELATIVE_PATH wxCONFIG_USE_NO_ESCAPE_CHARACTERS = wx._misc.CONFIG_USE_NO_ESCAPE_CHARACTERS wxConfigBase = wx._misc.ConfigBase -wxConfigBasePtr = wx._misc.ConfigBasePtr wxConfigBase_Set = wx._misc.ConfigBase_Set wxConfigBase_Get = wx._misc.ConfigBase_Get wxConfigBase_Create = wx._misc.ConfigBase_Create wxConfigBase_DontCreateOnDemand = wx._misc.ConfigBase_DontCreateOnDemand wxConfig = wx._misc.Config -wxConfigPtr = wx._misc.ConfigPtr wxFileConfig = wx._misc.FileConfig -wxFileConfigPtr = wx._misc.FileConfigPtr wxConfigPathChanger = wx._misc.ConfigPathChanger -wxConfigPathChangerPtr = wx._misc.ConfigPathChangerPtr wxExpandEnvVars = wx._misc.ExpandEnvVars wxDefaultDateTimeFormat = wx._misc.DefaultDateTimeFormat wxDefaultTimeSpanFormat = wx._misc.DefaultTimeSpanFormat wxDateTime = wx._misc.DateTime -wxDateTimePtr = wx._misc.DateTimePtr wxDateTime_SetCountry = wx._misc.DateTime_SetCountry wxDateTime_GetCountry = wx._misc.DateTime_GetCountry wxDateTime_IsWestEuropeanCountry = wx._misc.DateTime_IsWestEuropeanCountry @@ -511,7 +471,6 @@ wxDateTimeFromDMY = wx._misc.DateTimeFromDMY wxDateTimeFromDateTime = wx._misc.DateTimeFromDateTime wxDateTime_SetToWeekOfYear = wx._misc.DateTime_SetToWeekOfYear wxTimeSpan = wx._misc.TimeSpan -wxTimeSpanPtr = wx._misc.TimeSpanPtr wxTimeSpan_Seconds = wx._misc.TimeSpan_Seconds wxTimeSpan_Second = wx._misc.TimeSpan_Second wxTimeSpan_Minutes = wx._misc.TimeSpan_Minutes @@ -523,7 +482,6 @@ wxTimeSpan_Day = wx._misc.TimeSpan_Day wxTimeSpan_Weeks = wx._misc.TimeSpan_Weeks wxTimeSpan_Week = wx._misc.TimeSpan_Week wxDateSpan = wx._misc.DateSpan -wxDateSpanPtr = wx._misc.DateSpanPtr wxDateSpan_Days = wx._misc.DateSpan_Days wxDateSpan_Day = wx._misc.DateSpan_Day wxDateSpan_Weeks = wx._misc.DateSpan_Weeks @@ -558,33 +516,20 @@ wxDF_PRIVATE = wx._misc.DF_PRIVATE wxDF_HTML = wx._misc.DF_HTML wxDF_MAX = wx._misc.DF_MAX wxDataFormat = wx._misc.DataFormat -wxDataFormatPtr = wx._misc.DataFormatPtr wxCustomDataFormat = wx._misc.CustomDataFormat wxFormatInvalid = wx._misc.FormatInvalid wxDataObject = wx._misc.DataObject -wxDataObjectPtr = wx._misc.DataObjectPtr wxDataObjectSimple = wx._misc.DataObjectSimple -wxDataObjectSimplePtr = wx._misc.DataObjectSimplePtr wxPyDataObjectSimple = wx._misc.PyDataObjectSimple -wxPyDataObjectSimplePtr = wx._misc.PyDataObjectSimplePtr wxDataObjectComposite = wx._misc.DataObjectComposite -wxDataObjectCompositePtr = wx._misc.DataObjectCompositePtr wxTextDataObject = wx._misc.TextDataObject -wxTextDataObjectPtr = wx._misc.TextDataObjectPtr wxPyTextDataObject = wx._misc.PyTextDataObject -wxPyTextDataObjectPtr = wx._misc.PyTextDataObjectPtr wxBitmapDataObject = wx._misc.BitmapDataObject -wxBitmapDataObjectPtr = wx._misc.BitmapDataObjectPtr wxPyBitmapDataObject = wx._misc.PyBitmapDataObject -wxPyBitmapDataObjectPtr = wx._misc.PyBitmapDataObjectPtr wxFileDataObject = wx._misc.FileDataObject -wxFileDataObjectPtr = wx._misc.FileDataObjectPtr wxCustomDataObject = wx._misc.CustomDataObject -wxCustomDataObjectPtr = wx._misc.CustomDataObjectPtr wxURLDataObject = wx._misc.URLDataObject -wxURLDataObjectPtr = wx._misc.URLDataObjectPtr wxMetafileDataObject = wx._misc.MetafileDataObject -wxMetafileDataObjectPtr = wx._misc.MetafileDataObjectPtr wxDrag_CopyOnly = wx._misc.Drag_CopyOnly wxDrag_AllowMove = wx._misc.Drag_AllowMove wxDrag_DefaultMove = wx._misc.Drag_DefaultMove @@ -596,32 +541,23 @@ wxDragLink = wx._misc.DragLink wxDragCancel = wx._misc.DragCancel wxIsDragResultOk = wx._misc.IsDragResultOk wxDropSource = wx._misc.DropSource -wxDropSourcePtr = wx._misc.DropSourcePtr wxDropSource = wx._misc.DropSource wxDropTarget = wx._misc.DropTarget -wxDropTargetPtr = wx._misc.DropTargetPtr wxDropTarget = wx._misc.DropTarget wxTextDropTarget = wx._misc.TextDropTarget -wxTextDropTargetPtr = wx._misc.TextDropTargetPtr wxTextDropTarget = wx._misc.TextDropTarget wxFileDropTarget = wx._misc.FileDropTarget -wxFileDropTargetPtr = wx._misc.FileDropTargetPtr wxFileDropTarget = wx._misc.FileDropTarget wxClipboard = wx._misc.Clipboard -wxClipboardPtr = wx._misc.ClipboardPtr wxClipboard_Get = wx._misc.Clipboard_Get wxClipboardLocker = wx._misc.ClipboardLocker -wxClipboardLockerPtr = wx._misc.ClipboardLockerPtr wxVideoMode = wx._misc.VideoMode -wxVideoModePtr = wx._misc.VideoModePtr wxDefaultVideoMode = wx._misc.DefaultVideoMode wxDisplay = wx._misc.Display -wxDisplayPtr = wx._misc.DisplayPtr wxDisplay_GetCount = wx._misc.Display_GetCount wxDisplay_GetFromPoint = wx._misc.Display_GetFromPoint wxDisplay_GetFromWindow = wx._misc.Display_GetFromWindow wxStandardPaths = wx._misc.StandardPaths -wxStandardPathsPtr = wx._misc.StandardPathsPtr wxStandardPaths_Get = wx._misc.StandardPaths_Get wxPyTimer = wx._misc.PyTimer wxPyDropTarget = wx._misc.PyDropTarget diff --git a/wxPython/wxPython/_windows.py b/wxPython/wxPython/_windows.py index 03a1d5942c..e79cb88ccd 100644 --- a/wxPython/wxPython/_windows.py +++ b/wxPython/wxPython/_windows.py @@ -20,11 +20,9 @@ del sys, _wx # Now assign all the reverse-renamed names: wxPanel = wx._windows.Panel -wxPanelPtr = wx._windows.PanelPtr wxPrePanel = wx._windows.PrePanel wxPanel_GetClassDefaultAttributes = wx._windows.Panel_GetClassDefaultAttributes wxScrolledWindow = wx._windows.ScrolledWindow -wxScrolledWindowPtr = wx._windows.ScrolledWindowPtr wxPreScrolledWindow = wx._windows.PreScrolledWindow wxScrolledWindow_GetClassDefaultAttributes = wx._windows.ScrolledWindow_GetClassDefaultAttributes wxFrameNameStr = wx._windows.FrameNameStr @@ -69,17 +67,13 @@ wxTOPLEVEL_EX_DIALOG = wx._windows.TOPLEVEL_EX_DIALOG wxUSER_ATTENTION_INFO = wx._windows.USER_ATTENTION_INFO wxUSER_ATTENTION_ERROR = wx._windows.USER_ATTENTION_ERROR wxTopLevelWindow = wx._windows.TopLevelWindow -wxTopLevelWindowPtr = wx._windows.TopLevelWindowPtr wxFrame = wx._windows.Frame -wxFramePtr = wx._windows.FramePtr wxPreFrame = wx._windows.PreFrame wxFrame_GetClassDefaultAttributes = wx._windows.Frame_GetClassDefaultAttributes wxDialog = wx._windows.Dialog -wxDialogPtr = wx._windows.DialogPtr wxPreDialog = wx._windows.PreDialog wxDialog_GetClassDefaultAttributes = wx._windows.Dialog_GetClassDefaultAttributes wxMiniFrame = wx._windows.MiniFrame -wxMiniFramePtr = wx._windows.MiniFramePtr wxPreMiniFrame = wx._windows.PreMiniFrame wxSPLASH_CENTRE_ON_PARENT = wx._windows.SPLASH_CENTRE_ON_PARENT wxSPLASH_CENTRE_ON_SCREEN = wx._windows.SPLASH_CENTRE_ON_SCREEN @@ -87,14 +81,11 @@ wxSPLASH_NO_CENTRE = wx._windows.SPLASH_NO_CENTRE wxSPLASH_TIMEOUT = wx._windows.SPLASH_TIMEOUT wxSPLASH_NO_TIMEOUT = wx._windows.SPLASH_NO_TIMEOUT wxSplashScreenWindow = wx._windows.SplashScreenWindow -wxSplashScreenWindowPtr = wx._windows.SplashScreenWindowPtr wxSplashScreen = wx._windows.SplashScreen -wxSplashScreenPtr = wx._windows.SplashScreenPtr wxSB_NORMAL = wx._windows.SB_NORMAL wxSB_FLAT = wx._windows.SB_FLAT wxSB_RAISED = wx._windows.SB_RAISED wxStatusBar = wx._windows.StatusBar -wxStatusBarPtr = wx._windows.StatusBarPtr wxPreStatusBar = wx._windows.PreStatusBar wxStatusBar_GetClassDefaultAttributes = wx._windows.StatusBar_GetClassDefaultAttributes wxSplitterNameStr = wx._windows.SplitterNameStr @@ -113,11 +104,9 @@ wxSPLIT_DRAG_NONE = wx._windows.SPLIT_DRAG_NONE wxSPLIT_DRAG_DRAGGING = wx._windows.SPLIT_DRAG_DRAGGING wxSPLIT_DRAG_LEFT_DOWN = wx._windows.SPLIT_DRAG_LEFT_DOWN wxSplitterWindow = wx._windows.SplitterWindow -wxSplitterWindowPtr = wx._windows.SplitterWindowPtr wxPreSplitterWindow = wx._windows.PreSplitterWindow wxSplitterWindow_GetClassDefaultAttributes = wx._windows.SplitterWindow_GetClassDefaultAttributes wxSplitterEvent = wx._windows.SplitterEvent -wxSplitterEventPtr = wx._windows.SplitterEventPtr wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wx._windows.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wx._windows.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wx._windows.wxEVT_COMMAND_SPLITTER_DOUBLECLICKED @@ -138,12 +127,10 @@ wxSASH_BOTTOM = wx._windows.SASH_BOTTOM wxSASH_LEFT = wx._windows.SASH_LEFT wxSASH_NONE = wx._windows.SASH_NONE wxSashWindow = wx._windows.SashWindow -wxSashWindowPtr = wx._windows.SashWindowPtr wxPreSashWindow = wx._windows.PreSashWindow wxSASH_STATUS_OK = wx._windows.SASH_STATUS_OK wxSASH_STATUS_OUT_OF_RANGE = wx._windows.SASH_STATUS_OUT_OF_RANGE wxSashEvent = wx._windows.SashEvent -wxSashEventPtr = wx._windows.SashEventPtr wxEVT_SASH_DRAGGED = wx._windows.wxEVT_SASH_DRAGGED wxLAYOUT_HORIZONTAL = wx._windows.LAYOUT_HORIZONTAL wxLAYOUT_VERTICAL = wx._windows.LAYOUT_VERTICAL @@ -159,41 +146,29 @@ wxLAYOUT_QUERY = wx._windows.LAYOUT_QUERY wxEVT_QUERY_LAYOUT_INFO = wx._windows.wxEVT_QUERY_LAYOUT_INFO wxEVT_CALCULATE_LAYOUT = wx._windows.wxEVT_CALCULATE_LAYOUT wxQueryLayoutInfoEvent = wx._windows.QueryLayoutInfoEvent -wxQueryLayoutInfoEventPtr = wx._windows.QueryLayoutInfoEventPtr wxCalculateLayoutEvent = wx._windows.CalculateLayoutEvent -wxCalculateLayoutEventPtr = wx._windows.CalculateLayoutEventPtr wxSashLayoutWindow = wx._windows.SashLayoutWindow -wxSashLayoutWindowPtr = wx._windows.SashLayoutWindowPtr wxPreSashLayoutWindow = wx._windows.PreSashLayoutWindow wxLayoutAlgorithm = wx._windows.LayoutAlgorithm -wxLayoutAlgorithmPtr = wx._windows.LayoutAlgorithmPtr wxPopupWindow = wx._windows.PopupWindow -wxPopupWindowPtr = wx._windows.PopupWindowPtr wxPrePopupWindow = wx._windows.PrePopupWindow wxPopupTransientWindow = wx._windows.PopupTransientWindow -wxPopupTransientWindowPtr = wx._windows.PopupTransientWindowPtr wxPopupTransientWindow = wx._windows.PopupTransientWindow wxPrePopupTransientWindow = wx._windows.PrePopupTransientWindow wxTipWindow = wx._windows.TipWindow -wxTipWindowPtr = wx._windows.TipWindowPtr wxVScrolledWindow = wx._windows.VScrolledWindow -wxVScrolledWindowPtr = wx._windows.VScrolledWindowPtr wxVScrolledWindow = wx._windows.VScrolledWindow wxPreVScrolledWindow = wx._windows.PreVScrolledWindow wxVListBoxNameStr = wx._windows.VListBoxNameStr wxVListBox = wx._windows.VListBox -wxVListBoxPtr = wx._windows.VListBoxPtr wxVListBox = wx._windows.VListBox wxPreVListBox = wx._windows.PreVListBox wxHtmlListBox = wx._windows.HtmlListBox -wxHtmlListBoxPtr = wx._windows.HtmlListBoxPtr wxHtmlListBox = wx._windows.HtmlListBox wxPreHtmlListBox = wx._windows.PreHtmlListBox wxTaskBarIcon = wx._windows.TaskBarIcon -wxTaskBarIconPtr = wx._windows.TaskBarIconPtr wxTaskBarIcon = wx._windows.TaskBarIcon wxTaskBarIconEvent = wx._windows.TaskBarIconEvent -wxTaskBarIconEventPtr = wx._windows.TaskBarIconEventPtr wxEVT_TASKBAR_MOVE = wx._windows.wxEVT_TASKBAR_MOVE wxEVT_TASKBAR_LEFT_DOWN = wx._windows.wxEVT_TASKBAR_LEFT_DOWN wxEVT_TASKBAR_LEFT_UP = wx._windows.wxEVT_TASKBAR_LEFT_UP @@ -208,34 +183,22 @@ wxFileSelectorDefaultWildcardStr = wx._windows.FileSelectorDefaultWildcardStr wxGetTextFromUserPromptStr = wx._windows.GetTextFromUserPromptStr wxMessageBoxCaptionStr = wx._windows.MessageBoxCaptionStr wxColourData = wx._windows.ColourData -wxColourDataPtr = wx._windows.ColourDataPtr wxColourDialog = wx._windows.ColourDialog -wxColourDialogPtr = wx._windows.ColourDialogPtr wxGetColourFromUser = wx._windows.GetColourFromUser wxDirDialog = wx._windows.DirDialog -wxDirDialogPtr = wx._windows.DirDialogPtr wxFileDialog = wx._windows.FileDialog -wxFileDialogPtr = wx._windows.FileDialogPtr wxCHOICEDLG_STYLE = wx._windows.CHOICEDLG_STYLE wxMultiChoiceDialog = wx._windows.MultiChoiceDialog -wxMultiChoiceDialogPtr = wx._windows.MultiChoiceDialogPtr wxSingleChoiceDialog = wx._windows.SingleChoiceDialog -wxSingleChoiceDialogPtr = wx._windows.SingleChoiceDialogPtr wxTextEntryDialogStyle = wx._windows.TextEntryDialogStyle wxTextEntryDialog = wx._windows.TextEntryDialog -wxTextEntryDialogPtr = wx._windows.TextEntryDialogPtr wxGetPasswordFromUserPromptStr = wx._windows.GetPasswordFromUserPromptStr wxPasswordEntryDialog = wx._windows.PasswordEntryDialog -wxPasswordEntryDialogPtr = wx._windows.PasswordEntryDialogPtr wxFontData = wx._windows.FontData -wxFontDataPtr = wx._windows.FontDataPtr wxFontDialog = wx._windows.FontDialog -wxFontDialogPtr = wx._windows.FontDialogPtr wxGetFontFromUser = wx._windows.GetFontFromUser wxMessageDialog = wx._windows.MessageDialog -wxMessageDialogPtr = wx._windows.MessageDialogPtr wxProgressDialog = wx._windows.ProgressDialog -wxProgressDialogPtr = wx._windows.ProgressDialogPtr wxFR_DOWN = wx._windows.FR_DOWN wxFR_WHOLEWORD = wx._windows.FR_WHOLEWORD wxFR_MATCHCASE = wx._windows.FR_MATCHCASE @@ -249,11 +212,8 @@ wxEVT_COMMAND_FIND_REPLACE = wx._windows.wxEVT_COMMAND_FIND_REPLACE wxEVT_COMMAND_FIND_REPLACE_ALL = wx._windows.wxEVT_COMMAND_FIND_REPLACE_ALL wxEVT_COMMAND_FIND_CLOSE = wx._windows.wxEVT_COMMAND_FIND_CLOSE wxFindDialogEvent = wx._windows.FindDialogEvent -wxFindDialogEventPtr = wx._windows.FindDialogEventPtr wxFindReplaceData = wx._windows.FindReplaceData -wxFindReplaceDataPtr = wx._windows.FindReplaceDataPtr wxFindReplaceDialog = wx._windows.FindReplaceDialog -wxFindReplaceDialogPtr = wx._windows.FindReplaceDialogPtr wxPreFindReplaceDialog = wx._windows.PreFindReplaceDialog IDM_WINDOWTILE = wx._windows.IDM_WINDOWTILE IDM_WINDOWTILEHOR = wx._windows.IDM_WINDOWTILEHOR @@ -265,22 +225,16 @@ IDM_WINDOWPREV = wx._windows.IDM_WINDOWPREV wxFIRST_MDI_CHILD = wx._windows.FIRST_MDI_CHILD wxLAST_MDI_CHILD = wx._windows.LAST_MDI_CHILD wxMDIParentFrame = wx._windows.MDIParentFrame -wxMDIParentFramePtr = wx._windows.MDIParentFramePtr wxPreMDIParentFrame = wx._windows.PreMDIParentFrame wxMDIChildFrame = wx._windows.MDIChildFrame -wxMDIChildFramePtr = wx._windows.MDIChildFramePtr wxPreMDIChildFrame = wx._windows.PreMDIChildFrame wxMDIClientWindow = wx._windows.MDIClientWindow -wxMDIClientWindowPtr = wx._windows.MDIClientWindowPtr wxPreMDIClientWindow = wx._windows.PreMDIClientWindow wxPyWindow = wx._windows.PyWindow -wxPyWindowPtr = wx._windows.PyWindowPtr wxPrePyWindow = wx._windows.PrePyWindow wxPyPanel = wx._windows.PyPanel -wxPyPanelPtr = wx._windows.PyPanelPtr wxPrePyPanel = wx._windows.PrePyPanel wxPyScrolledWindow = wx._windows.PyScrolledWindow -wxPyScrolledWindowPtr = wx._windows.PyScrolledWindowPtr wxPrePyScrolledWindow = wx._windows.PrePyScrolledWindow wxPrintoutTitleStr = wx._windows.PrintoutTitleStr wxPreviewCanvasNameStr = wx._windows.PreviewCanvasNameStr @@ -305,28 +259,19 @@ wxPRINTBIN_CASSETTE = wx._windows.PRINTBIN_CASSETTE wxPRINTBIN_FORMSOURCE = wx._windows.PRINTBIN_FORMSOURCE wxPRINTBIN_USER = wx._windows.PRINTBIN_USER wxPrintData = wx._windows.PrintData -wxPrintDataPtr = wx._windows.PrintDataPtr wxPageSetupDialogData = wx._windows.PageSetupDialogData -wxPageSetupDialogDataPtr = wx._windows.PageSetupDialogDataPtr wxPageSetupDialog = wx._windows.PageSetupDialog -wxPageSetupDialogPtr = wx._windows.PageSetupDialogPtr wxPrintDialogData = wx._windows.PrintDialogData -wxPrintDialogDataPtr = wx._windows.PrintDialogDataPtr wxPrintDialog = wx._windows.PrintDialog -wxPrintDialogPtr = wx._windows.PrintDialogPtr wxPRINTER_NO_ERROR = wx._windows.PRINTER_NO_ERROR wxPRINTER_CANCELLED = wx._windows.PRINTER_CANCELLED wxPRINTER_ERROR = wx._windows.PRINTER_ERROR wxPrinter = wx._windows.Printer -wxPrinterPtr = wx._windows.PrinterPtr wxPrinter_GetLastError = wx._windows.Printer_GetLastError wxPrintout = wx._windows.Printout -wxPrintoutPtr = wx._windows.PrintoutPtr wxPrintout = wx._windows.Printout wxPreviewCanvas = wx._windows.PreviewCanvas -wxPreviewCanvasPtr = wx._windows.PreviewCanvasPtr wxPreviewFrame = wx._windows.PreviewFrame -wxPreviewFramePtr = wx._windows.PreviewFramePtr wxPREVIEW_PRINT = wx._windows.PREVIEW_PRINT wxPREVIEW_PREVIOUS = wx._windows.PREVIEW_PREVIOUS wxPREVIEW_NEXT = wx._windows.PREVIEW_NEXT @@ -344,15 +289,10 @@ wxID_PREVIEW_FIRST = wx._windows.ID_PREVIEW_FIRST wxID_PREVIEW_LAST = wx._windows.ID_PREVIEW_LAST wxID_PREVIEW_GOTO = wx._windows.ID_PREVIEW_GOTO wxPreviewControlBar = wx._windows.PreviewControlBar -wxPreviewControlBarPtr = wx._windows.PreviewControlBarPtr wxPrintPreview = wx._windows.PrintPreview -wxPrintPreviewPtr = wx._windows.PrintPreviewPtr wxPyPrintPreview = wx._windows.PyPrintPreview -wxPyPrintPreviewPtr = wx._windows.PyPrintPreviewPtr wxPyPreviewFrame = wx._windows.PyPreviewFrame -wxPyPreviewFramePtr = wx._windows.PyPreviewFramePtr wxPyPreviewControlBar = wx._windows.PyPreviewControlBar -wxPyPreviewControlBarPtr = wx._windows.PyPreviewControlBarPtr d = globals() diff --git a/wxPython/wxPython/animate.py b/wxPython/wxPython/animate.py index 71da191550..9ae73bda6b 100644 --- a/wxPython/wxPython/animate.py +++ b/wxPython/wxPython/animate.py @@ -25,14 +25,10 @@ wxANIM_DONOTREMOVE = wx.animate.ANIM_DONOTREMOVE wxANIM_TOBACKGROUND = wx.animate.ANIM_TOBACKGROUND wxANIM_TOPREVIOUS = wx.animate.ANIM_TOPREVIOUS wxAnimationPlayer = wx.animate.AnimationPlayer -wxAnimationPlayerPtr = wx.animate.AnimationPlayerPtr wxAnimationBase = wx.animate.AnimationBase -wxAnimationBasePtr = wx.animate.AnimationBasePtr wxGIFAnimation = wx.animate.GIFAnimation -wxGIFAnimationPtr = wx.animate.GIFAnimationPtr wxAN_FIT_ANIMATION = wx.animate.AN_FIT_ANIMATION wxGIFAnimationCtrl = wx.animate.GIFAnimationCtrl -wxGIFAnimationCtrlPtr = wx.animate.GIFAnimationCtrlPtr wxPreGIFAnimationCtrl = wx.animate.PreGIFAnimationCtrl diff --git a/wxPython/wxPython/calendar.py b/wxPython/wxPython/calendar.py index bae2ca5bc6..65c2f417d2 100644 --- a/wxPython/wxPython/calendar.py +++ b/wxPython/wxPython/calendar.py @@ -36,9 +36,7 @@ wxCAL_BORDER_NONE = wx.calendar.CAL_BORDER_NONE wxCAL_BORDER_SQUARE = wx.calendar.CAL_BORDER_SQUARE wxCAL_BORDER_ROUND = wx.calendar.CAL_BORDER_ROUND wxCalendarDateAttr = wx.calendar.CalendarDateAttr -wxCalendarDateAttrPtr = wx.calendar.CalendarDateAttrPtr wxCalendarEvent = wx.calendar.CalendarEvent -wxCalendarEventPtr = wx.calendar.CalendarEventPtr wxEVT_CALENDAR_DOUBLECLICKED = wx.calendar.wxEVT_CALENDAR_DOUBLECLICKED wxEVT_CALENDAR_SEL_CHANGED = wx.calendar.wxEVT_CALENDAR_SEL_CHANGED wxEVT_CALENDAR_DAY_CHANGED = wx.calendar.wxEVT_CALENDAR_DAY_CHANGED @@ -47,7 +45,6 @@ wxEVT_CALENDAR_YEAR_CHANGED = wx.calendar.wxEVT_CALENDAR_YEAR_CHANGED wxEVT_CALENDAR_WEEKDAY_CLICKED = wx.calendar.wxEVT_CALENDAR_WEEKDAY_CLICKED wxCalendarNameStr = wx.calendar.CalendarNameStr wxCalendarCtrl = wx.calendar.CalendarCtrl -wxCalendarCtrlPtr = wx.calendar.CalendarCtrlPtr wxPreCalendarCtrl = wx.calendar.PreCalendarCtrl wxCalendarCtrl_GetClassDefaultAttributes = wx.calendar.CalendarCtrl_GetClassDefaultAttributes diff --git a/wxPython/wxPython/gizmos.py b/wxPython/wxPython/gizmos.py index af499988f9..e6c6c01f57 100644 --- a/wxPython/wxPython/gizmos.py +++ b/wxPython/wxPython/gizmos.py @@ -28,33 +28,24 @@ wxDS_DRAG_CORNER = wx.gizmos.DS_DRAG_CORNER wxEVT_DYNAMIC_SASH_SPLIT = wx.gizmos.wxEVT_DYNAMIC_SASH_SPLIT wxEVT_DYNAMIC_SASH_UNIFY = wx.gizmos.wxEVT_DYNAMIC_SASH_UNIFY wxDynamicSashSplitEvent = wx.gizmos.DynamicSashSplitEvent -wxDynamicSashSplitEventPtr = wx.gizmos.DynamicSashSplitEventPtr wxDynamicSashUnifyEvent = wx.gizmos.DynamicSashUnifyEvent -wxDynamicSashUnifyEventPtr = wx.gizmos.DynamicSashUnifyEventPtr wxDynamicSashWindow = wx.gizmos.DynamicSashWindow -wxDynamicSashWindowPtr = wx.gizmos.DynamicSashWindowPtr wxPreDynamicSashWindow = wx.gizmos.PreDynamicSashWindow wxEL_ALLOW_NEW = wx.gizmos.EL_ALLOW_NEW wxEL_ALLOW_EDIT = wx.gizmos.EL_ALLOW_EDIT wxEL_ALLOW_DELETE = wx.gizmos.EL_ALLOW_DELETE wxEditableListBox = wx.gizmos.EditableListBox -wxEditableListBoxPtr = wx.gizmos.EditableListBoxPtr wxRemotelyScrolledTreeCtrl = wx.gizmos.RemotelyScrolledTreeCtrl -wxRemotelyScrolledTreeCtrlPtr = wx.gizmos.RemotelyScrolledTreeCtrlPtr wxTreeCompanionWindow = wx.gizmos.TreeCompanionWindow -wxTreeCompanionWindowPtr = wx.gizmos.TreeCompanionWindowPtr wxTreeCompanionWindow = wx.gizmos.TreeCompanionWindow wxThinSplitterWindow = wx.gizmos.ThinSplitterWindow -wxThinSplitterWindowPtr = wx.gizmos.ThinSplitterWindowPtr wxSplitterScrolledWindow = wx.gizmos.SplitterScrolledWindow -wxSplitterScrolledWindowPtr = wx.gizmos.SplitterScrolledWindowPtr wxLED_ALIGN_LEFT = wx.gizmos.LED_ALIGN_LEFT wxLED_ALIGN_RIGHT = wx.gizmos.LED_ALIGN_RIGHT wxLED_ALIGN_CENTER = wx.gizmos.LED_ALIGN_CENTER wxLED_ALIGN_MASK = wx.gizmos.LED_ALIGN_MASK wxLED_DRAW_FADED = wx.gizmos.LED_DRAW_FADED wxLEDNumberCtrl = wx.gizmos.LEDNumberCtrl -wxLEDNumberCtrlPtr = wx.gizmos.LEDNumberCtrlPtr wxPreLEDNumberCtrl = wx.gizmos.PreLEDNumberCtrl wxTL_ALIGN_LEFT = wx.gizmos.TL_ALIGN_LEFT wxTL_ALIGN_RIGHT = wx.gizmos.TL_ALIGN_RIGHT @@ -67,9 +58,7 @@ wxTL_SEARCH_PARTIAL = wx.gizmos.TL_SEARCH_PARTIAL wxTL_SEARCH_NOCASE = wx.gizmos.TL_SEARCH_NOCASE wxTR_DONT_ADJUST_MAC = wx.gizmos.TR_DONT_ADJUST_MAC wxTreeListColumnInfo = wx.gizmos.TreeListColumnInfo -wxTreeListColumnInfoPtr = wx.gizmos.TreeListColumnInfoPtr wxTreeListCtrl = wx.gizmos.TreeListCtrl -wxTreeListCtrlPtr = wx.gizmos.TreeListCtrlPtr wxTreeListCtrl = wx.gizmos.TreeListCtrl wxPreTreeListCtrl = wx.gizmos.PreTreeListCtrl wxSCALE_HORIZONTAL = wx.gizmos.SCALE_HORIZONTAL @@ -77,7 +66,6 @@ wxSCALE_VERTICAL = wx.gizmos.SCALE_VERTICAL wxSCALE_UNIFORM = wx.gizmos.SCALE_UNIFORM wxSCALE_CUSTOM = wx.gizmos.SCALE_CUSTOM wxStaticPicture = wx.gizmos.StaticPicture -wxStaticPicturePtr = wx.gizmos.StaticPicturePtr wxPreStaticPicture = wx.gizmos.PreStaticPicture diff --git a/wxPython/wxPython/glcanvas.py b/wxPython/wxPython/glcanvas.py index 8d2d712322..be3f52a589 100644 --- a/wxPython/wxPython/glcanvas.py +++ b/wxPython/wxPython/glcanvas.py @@ -21,7 +21,6 @@ del sys, _wx # Now assign all the reverse-renamed names: wxGLCanvasNameStr = wx.glcanvas.GLCanvasNameStr wxGLContext = wx.glcanvas.GLContext -wxGLContextPtr = wx.glcanvas.GLContextPtr WX_GL_RGBA = wx.glcanvas.WX_GL_RGBA WX_GL_BUFFER_SIZE = wx.glcanvas.WX_GL_BUFFER_SIZE WX_GL_LEVEL = wx.glcanvas.WX_GL_LEVEL @@ -39,7 +38,6 @@ WX_GL_MIN_ACCUM_GREEN = wx.glcanvas.WX_GL_MIN_ACCUM_GREEN WX_GL_MIN_ACCUM_BLUE = wx.glcanvas.WX_GL_MIN_ACCUM_BLUE WX_GL_MIN_ACCUM_ALPHA = wx.glcanvas.WX_GL_MIN_ACCUM_ALPHA wxGLCanvas = wx.glcanvas.GLCanvas -wxGLCanvasPtr = wx.glcanvas.GLCanvasPtr wxGLCanvasWithContext = wx.glcanvas.GLCanvasWithContext diff --git a/wxPython/wxPython/grid.py b/wxPython/wxPython/grid.py index a93c6af23f..fad9126202 100644 --- a/wxPython/wxPython/grid.py +++ b/wxPython/wxPython/grid.py @@ -41,55 +41,30 @@ wxGRID_MIN_ROW_HEIGHT = wx.grid.GRID_MIN_ROW_HEIGHT wxGRID_MIN_COL_WIDTH = wx.grid.GRID_MIN_COL_WIDTH wxGRID_DEFAULT_SCROLLBAR_WIDTH = wx.grid.GRID_DEFAULT_SCROLLBAR_WIDTH wxGridCellWorker = wx.grid.GridCellWorker -wxGridCellWorkerPtr = wx.grid.GridCellWorkerPtr wxGridCellRenderer = wx.grid.GridCellRenderer -wxGridCellRendererPtr = wx.grid.GridCellRendererPtr wxPyGridCellRenderer = wx.grid.PyGridCellRenderer -wxPyGridCellRendererPtr = wx.grid.PyGridCellRendererPtr wxGridCellStringRenderer = wx.grid.GridCellStringRenderer -wxGridCellStringRendererPtr = wx.grid.GridCellStringRendererPtr wxGridCellNumberRenderer = wx.grid.GridCellNumberRenderer -wxGridCellNumberRendererPtr = wx.grid.GridCellNumberRendererPtr wxGridCellFloatRenderer = wx.grid.GridCellFloatRenderer -wxGridCellFloatRendererPtr = wx.grid.GridCellFloatRendererPtr wxGridCellBoolRenderer = wx.grid.GridCellBoolRenderer -wxGridCellBoolRendererPtr = wx.grid.GridCellBoolRendererPtr wxGridCellDateTimeRenderer = wx.grid.GridCellDateTimeRenderer -wxGridCellDateTimeRendererPtr = wx.grid.GridCellDateTimeRendererPtr wxGridCellEnumRenderer = wx.grid.GridCellEnumRenderer -wxGridCellEnumRendererPtr = wx.grid.GridCellEnumRendererPtr wxGridCellAutoWrapStringRenderer = wx.grid.GridCellAutoWrapStringRenderer -wxGridCellAutoWrapStringRendererPtr = wx.grid.GridCellAutoWrapStringRendererPtr wxGridCellEditor = wx.grid.GridCellEditor -wxGridCellEditorPtr = wx.grid.GridCellEditorPtr wxPyGridCellEditor = wx.grid.PyGridCellEditor -wxPyGridCellEditorPtr = wx.grid.PyGridCellEditorPtr wxGridCellTextEditor = wx.grid.GridCellTextEditor -wxGridCellTextEditorPtr = wx.grid.GridCellTextEditorPtr wxGridCellNumberEditor = wx.grid.GridCellNumberEditor -wxGridCellNumberEditorPtr = wx.grid.GridCellNumberEditorPtr wxGridCellFloatEditor = wx.grid.GridCellFloatEditor -wxGridCellFloatEditorPtr = wx.grid.GridCellFloatEditorPtr wxGridCellBoolEditor = wx.grid.GridCellBoolEditor -wxGridCellBoolEditorPtr = wx.grid.GridCellBoolEditorPtr wxGridCellChoiceEditor = wx.grid.GridCellChoiceEditor -wxGridCellChoiceEditorPtr = wx.grid.GridCellChoiceEditorPtr wxGridCellEnumEditor = wx.grid.GridCellEnumEditor -wxGridCellEnumEditorPtr = wx.grid.GridCellEnumEditorPtr wxGridCellAutoWrapStringEditor = wx.grid.GridCellAutoWrapStringEditor -wxGridCellAutoWrapStringEditorPtr = wx.grid.GridCellAutoWrapStringEditorPtr wxGridCellAttr = wx.grid.GridCellAttr -wxGridCellAttrPtr = wx.grid.GridCellAttrPtr wxGridCellAttrProvider = wx.grid.GridCellAttrProvider -wxGridCellAttrProviderPtr = wx.grid.GridCellAttrProviderPtr wxPyGridCellAttrProvider = wx.grid.PyGridCellAttrProvider -wxPyGridCellAttrProviderPtr = wx.grid.PyGridCellAttrProviderPtr wxGridTableBase = wx.grid.GridTableBase -wxGridTableBasePtr = wx.grid.GridTableBasePtr wxPyGridTableBase = wx.grid.PyGridTableBase -wxPyGridTableBasePtr = wx.grid.PyGridTableBasePtr wxGridStringTable = wx.grid.GridStringTable -wxGridStringTablePtr = wx.grid.GridStringTablePtr wxGRIDTABLE_REQUEST_VIEW_GET_VALUES = wx.grid.GRIDTABLE_REQUEST_VIEW_GET_VALUES wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES = wx.grid.GRIDTABLE_REQUEST_VIEW_SEND_VALUES wxGRIDTABLE_NOTIFY_ROWS_INSERTED = wx.grid.GRIDTABLE_NOTIFY_ROWS_INSERTED @@ -99,21 +74,14 @@ wxGRIDTABLE_NOTIFY_COLS_INSERTED = wx.grid.GRIDTABLE_NOTIFY_COLS_INSERTED wxGRIDTABLE_NOTIFY_COLS_APPENDED = wx.grid.GRIDTABLE_NOTIFY_COLS_APPENDED wxGRIDTABLE_NOTIFY_COLS_DELETED = wx.grid.GRIDTABLE_NOTIFY_COLS_DELETED wxGridTableMessage = wx.grid.GridTableMessage -wxGridTableMessagePtr = wx.grid.GridTableMessagePtr wxGridCellCoords = wx.grid.GridCellCoords -wxGridCellCoordsPtr = wx.grid.GridCellCoordsPtr wxGrid = wx.grid.Grid -wxGridPtr = wx.grid.GridPtr wxPreGrid = wx.grid.PreGrid wxGrid_GetClassDefaultAttributes = wx.grid.Grid_GetClassDefaultAttributes wxGridEvent = wx.grid.GridEvent -wxGridEventPtr = wx.grid.GridEventPtr wxGridSizeEvent = wx.grid.GridSizeEvent -wxGridSizeEventPtr = wx.grid.GridSizeEventPtr wxGridRangeSelectEvent = wx.grid.GridRangeSelectEvent -wxGridRangeSelectEventPtr = wx.grid.GridRangeSelectEventPtr wxGridEditorCreatedEvent = wx.grid.GridEditorCreatedEvent -wxGridEditorCreatedEventPtr = wx.grid.GridEditorCreatedEventPtr wxEVT_GRID_CELL_LEFT_CLICK = wx.grid.wxEVT_GRID_CELL_LEFT_CLICK wxEVT_GRID_CELL_RIGHT_CLICK = wx.grid.wxEVT_GRID_CELL_RIGHT_CLICK wxEVT_GRID_CELL_LEFT_DCLICK = wx.grid.wxEVT_GRID_CELL_LEFT_DCLICK diff --git a/wxPython/wxPython/html.py b/wxPython/wxPython/html.py index 562f637b82..4e30487c69 100644 --- a/wxPython/wxPython/html.py +++ b/wxPython/wxPython/html.py @@ -59,74 +59,49 @@ wxHTML_URL_PAGE = wx.html.HTML_URL_PAGE wxHTML_URL_IMAGE = wx.html.HTML_URL_IMAGE wxHTML_URL_OTHER = wx.html.HTML_URL_OTHER wxHtmlLinkInfo = wx.html.HtmlLinkInfo -wxHtmlLinkInfoPtr = wx.html.HtmlLinkInfoPtr wxHtmlTag = wx.html.HtmlTag -wxHtmlTagPtr = wx.html.HtmlTagPtr wxHtmlParser = wx.html.HtmlParser -wxHtmlParserPtr = wx.html.HtmlParserPtr wxHtmlWinParser = wx.html.HtmlWinParser -wxHtmlWinParserPtr = wx.html.HtmlWinParserPtr wxHtmlTagHandler = wx.html.HtmlTagHandler -wxHtmlTagHandlerPtr = wx.html.HtmlTagHandlerPtr wxHtmlTagHandler = wx.html.HtmlTagHandler wxHtmlWinTagHandler = wx.html.HtmlWinTagHandler -wxHtmlWinTagHandlerPtr = wx.html.HtmlWinTagHandlerPtr wxHtmlWinTagHandler = wx.html.HtmlWinTagHandler wxHtmlWinParser_AddTagHandler = wx.html.HtmlWinParser_AddTagHandler wxHtmlSelection = wx.html.HtmlSelection -wxHtmlSelectionPtr = wx.html.HtmlSelectionPtr wxHTML_SEL_OUT = wx.html.HTML_SEL_OUT wxHTML_SEL_IN = wx.html.HTML_SEL_IN wxHTML_SEL_CHANGING = wx.html.HTML_SEL_CHANGING wxHtmlRenderingState = wx.html.HtmlRenderingState -wxHtmlRenderingStatePtr = wx.html.HtmlRenderingStatePtr wxHtmlRenderingStyle = wx.html.HtmlRenderingStyle -wxHtmlRenderingStylePtr = wx.html.HtmlRenderingStylePtr wxDefaultHtmlRenderingStyle = wx.html.DefaultHtmlRenderingStyle -wxDefaultHtmlRenderingStylePtr = wx.html.DefaultHtmlRenderingStylePtr wxHtmlRenderingInfo = wx.html.HtmlRenderingInfo -wxHtmlRenderingInfoPtr = wx.html.HtmlRenderingInfoPtr wxHTML_FIND_EXACT = wx.html.HTML_FIND_EXACT wxHTML_FIND_NEAREST_BEFORE = wx.html.HTML_FIND_NEAREST_BEFORE wxHTML_FIND_NEAREST_AFTER = wx.html.HTML_FIND_NEAREST_AFTER wxHtmlCell = wx.html.HtmlCell -wxHtmlCellPtr = wx.html.HtmlCellPtr wxHtmlWordCell = wx.html.HtmlWordCell -wxHtmlWordCellPtr = wx.html.HtmlWordCellPtr wxHtmlContainerCell = wx.html.HtmlContainerCell -wxHtmlContainerCellPtr = wx.html.HtmlContainerCellPtr wxHtmlColourCell = wx.html.HtmlColourCell -wxHtmlColourCellPtr = wx.html.HtmlColourCellPtr wxHtmlFontCell = wx.html.HtmlFontCell -wxHtmlFontCellPtr = wx.html.HtmlFontCellPtr wxHtmlWidgetCell = wx.html.HtmlWidgetCell -wxHtmlWidgetCellPtr = wx.html.HtmlWidgetCellPtr wxHtmlFilter = wx.html.HtmlFilter -wxHtmlFilterPtr = wx.html.HtmlFilterPtr wxHtmlFilter = wx.html.HtmlFilter wxHtmlWindow = wx.html.HtmlWindow -wxHtmlWindowPtr = wx.html.HtmlWindowPtr wxHtmlWindow = wx.html.HtmlWindow wxPreHtmlWindow = wx.html.PreHtmlWindow wxHtmlWindow_AddFilter = wx.html.HtmlWindow_AddFilter wxHtmlWindow_GetClassDefaultAttributes = wx.html.HtmlWindow_GetClassDefaultAttributes wxHtmlDCRenderer = wx.html.HtmlDCRenderer -wxHtmlDCRendererPtr = wx.html.HtmlDCRendererPtr wxPAGE_ODD = wx.html.PAGE_ODD wxPAGE_EVEN = wx.html.PAGE_EVEN wxPAGE_ALL = wx.html.PAGE_ALL wxHtmlPrintout = wx.html.HtmlPrintout -wxHtmlPrintoutPtr = wx.html.HtmlPrintoutPtr wxHtmlPrintout_AddFilter = wx.html.HtmlPrintout_AddFilter wxHtmlPrintout_CleanUpStatics = wx.html.HtmlPrintout_CleanUpStatics wxHtmlEasyPrinting = wx.html.HtmlEasyPrinting -wxHtmlEasyPrintingPtr = wx.html.HtmlEasyPrintingPtr wxHtmlBookRecord = wx.html.HtmlBookRecord -wxHtmlBookRecordPtr = wx.html.HtmlBookRecordPtr wxHtmlSearchStatus = wx.html.HtmlSearchStatus -wxHtmlSearchStatusPtr = wx.html.HtmlSearchStatusPtr wxHtmlHelpData = wx.html.HtmlHelpData -wxHtmlHelpDataPtr = wx.html.HtmlHelpDataPtr wxHF_TOOLBAR = wx.html.HF_TOOLBAR wxHF_CONTENTS = wx.html.HF_CONTENTS wxHF_INDEX = wx.html.HF_INDEX @@ -170,21 +145,14 @@ wxID_HTML_SEARCHBUTTON = wx.html.ID_HTML_SEARCHBUTTON wxID_HTML_SEARCHCHOICE = wx.html.ID_HTML_SEARCHCHOICE wxID_HTML_COUNTINFO = wx.html.ID_HTML_COUNTINFO wxHtmlHelpWindow = wx.html.HtmlHelpWindow -wxHtmlHelpWindowPtr = wx.html.HtmlHelpWindowPtr wxPreHtmlHelpWindow = wx.html.PreHtmlHelpWindow wxHtmlWindowEvent = wx.html.HtmlWindowEvent -wxHtmlWindowEventPtr = wx.html.HtmlWindowEventPtr wxHtmlHelpFrame = wx.html.HtmlHelpFrame -wxHtmlHelpFramePtr = wx.html.HtmlHelpFramePtr wxPreHtmlHelpFrame = wx.html.PreHtmlHelpFrame wxHtmlHelpDialog = wx.html.HtmlHelpDialog -wxHtmlHelpDialogPtr = wx.html.HtmlHelpDialogPtr wxPreHtmlHelpDialog = wx.html.PreHtmlHelpDialog wxHelpControllerBase = wx.html.HelpControllerBase -wxHelpControllerBasePtr = wx.html.HelpControllerBasePtr wxHtmlHelpController = wx.html.HtmlHelpController -wxHtmlHelpControllerPtr = wx.html.HtmlHelpControllerPtr wxHtmlModalHelp = wx.html.HtmlModalHelp -wxHtmlModalHelpPtr = wx.html.HtmlModalHelpPtr diff --git a/wxPython/wxPython/media.py b/wxPython/wxPython/media.py index cf1acda942..08e94d7392 100644 --- a/wxPython/wxPython/media.py +++ b/wxPython/wxPython/media.py @@ -33,10 +33,8 @@ wxMEDIABACKEND_GSTREAMER = wx.media.MEDIABACKEND_GSTREAMER wxMEDIABACKEND_REALPLAYER = wx.media.MEDIABACKEND_REALPLAYER wxMEDIABACKEND_WMP10 = wx.media.MEDIABACKEND_WMP10 wxMediaEvent = wx.media.MediaEvent -wxMediaEventPtr = wx.media.MediaEventPtr wxMediaCtrlNameStr = wx.media.MediaCtrlNameStr wxMediaCtrl = wx.media.MediaCtrl -wxMediaCtrlPtr = wx.media.MediaCtrlPtr wxPreMediaCtrl = wx.media.PreMediaCtrl wxEVT_MEDIA_FINISHED = wx.media.wxEVT_MEDIA_FINISHED wxEVT_MEDIA_STOP = wx.media.wxEVT_MEDIA_STOP diff --git a/wxPython/wxPython/stc.py b/wxPython/wxPython/stc.py index 00d63b892d..52d74cdbd6 100644 --- a/wxPython/wxPython/stc.py +++ b/wxPython/wxPython/stc.py @@ -1293,10 +1293,8 @@ wxSTC_CMD_WORDLEFTENDEXTEND = wx.stc.STC_CMD_WORDLEFTENDEXTEND wxSTC_CMD_WORDRIGHTEND = wx.stc.STC_CMD_WORDRIGHTEND wxSTC_CMD_WORDRIGHTENDEXTEND = wx.stc.STC_CMD_WORDRIGHTENDEXTEND wxStyledTextCtrl = wx.stc.StyledTextCtrl -wxStyledTextCtrlPtr = wx.stc.StyledTextCtrlPtr wxPreStyledTextCtrl = wx.stc.PreStyledTextCtrl wxStyledTextEvent = wx.stc.StyledTextEvent -wxStyledTextEventPtr = wx.stc.StyledTextEventPtr wxEVT_STC_CHANGE = wx.stc.wxEVT_STC_CHANGE wxEVT_STC_STYLENEEDED = wx.stc.wxEVT_STC_STYLENEEDED wxEVT_STC_CHARADDED = wx.stc.wxEVT_STC_CHARADDED diff --git a/wxPython/wxPython/webkit.py b/wxPython/wxPython/webkit.py index 994b41232c..8adeef1edd 100644 --- a/wxPython/wxPython/webkit.py +++ b/wxPython/wxPython/webkit.py @@ -21,7 +21,6 @@ del sys, _wx # Now assign all the reverse-renamed names: wxWebKitNameStr = wx.webkit.WebKitNameStr wxWebKitCtrl = wx.webkit.WebKitCtrl -wxWebKitCtrlPtr = wx.webkit.WebKitCtrlPtr wxPreWebKitCtrl = wx.webkit.PreWebKitCtrl wxWEBKIT_STATE_START = wx.webkit.WEBKIT_STATE_START wxWEBKIT_STATE_NEGOTIATING = wx.webkit.WEBKIT_STATE_NEGOTIATING @@ -31,7 +30,6 @@ wxWEBKIT_STATE_STOP = wx.webkit.WEBKIT_STATE_STOP wxWEBKIT_STATE_FAILED = wx.webkit.WEBKIT_STATE_FAILED wxEVT_WEBKIT_STATE_CHANGED = wx.webkit.wxEVT_WEBKIT_STATE_CHANGED wxWebKitStateChangedEvent = wx.webkit.WebKitStateChangedEvent -wxWebKitStateChangedEventPtr = wx.webkit.WebKitStateChangedEventPtr d = globals() diff --git a/wxPython/wxPython/wizard.py b/wxPython/wxPython/wizard.py index 4e7fdc9406..a331a46e91 100644 --- a/wxPython/wxPython/wizard.py +++ b/wxPython/wxPython/wizard.py @@ -26,18 +26,13 @@ wxEVT_WIZARD_CANCEL = wx.wizard.wxEVT_WIZARD_CANCEL wxEVT_WIZARD_HELP = wx.wizard.wxEVT_WIZARD_HELP wxEVT_WIZARD_FINISHED = wx.wizard.wxEVT_WIZARD_FINISHED wxWizardEvent = wx.wizard.WizardEvent -wxWizardEventPtr = wx.wizard.WizardEventPtr wxWizardPage = wx.wizard.WizardPage -wxWizardPagePtr = wx.wizard.WizardPagePtr wxPyWizardPage = wx.wizard.PyWizardPage -wxPyWizardPagePtr = wx.wizard.PyWizardPagePtr wxPrePyWizardPage = wx.wizard.PrePyWizardPage wxWizardPageSimple = wx.wizard.WizardPageSimple -wxWizardPageSimplePtr = wx.wizard.WizardPageSimplePtr wxPreWizardPageSimple = wx.wizard.PreWizardPageSimple wxWizardPageSimple_Chain = wx.wizard.WizardPageSimple_Chain wxWizard = wx.wizard.Wizard -wxWizardPtr = wx.wizard.WizardPtr wxPreWizard = wx.wizard.PreWizard diff --git a/wxPython/wxPython/xrc.py b/wxPython/wxPython/xrc.py index adb6be526c..bb32df8c94 100644 --- a/wxPython/wxPython/xrc.py +++ b/wxPython/wxPython/xrc.py @@ -34,14 +34,12 @@ wxXRC_USE_LOCALE = wx.xrc.XRC_USE_LOCALE wxXRC_NO_SUBCLASSING = wx.xrc.XRC_NO_SUBCLASSING wxXRC_NO_RELOADING = wx.xrc.XRC_NO_RELOADING wxXmlResource = wx.xrc.XmlResource -wxXmlResourcePtr = wx.xrc.XmlResourcePtr wxEmptyXmlResource = wx.xrc.EmptyXmlResource wxXmlResource_AddSubclassFactory = wx.xrc.XmlResource_AddSubclassFactory wxXmlResource_GetXRCID = wx.xrc.XmlResource_GetXRCID wxXmlResource_Get = wx.xrc.XmlResource_Get wxXmlResource_Set = wx.xrc.XmlResource_Set wxXmlSubclassFactory = wx.xrc.XmlSubclassFactory -wxXmlSubclassFactoryPtr = wx.xrc.XmlSubclassFactoryPtr wxXmlSubclassFactory = wx.xrc.XmlSubclassFactory wxXML_ELEMENT_NODE = wx.xrc.XML_ELEMENT_NODE wxXML_ATTRIBUTE_NODE = wx.xrc.XML_ATTRIBUTE_NODE @@ -57,16 +55,12 @@ wxXML_DOCUMENT_FRAG_NODE = wx.xrc.XML_DOCUMENT_FRAG_NODE wxXML_NOTATION_NODE = wx.xrc.XML_NOTATION_NODE wxXML_HTML_DOCUMENT_NODE = wx.xrc.XML_HTML_DOCUMENT_NODE wxXmlProperty = wx.xrc.XmlProperty -wxXmlPropertyPtr = wx.xrc.XmlPropertyPtr wxXmlNode = wx.xrc.XmlNode -wxXmlNodePtr = wx.xrc.XmlNodePtr wxXmlNodeEasy = wx.xrc.XmlNodeEasy wxXmlDocument = wx.xrc.XmlDocument -wxXmlDocumentPtr = wx.xrc.XmlDocumentPtr wxXmlDocumentFromStream = wx.xrc.XmlDocumentFromStream wxEmptyXmlDocument = wx.xrc.EmptyXmlDocument wxXmlResourceHandler = wx.xrc.XmlResourceHandler -wxXmlResourceHandlerPtr = wx.xrc.XmlResourceHandlerPtr wxXmlResourceHandler = wx.xrc.XmlResourceHandler XRCID = wx.xrc.XRCID XRCCTRL = wx.xrc.XRCCTRL