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:
@@ -3429,96 +3429,6 @@ EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_C
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
class BookCtrlSizer(_core.Sizer):
|
||||
"""Proxy of C++ BookCtrlSizer class"""
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxBookCtrlSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""__init__(self, BookCtrlBase nb) -> BookCtrlSizer"""
|
||||
newobj = _controls_.new_BookCtrlSizer(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
del newobj.thisown
|
||||
self._setOORInfo(self)
|
||||
|
||||
def RecalcSizes(*args, **kwargs):
|
||||
"""
|
||||
RecalcSizes(self)
|
||||
|
||||
Using the sizes calculated by `CalcMin` reposition and resize all the
|
||||
items managed by this sizer. You should not need to call this directly as
|
||||
it is called by `Layout`.
|
||||
"""
|
||||
return _controls_.BookCtrlSizer_RecalcSizes(*args, **kwargs)
|
||||
|
||||
def CalcMin(*args, **kwargs):
|
||||
"""
|
||||
CalcMin(self) -> Size
|
||||
|
||||
This method is where the sizer will do the actual calculation of its
|
||||
children's minimal sizes. You should not need to call this directly as
|
||||
it is called by `Layout`.
|
||||
"""
|
||||
return _controls_.BookCtrlSizer_CalcMin(*args, **kwargs)
|
||||
|
||||
def GetControl(*args, **kwargs):
|
||||
"""GetControl(self) -> BookCtrlBase"""
|
||||
return _controls_.BookCtrlSizer_GetControl(*args, **kwargs)
|
||||
|
||||
|
||||
class BookCtrlSizerPtr(BookCtrlSizer):
|
||||
def __init__(self, this):
|
||||
self.this = this
|
||||
if not hasattr(self,"thisown"): self.thisown = 0
|
||||
self.__class__ = BookCtrlSizer
|
||||
_controls_.BookCtrlSizer_swigregister(BookCtrlSizerPtr)
|
||||
|
||||
class NotebookSizer(_core.Sizer):
|
||||
"""Proxy of C++ NotebookSizer class"""
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxNotebookSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""__init__(self, Notebook nb) -> NotebookSizer"""
|
||||
newobj = _controls_.new_NotebookSizer(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
del newobj.thisown
|
||||
self._setOORInfo(self)
|
||||
|
||||
def RecalcSizes(*args, **kwargs):
|
||||
"""
|
||||
RecalcSizes(self)
|
||||
|
||||
Using the sizes calculated by `CalcMin` reposition and resize all the
|
||||
items managed by this sizer. You should not need to call this directly as
|
||||
it is called by `Layout`.
|
||||
"""
|
||||
return _controls_.NotebookSizer_RecalcSizes(*args, **kwargs)
|
||||
|
||||
def CalcMin(*args, **kwargs):
|
||||
"""
|
||||
CalcMin(self) -> Size
|
||||
|
||||
This method is where the sizer will do the actual calculation of its
|
||||
children's minimal sizes. You should not need to call this directly as
|
||||
it is called by `Layout`.
|
||||
"""
|
||||
return _controls_.NotebookSizer_CalcMin(*args, **kwargs)
|
||||
|
||||
def GetNotebook(*args, **kwargs):
|
||||
"""GetNotebook(self) -> Notebook"""
|
||||
return _controls_.NotebookSizer_GetNotebook(*args, **kwargs)
|
||||
|
||||
|
||||
class NotebookSizerPtr(NotebookSizer):
|
||||
def __init__(self, this):
|
||||
self.this = this
|
||||
if not hasattr(self,"thisown"): self.thisown = 0
|
||||
self.__class__ = NotebookSizer
|
||||
_controls_.NotebookSizer_swigregister(NotebookSizerPtr)
|
||||
|
||||
NotebookSizer.__init__ = wx._deprecated(NotebookSizer.__init__, "NotebookSizer is no longer needed.")
|
||||
BookCtrlSizer.__init__ = wx._deprecated(BookCtrlSizer.__init__, "BookCtrlSizer is no longer needed.")
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
TOOL_STYLE_BUTTON = _controls_.TOOL_STYLE_BUTTON
|
||||
@@ -4459,16 +4369,16 @@ wxEVT_COMMAND_LIST_COL_BEGIN_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
|
||||
wxEVT_COMMAND_LIST_COL_DRAGGING = _controls_.wxEVT_COMMAND_LIST_COL_DRAGGING
|
||||
wxEVT_COMMAND_LIST_COL_END_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_END_DRAG
|
||||
wxEVT_COMMAND_LIST_ITEM_FOCUSED = _controls_.wxEVT_COMMAND_LIST_ITEM_FOCUSED
|
||||
wxEVT_COMMAND_LIST_GET_INFO = _controls_.wxEVT_COMMAND_LIST_GET_INFO
|
||||
wxEVT_COMMAND_LIST_SET_INFO = _controls_.wxEVT_COMMAND_LIST_SET_INFO
|
||||
EVT_LIST_BEGIN_DRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_DRAG , 1)
|
||||
EVT_LIST_BEGIN_RDRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_RDRAG , 1)
|
||||
EVT_LIST_BEGIN_LABEL_EDIT = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT , 1)
|
||||
EVT_LIST_END_LABEL_EDIT = wx.PyEventBinder(wxEVT_COMMAND_LIST_END_LABEL_EDIT , 1)
|
||||
EVT_LIST_DELETE_ITEM = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ITEM , 1)
|
||||
EVT_LIST_DELETE_ALL_ITEMS = wx.PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS , 1)
|
||||
EVT_LIST_GET_INFO = wx.PyEventBinder(wxEVT_COMMAND_LIST_GET_INFO , 1)
|
||||
EVT_LIST_SET_INFO = wx.PyEventBinder(wxEVT_COMMAND_LIST_SET_INFO , 1)
|
||||
|
||||
|
||||
|
||||
|
||||
EVT_LIST_ITEM_SELECTED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_SELECTED , 1)
|
||||
EVT_LIST_ITEM_DESELECTED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_DESELECTED , 1)
|
||||
EVT_LIST_KEY_DOWN = wx.PyEventBinder(wxEVT_COMMAND_LIST_KEY_DOWN , 1)
|
||||
@@ -4484,8 +4394,9 @@ EVT_LIST_COL_DRAGGING = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_DRAGGING
|
||||
EVT_LIST_COL_END_DRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_COL_END_DRAG , 1)
|
||||
EVT_LIST_ITEM_FOCUSED = wx.PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED , 1)
|
||||
|
||||
EVT_LIST_GET_INFO = wx._deprecated(EVT_LIST_GET_INFO)
|
||||
EVT_LIST_SET_INFO = wx._deprecated(EVT_LIST_SET_INFO)
|
||||
|
||||
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
|
Reference in New Issue
Block a user