Fixes so that wxPython builds on 2.7. Mostly removing references to all functions that require WXWIN_2_4_COMPATIBILITY to be defined.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -259,10 +259,6 @@ 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
|
||||
wxBookCtrlSizer = wx._controls.BookCtrlSizer
|
||||
wxBookCtrlSizerPtr = wx._controls.BookCtrlSizerPtr
|
||||
wxNotebookSizer = wx._controls.NotebookSizer
|
||||
wxNotebookSizerPtr = wx._controls.NotebookSizerPtr
|
||||
wxTOOL_STYLE_BUTTON = wx._controls.TOOL_STYLE_BUTTON
|
||||
wxTOOL_STYLE_SEPARATOR = wx._controls.TOOL_STYLE_SEPARATOR
|
||||
wxTOOL_STYLE_CONTROL = wx._controls.TOOL_STYLE_CONTROL
|
||||
@@ -380,8 +376,6 @@ wxEVT_COMMAND_LIST_COL_BEGIN_DRAG = wx._controls.wxEVT_COMMAND_LIST_COL_BEGIN_DR
|
||||
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
|
||||
wxEVT_COMMAND_LIST_GET_INFO = wx._controls.wxEVT_COMMAND_LIST_GET_INFO
|
||||
wxEVT_COMMAND_LIST_SET_INFO = wx._controls.wxEVT_COMMAND_LIST_SET_INFO
|
||||
wxListCtrl = wx._controls.ListCtrl
|
||||
wxListCtrlPtr = wx._controls.ListCtrlPtr
|
||||
wxListCtrl = wx._controls.ListCtrl
|
||||
|
@@ -735,6 +735,10 @@ wxImageHandlerPtr = wx._core.ImageHandlerPtr
|
||||
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
|
||||
@@ -751,6 +755,8 @@ wxImage_AddHandler = wx._core.Image_AddHandler
|
||||
wxImage_InsertHandler = wx._core.Image_InsertHandler
|
||||
wxImage_RemoveHandler = wx._core.Image_RemoveHandler
|
||||
wxImage_GetImageExtWildcard = wx._core.Image_GetImageExtWildcard
|
||||
wxImage_RGBtoHSV = wx._core.Image_RGBtoHSV
|
||||
wxImage_HSVtoRGB = wx._core.Image_HSVtoRGB
|
||||
wxNullImage = wx._core.NullImage
|
||||
wxIMAGE_OPTION_FILENAME = wx._core.IMAGE_OPTION_FILENAME
|
||||
wxIMAGE_OPTION_BMP_FORMAT = wx._core.IMAGE_OPTION_BMP_FORMAT
|
||||
|
@@ -173,7 +173,6 @@ wxGetPasswordFromUser = wx._misc.GetPasswordFromUser
|
||||
wxGetSingleChoice = wx._misc.GetSingleChoice
|
||||
wxGetSingleChoiceIndex = wx._misc.GetSingleChoiceIndex
|
||||
wxMessageBox = wx._misc.MessageBox
|
||||
wxGetNumberFromUser = wx._misc.GetNumberFromUser
|
||||
wxColourDisplay = wx._misc.ColourDisplay
|
||||
wxDisplayDepth = wx._misc.DisplayDepth
|
||||
wxGetDisplayDepth = wx._misc.GetDisplayDepth
|
||||
|
@@ -123,8 +123,6 @@ wxHtmlEasyPrinting = wx.html.HtmlEasyPrinting
|
||||
wxHtmlEasyPrintingPtr = wx.html.HtmlEasyPrintingPtr
|
||||
wxHtmlBookRecord = wx.html.HtmlBookRecord
|
||||
wxHtmlBookRecordPtr = wx.html.HtmlBookRecordPtr
|
||||
wxHtmlContentsItem = wx.html.HtmlContentsItem
|
||||
wxHtmlContentsItemPtr = wx.html.HtmlContentsItemPtr
|
||||
wxHtmlSearchStatus = wx.html.HtmlSearchStatus
|
||||
wxHtmlSearchStatusPtr = wx.html.HtmlSearchStatusPtr
|
||||
wxHtmlHelpData = wx.html.HtmlHelpData
|
||||
|
Reference in New Issue
Block a user