Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New wxTreeCtrl wrappers (untested)

Browse Source 
some changes in helpers
etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-10-20 06:45:33 +00:00
parent e0a09ce419
commit d5c9047acf
26 changed files with 2713 additions and 2224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/wxPython/src/msw/cmndlgs.cpp
View File

@@ -3583,7 +3583,6 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel);
SWIG_RegisterMapping("_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel);
SWIG_RegisterMapping("_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel);
@@ -3717,7 +3716,6 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
SWIG_RegisterMapping("_unsigned_char","_byte",0);
SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);

2
utils/wxPython/src/msw/controls.cpp
View File

@@ -5514,7 +5514,6 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
@@ -5640,7 +5639,6 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
SWIG_RegisterMapping("_unsigned_char","_byte",0);
SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);

2669
utils/wxPython/src/msw/controls2.cpp
View File

File diff suppressed because it is too large Load Diff

437
utils/wxPython/src/msw/controls2.py
View File

@@ -318,67 +318,45 @@ class wxListCtrl(wxListCtrlPtr):
class wxTreeItemPtr :
class wxTreeItemIdPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
if self.thisown == 1 :
controls2c.delete_wxTreeItem(self.this)
def __setattr__(self,name,value):
if name == "m_mask" :
controls2c.wxTreeItem_m_mask_set(self.this,value)
return
if name == "m_itemId" :
controls2c.wxTreeItem_m_itemId_set(self.this,value)
return
if name == "m_state" :
controls2c.wxTreeItem_m_state_set(self.this,value)
return
if name == "m_stateMask" :
controls2c.wxTreeItem_m_stateMask_set(self.this,value)
return
if name == "m_text" :
controls2c.wxTreeItem_m_text_set(self.this,value)
return
if name == "m_image" :
controls2c.wxTreeItem_m_image_set(self.this,value)
return
if name == "m_selectedImage" :
controls2c.wxTreeItem_m_selectedImage_set(self.this,value)
return
if name == "m_children" :
controls2c.wxTreeItem_m_children_set(self.this,value)
return
if name == "m_data" :
controls2c.wxTreeItem_m_data_set(self.this,value)
return
self.__dict__[name] = value
def __getattr__(self,name):
if name == "m_mask" :
return controls2c.wxTreeItem_m_mask_get(self.this)
if name == "m_itemId" :
return controls2c.wxTreeItem_m_itemId_get(self.this)
if name == "m_state" :
return controls2c.wxTreeItem_m_state_get(self.this)
if name == "m_stateMask" :
return controls2c.wxTreeItem_m_stateMask_get(self.this)
if name == "m_text" :
return controls2c.wxTreeItem_m_text_get(self.this)
if name == "m_image" :
return controls2c.wxTreeItem_m_image_get(self.this)
if name == "m_selectedImage" :
return controls2c.wxTreeItem_m_selectedImage_get(self.this)
if name == "m_children" :
return controls2c.wxTreeItem_m_children_get(self.this)
if name == "m_data" :
return controls2c.wxTreeItem_m_data_get(self.this)
raise AttributeError,name
controls2c.delete_wxTreeItemId(self.this)
def IsOk(self):
val = controls2c.wxTreeItemId_IsOk(self.this)
return val
def GetId(self):
val = controls2c.wxTreeItemId_GetId(self.this)
return val
def __repr__(self):
return "<C wxTreeItem instance>"
class wxTreeItem(wxTreeItemPtr):
return "<C wxTreeItemId instance>"
class wxTreeItemId(wxTreeItemIdPtr):
def __init__(self) :
self.this = controls2c.new_wxTreeItem()
self.this = controls2c.new_wxTreeItemId()
self.thisown = 1
class wxTreeItemDataPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
if self.thisown == 1 :
controls2c.delete_wxTreeItemData(self.this)
def GetItemId(self):
val = controls2c.wxTreeItemData_GetItemId(self.this)
val = wxTreeItemIdPtr(val)
return val
def __repr__(self):
return "<C wxTreeItemData instance>"
class wxTreeItemData(wxTreeItemDataPtr):
def __init__(self) :
self.this = controls2c.new_wxTreeItemData()
self.thisown = 1
@@ -388,30 +366,27 @@ class wxTreeEventPtr(wxCommandEventPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __setattr__(self,name,value):
if name == "m_code" :
controls2c.wxTreeEvent_m_code_set(self.this,value)
return
if name == "m_item" :
controls2c.wxTreeEvent_m_item_set(self.this,value.this)
return
if name == "m_oldItem" :
controls2c.wxTreeEvent_m_oldItem_set(self.this,value)
return
if name == "m_pointDrag" :
controls2c.wxTreeEvent_m_pointDrag_set(self.this,value.this)
return
self.__dict__[name] = value
def __getattr__(self,name):
if name == "m_code" :
return controls2c.wxTreeEvent_m_code_get(self.this)
if name == "m_item" :
return wxTreeItemPtr(controls2c.wxTreeEvent_m_item_get(self.this))
if name == "m_oldItem" :
return controls2c.wxTreeEvent_m_oldItem_get(self.this)
if name == "m_pointDrag" :
return wxPointPtr(controls2c.wxTreeEvent_m_pointDrag_get(self.this))
raise AttributeError,name
def GetItem(self):
val = controls2c.wxTreeEvent_GetItem(self.this)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def GetOldItem(self):
val = controls2c.wxTreeEvent_GetOldItem(self.this)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def GetPoint(self):
val = controls2c.wxTreeEvent_GetPoint(self.this)
val = wxPointPtr(val)
val.thisown = 1
return val
def GetCode(self):
val = controls2c.wxTreeEvent_GetCode(self.this)
return val
def Veto(self):
val = controls2c.wxTreeEvent_Veto(self.this)
return val
def __repr__(self):
return "<C wxTreeEvent instance>"
class wxTreeEvent(wxTreeEventPtr):
@@ -425,116 +400,189 @@ class wxTreeCtrlPtr(wxControlPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def GetCount(self):
val = controls2c.wxTreeCtrl_GetCount(self.this)
return val
def GetIndent(self):
val = controls2c.wxTreeCtrl_GetIndent(self.this)
return val
def SetIndent(self,arg0):
val = controls2c.wxTreeCtrl_SetIndent(self.this,arg0)
return val
def GetImageList(self):
val = controls2c.wxTreeCtrl_GetImageList(self.this)
return val
def GetStateImageList(self):
val = controls2c.wxTreeCtrl_GetStateImageList(self.this)
return val
def SetImageList(self,arg0):
val = controls2c.wxTreeCtrl_SetImageList(self.this,arg0)
return val
def SetStateImageList(self,arg0):
val = controls2c.wxTreeCtrl_SetStateImageList(self.this,arg0)
return val
def GetItemText(self,arg0):
val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0.this)
return val
def GetItemImage(self,arg0):
val = controls2c.wxTreeCtrl_GetItemImage(self.this,arg0.this)
return val
def GetItemSelectedImage(self,arg0):
val = controls2c.wxTreeCtrl_GetItemSelectedImage(self.this,arg0.this)
return val
def GetItemData(self,arg0):
val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0.this)
val = wxTreeItemDataPtr(val)
return val
def SetItemText(self,arg0,arg1):
val = controls2c.wxTreeCtrl_SetItemText(self.this,arg0.this,arg1)
return val
def SetItemImage(self,arg0,arg1):
val = controls2c.wxTreeCtrl_SetItemImage(self.this,arg0.this,arg1)
return val
def SetItemSelectedImage(self,arg0,arg1):
val = controls2c.wxTreeCtrl_SetItemSelectedImage(self.this,arg0.this,arg1)
return val
def SetItemData(self,arg0,arg1):
val = controls2c.wxTreeCtrl_SetItemData(self.this,arg0.this,arg1.this)
return val
def IsVisible(self,arg0):
val = controls2c.wxTreeCtrl_IsVisible(self.this,arg0.this)
return val
def ItemHasChildren(self,arg0):
val = controls2c.wxTreeCtrl_ItemHasChildren(self.this,arg0.this)
return val
def IsExpanded(self,arg0):
val = controls2c.wxTreeCtrl_IsExpanded(self.this,arg0.this)
return val
def IsSelected(self,arg0):
val = controls2c.wxTreeCtrl_IsSelected(self.this,arg0.this)
return val
def GetRootItem(self):
val = controls2c.wxTreeCtrl_GetRootItem(self.this)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def GetSelection(self):
val = controls2c.wxTreeCtrl_GetSelection(self.this)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def GetParent(self,arg0):
val = controls2c.wxTreeCtrl_GetParent(self.this,arg0.this)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def GetFirstChild(self,arg0,arg1):
val = controls2c.wxTreeCtrl_GetFirstChild(self.this,arg0.this,arg1)
return val
def GetNextChild(self,arg0,arg1):
val = controls2c.wxTreeCtrl_GetNextChild(self.this,arg0.this,arg1)
return val
def GetNextSibling(self,arg0):
val = controls2c.wxTreeCtrl_GetNextSibling(self.this,arg0.this)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def GetPrevSibling(self,arg0):
val = controls2c.wxTreeCtrl_GetPrevSibling(self.this,arg0.this)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def GetFirstVisibleItem(self):
val = controls2c.wxTreeCtrl_GetFirstVisibleItem(self.this)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def GetNextVisible(self,arg0):
val = controls2c.wxTreeCtrl_GetNextVisible(self.this,arg0.this)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def GetPrevVisible(self,arg0):
val = controls2c.wxTreeCtrl_GetPrevVisible(self.this,arg0.this)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def AddRoot(self,arg0,*args):
argl = map(None,args)
try: argl[2] = argl[2].this
except: pass
args = tuple(argl)
val = apply(controls2c.wxTreeCtrl_AddRoot,(self.this,arg0,)+args)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def PrependItem(self,arg0,arg1,*args):
argl = map(None,args)
try: argl[2] = argl[2].this
except: pass
args = tuple(argl)
val = apply(controls2c.wxTreeCtrl_PrependItem,(self.this,arg0.this,arg1,)+args)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def InsertItem(self,arg0,arg1,arg2,*args):
argl = map(None,args)
try: argl[2] = argl[2].this
except: pass
args = tuple(argl)
val = apply(controls2c.wxTreeCtrl_InsertItem,(self.this,arg0.this,arg1.this,arg2,)+args)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def AppendItem(self,arg0,arg1,*args):
argl = map(None,args)
try: argl[2] = argl[2].this
except: pass
args = tuple(argl)
val = apply(controls2c.wxTreeCtrl_AppendItem,(self.this,arg0.this,arg1,)+args)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def Delete(self,arg0):
val = controls2c.wxTreeCtrl_Delete(self.this,arg0.this)
return val
def DeleteAllItems(self):
val = controls2c.wxTreeCtrl_DeleteAllItems(self.this)
return val
def DeleteItem(self,arg0):
val = controls2c.wxTreeCtrl_DeleteItem(self.this,arg0)
def Expand(self,arg0):
val = controls2c.wxTreeCtrl_Expand(self.this,arg0.this)
return val
def EditLabel(self,arg0):
val = controls2c.wxTreeCtrl_EditLabel(self.this,arg0)
val = wxTextCtrlPtr(val)
def Collapse(self,arg0):
val = controls2c.wxTreeCtrl_Collapse(self.this,arg0.this)
return val
def CollapseAndReset(self,arg0):
val = controls2c.wxTreeCtrl_CollapseAndReset(self.this,arg0.this)
return val
def Toggle(self,arg0):
val = controls2c.wxTreeCtrl_Toggle(self.this,arg0.this)
return val
def Unselect(self):
val = controls2c.wxTreeCtrl_Unselect(self.this)
return val
def SelectItem(self,arg0):
val = controls2c.wxTreeCtrl_SelectItem(self.this,arg0.this)
return val
def EnsureVisible(self,arg0):
val = controls2c.wxTreeCtrl_EnsureVisible(self.this,arg0)
val = controls2c.wxTreeCtrl_EnsureVisible(self.this,arg0.this)
return val
def ExpandItem(self,arg0,arg1):
val = controls2c.wxTreeCtrl_ExpandItem(self.this,arg0,arg1)
def ScrollTo(self,arg0):
val = controls2c.wxTreeCtrl_ScrollTo(self.this,arg0.this)
return val
def GetChild(self,arg0):
val = controls2c.wxTreeCtrl_GetChild(self.this,arg0)
return val
def GetCount(self):
val = controls2c.wxTreeCtrl_GetCount(self.this)
def EditLabel(self,arg0):
val = controls2c.wxTreeCtrl_EditLabel(self.this,arg0.this)
val = wxTextCtrlPtr(val)
return val
def GetEditControl(self):
val = controls2c.wxTreeCtrl_GetEditControl(self.this)
val = wxTextCtrlPtr(val)
return val
def GetFirstVisibleItem(self):
val = controls2c.wxTreeCtrl_GetFirstVisibleItem(self.this)
return val
def GetImageList(self,*args):
val = apply(controls2c.wxTreeCtrl_GetImageList,(self.this,)+args)
return val
def GetIndent(self):
val = controls2c.wxTreeCtrl_GetIndent(self.this)
return val
def GetItemData(self,arg0):
val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0)
return val
def GetItem(self):
val = controls2c.wxTreeCtrl_GetItem(self.this)
val = wxTreeItemPtr(val)
val.thisown = 1
return val
def GetItemRect(self,arg0,*args):
val = apply(controls2c.wxTreeCtrl_GetItemRect,(self.this,arg0,)+args)
val = wxRectPtr(val)
val.thisown = 1
return val
def GetItemState(self,arg0,arg1):
val = controls2c.wxTreeCtrl_GetItemState(self.this,arg0,arg1)
return val
def GetItemText(self,arg0):
val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0)
return val
def GetNextItem(self,arg0,arg1):
val = controls2c.wxTreeCtrl_GetNextItem(self.this,arg0,arg1)
return val
def GetNextVisibleItem(self,arg0):
val = controls2c.wxTreeCtrl_GetNextVisibleItem(self.this,arg0)
return val
def GetParent(self,arg0):
val = controls2c.wxTreeCtrl_GetParent(self.this,arg0)
return val
def GetRootItem(self):
val = controls2c.wxTreeCtrl_GetRootItem(self.this)
return val
def GetSelection(self):
val = controls2c.wxTreeCtrl_GetSelection(self.this)
return val
def HitTest(self,arg0):
val = controls2c.wxTreeCtrl_HitTest(self.this,arg0.this)
return val
def InsertItem(self,arg0,arg1,*args):
val = apply(controls2c.wxTreeCtrl_InsertItem,(self.this,arg0,arg1.this,)+args)
return val
def InsertItemString(self,arg0,arg1,*args):
val = apply(controls2c.wxTreeCtrl_InsertItemString,(self.this,arg0,arg1,)+args)
return val
def ItemHasChildren(self,arg0):
val = controls2c.wxTreeCtrl_ItemHasChildren(self.this,arg0)
return val
def ScrollTo(self,arg0):
val = controls2c.wxTreeCtrl_ScrollTo(self.this,arg0)
return val
def SelectItem(self,arg0):
val = controls2c.wxTreeCtrl_SelectItem(self.this,arg0)
return val
def SetIndent(self,arg0):
val = controls2c.wxTreeCtrl_SetIndent(self.this,arg0)
return val
def SetImageList(self,arg0,*args):
val = apply(controls2c.wxTreeCtrl_SetImageList,(self.this,arg0,)+args)
return val
def SetItem(self,arg0):
val = controls2c.wxTreeCtrl_SetItem(self.this,arg0.this)
return val
def SetItemImage(self,arg0,arg1,arg2):
val = controls2c.wxTreeCtrl_SetItemImage(self.this,arg0,arg1,arg2)
return val
def SetItemState(self,arg0,arg1,arg2):
val = controls2c.wxTreeCtrl_SetItemState(self.this,arg0,arg1,arg2)
return val
def SetItemText(self,arg0,arg1):
val = controls2c.wxTreeCtrl_SetItemText(self.this,arg0,arg1)
return val
def SetItemData(self,arg0,arg1):
val = controls2c.wxTreeCtrl_SetItemData(self.this,arg0,arg1)
def EndEditLabel(self,arg0,*args):
val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self.this,arg0.this,)+args)
return val
def SortChildren(self,arg0):
val = controls2c.wxTreeCtrl_SortChildren(self.this,arg0)
val = controls2c.wxTreeCtrl_SortChildren(self.this,arg0.this)
return val
def __repr__(self):
return "<C wxTreeCtrl instance>"
@@ -561,46 +609,3 @@ class wxTreeCtrl(wxTreeCtrlPtr):
#-------------- VARIABLE WRAPPERS ------------------
wxTREE_MASK_HANDLE = controls2c.wxTREE_MASK_HANDLE
wxTREE_MASK_STATE = controls2c.wxTREE_MASK_STATE
wxTREE_MASK_TEXT = controls2c.wxTREE_MASK_TEXT
wxTREE_MASK_IMAGE = controls2c.wxTREE_MASK_IMAGE
wxTREE_MASK_SELECTED_IMAGE = controls2c.wxTREE_MASK_SELECTED_IMAGE
wxTREE_MASK_CHILDREN = controls2c.wxTREE_MASK_CHILDREN
wxTREE_MASK_DATA = controls2c.wxTREE_MASK_DATA
wxTREE_STATE_BOLD = controls2c.wxTREE_STATE_BOLD
wxTREE_STATE_DROPHILITED = controls2c.wxTREE_STATE_DROPHILITED
wxTREE_STATE_EXPANDED = controls2c.wxTREE_STATE_EXPANDED
wxTREE_STATE_EXPANDEDONCE = controls2c.wxTREE_STATE_EXPANDEDONCE
wxTREE_STATE_FOCUSED = controls2c.wxTREE_STATE_FOCUSED
wxTREE_STATE_SELECTED = controls2c.wxTREE_STATE_SELECTED
wxTREE_STATE_CUT = controls2c.wxTREE_STATE_CUT
wxTREE_HITTEST_ABOVE = controls2c.wxTREE_HITTEST_ABOVE
wxTREE_HITTEST_BELOW = controls2c.wxTREE_HITTEST_BELOW
wxTREE_HITTEST_NOWHERE = controls2c.wxTREE_HITTEST_NOWHERE
wxTREE_HITTEST_ONITEMBUTTON = controls2c.wxTREE_HITTEST_ONITEMBUTTON
wxTREE_HITTEST_ONITEMICON = controls2c.wxTREE_HITTEST_ONITEMICON
wxTREE_HITTEST_ONITEMINDENT = controls2c.wxTREE_HITTEST_ONITEMINDENT
wxTREE_HITTEST_ONITEMLABEL = controls2c.wxTREE_HITTEST_ONITEMLABEL
wxTREE_HITTEST_ONITEMRIGHT = controls2c.wxTREE_HITTEST_ONITEMRIGHT
wxTREE_HITTEST_ONITEMSTATEICON = controls2c.wxTREE_HITTEST_ONITEMSTATEICON
wxTREE_HITTEST_TOLEFT = controls2c.wxTREE_HITTEST_TOLEFT
wxTREE_HITTEST_TORIGHT = controls2c.wxTREE_HITTEST_TORIGHT
wxTREE_HITTEST_ONITEM = controls2c.wxTREE_HITTEST_ONITEM
wxTREE_NEXT_CARET = controls2c.wxTREE_NEXT_CARET
wxTREE_NEXT_CHILD = controls2c.wxTREE_NEXT_CHILD
wxTREE_NEXT_DROPHILITE = controls2c.wxTREE_NEXT_DROPHILITE
wxTREE_NEXT_FIRSTVISIBLE = controls2c.wxTREE_NEXT_FIRSTVISIBLE
wxTREE_NEXT_NEXT = controls2c.wxTREE_NEXT_NEXT
wxTREE_NEXT_NEXTVISIBLE = controls2c.wxTREE_NEXT_NEXTVISIBLE
wxTREE_NEXT_PARENT = controls2c.wxTREE_NEXT_PARENT
wxTREE_NEXT_PREVIOUS = controls2c.wxTREE_NEXT_PREVIOUS
wxTREE_NEXT_PREVIOUSVISIBLE = controls2c.wxTREE_NEXT_PREVIOUSVISIBLE
wxTREE_NEXT_ROOT = controls2c.wxTREE_NEXT_ROOT
wxTREE_EXPAND_EXPAND = controls2c.wxTREE_EXPAND_EXPAND
wxTREE_EXPAND_COLLAPSE = controls2c.wxTREE_EXPAND_COLLAPSE
wxTREE_EXPAND_COLLAPSE_RESET = controls2c.wxTREE_EXPAND_COLLAPSE_RESET
wxTREE_EXPAND_TOGGLE = controls2c.wxTREE_EXPAND_TOGGLE
wxTREE_INSERT_LAST = controls2c.wxTREE_INSERT_LAST
wxTREE_INSERT_FIRST = controls2c.wxTREE_INSERT_FIRST
wxTREE_INSERT_SORT = controls2c.wxTREE_INSERT_SORT

22
utils/wxPython/src/msw/events.cpp
View File

@@ -379,27 +379,6 @@ static void *SwigwxCloseEventTowxEvent(void *ptr) {
return (void *) dest;
}
#define wxCloseEvent_GetSessionEnding(_swigobj) (_swigobj->GetSessionEnding())
static PyObject *_wrap_wxCloseEvent_GetSessionEnding(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxCloseEvent * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxCloseEvent_GetSessionEnding",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_GetSessionEnding. Expected _wxCloseEvent_p.");
return NULL;
}
}
_result = (bool )wxCloseEvent_GetSessionEnding(_arg0);
_resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxCloseEvent_GetLoggingOff(_swigobj) (_swigobj->GetLoggingOff())
static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -2629,7 +2608,6 @@ static PyMethodDef eventscMethods[] = {
{ "wxCloseEvent_GetVeto", _wrap_wxCloseEvent_GetVeto, 1 },
{ "wxCloseEvent_Veto", _wrap_wxCloseEvent_Veto, 1 },
{ "wxCloseEvent_GetLoggingOff", _wrap_wxCloseEvent_GetLoggingOff, 1 },
{ "wxCloseEvent_GetSessionEnding", _wrap_wxCloseEvent_GetSessionEnding, 1 },
{ "wxSizeEvent_GetSize", _wrap_wxSizeEvent_GetSize, 1 },
{ "wxEvent_Skip", _wrap_wxEvent_Skip, 1 },
{ "wxEvent_SetTimestamp", _wrap_wxEvent_SetTimestamp, 1 },

3
utils/wxPython/src/msw/events.py
View File

@@ -67,9 +67,6 @@ class wxCloseEventPtr(wxEventPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def GetSessionEnding(self):
val = eventsc.wxCloseEvent_GetSessionEnding(self.this)
return val
def GetLoggingOff(self):
val = eventsc.wxCloseEvent_GetLoggingOff(self.this)
return val

6
utils/wxPython/src/msw/frames.cpp
View File

@@ -831,7 +831,6 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarBase",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
@@ -854,7 +853,6 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
@@ -888,7 +886,6 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_wxToolBarSimple","_class_wxToolBarSimple",0);
SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
@@ -921,7 +918,6 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
SWIG_RegisterMapping("_class_wxToolBarSimple","_wxToolBarSimple",0);
SWIG_RegisterMapping("_WXTYPE","_short",0);
SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
SWIG_RegisterMapping("_WXTYPE","_unsigned_short",0);
@@ -952,7 +948,6 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
SWIG_RegisterMapping("_unsigned_char","_byte",0);
SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
@@ -997,7 +992,6 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarBase",0);
SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxControl","_wxControl",0);

54
utils/wxPython/src/msw/gdi.cpp
View File

@@ -4781,53 +4781,6 @@ static PyObject *_wrap_new_wxPaintDC(PyObject *self, PyObject *args) {
return _resultobj;
}
static void *SwigwxPostScriptDCTowxDC(void *ptr) {
wxPostScriptDC *src;
wxDC *dest;
src = (wxPostScriptDC *) ptr;
dest = (wxDC *) src;
return (void *) dest;
}
#define new_wxPostScriptDC(_swigarg0,_swigarg1,_swigarg2) (new wxPostScriptDC(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_new_wxPostScriptDC(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxPostScriptDC * _result;
wxString * _arg0;
bool _arg1 = (1);
wxWindow * _arg2 = NULL;
PyObject * _obj0 = 0;
int tempbool1;
char * _argc2 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"O|is:new_wxPostScriptDC",&_obj0,&tempbool1,&_argc2))
return NULL;
{
if (!PyString_Check(_obj0)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg0 = new wxString(PyString_AsString(_obj0));
}
_arg1 = (bool ) tempbool1;
if (_argc2) {
if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxPostScriptDC. Expected _wxWindow_p.");
return NULL;
}
}
_result = (wxPostScriptDC *)new_wxPostScriptDC(*_arg0,_arg1,_arg2);
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPostScriptDC_p");
_resultobj = Py_BuildValue("s",_ptemp);
{
if (_obj0)
delete _arg0;
}
return _resultobj;
}
static void *SwigwxPrinterDCTowxDC(void *ptr) {
wxPrinterDC *src;
wxDC *dest;
@@ -4958,7 +4911,6 @@ static PyMethodDef gdicMethods[] = {
{ "wxMetaFileDC_Close", _wrap_wxMetaFileDC_Close, 1 },
{ "new_wxMetaFileDC", _wrap_new_wxMetaFileDC, 1 },
{ "new_wxPrinterDC", _wrap_new_wxPrinterDC, 1 },
{ "new_wxPostScriptDC", _wrap_new_wxPostScriptDC, 1 },
{ "new_wxPaintDC", _wrap_new_wxPaintDC, 1 },
{ "new_wxClientDC", _wrap_new_wxClientDC, 1 },
{ "wxScreenDC_EndDrawingOnTop", _wrap_wxScreenDC_EndDrawingOnTop, 1 },
@@ -5189,8 +5141,6 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
SWIG_RegisterMapping("_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC);
SWIG_RegisterMapping("_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC);
SWIG_RegisterMapping("_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
SWIG_RegisterMapping("_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
SWIG_RegisterMapping("_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
SWIG_RegisterMapping("_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
SWIG_RegisterMapping("_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);
@@ -5202,7 +5152,6 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
@@ -5229,8 +5178,6 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_class_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC);
SWIG_RegisterMapping("_class_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC);
@@ -5264,7 +5211,6 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
SWIG_RegisterMapping("_unsigned_char","_byte",0);
SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
SWIG_RegisterMapping("_unsigned_int","_uint",0);

18
utils/wxPython/src/msw/gdi.py
View File

@@ -629,24 +629,6 @@ class wxPaintDC(wxPaintDCPtr):
class wxPostScriptDCPtr(wxDCPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxPostScriptDC instance>"
class wxPostScriptDC(wxPostScriptDCPtr):
def __init__(self,arg0,*args) :
argl = map(None,args)
try: argl[1] = argl[1].this
except: pass
args = tuple(argl)
self.this = apply(gdic.new_wxPostScriptDC,(arg0,)+args)
self.thisown = 1
class wxPrinterDCPtr(wxDCPtr):
def __init__(self,this):
self.this = this

6
utils/wxPython/src/msw/mdi.cpp
View File

@@ -763,7 +763,6 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarBase",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
@@ -786,7 +785,6 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
@@ -820,7 +818,6 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_wxToolBarSimple","_class_wxToolBarSimple",0);
SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
@@ -855,7 +852,6 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
SWIG_RegisterMapping("_class_wxToolBarSimple","_wxToolBarSimple",0);
SWIG_RegisterMapping("_class_wxMDIChildFrame","_wxMDIChildFrame",0);
SWIG_RegisterMapping("_WXTYPE","_short",0);
SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
@@ -890,7 +886,6 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
SWIG_RegisterMapping("_unsigned_char","_byte",0);
SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
@@ -938,7 +933,6 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarBase",0);
SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxControl","_wxControl",0);

8
utils/wxPython/src/msw/misc.cpp
View File

@@ -890,8 +890,8 @@ static PyObject *_wrap_wxResourceCreateBitmap(PyObject *self, PyObject *args) {
self = self;
if(!PyArg_ParseTuple(args,"s:wxResourceCreateBitmap",&_arg0))
return NULL;
_result = (wxBitmap *)wxResourceCreateBitmap(_arg0);
SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
_result = new wxBitmap (wxResourceCreateBitmap(_arg0));
SWIG_MakePtr(_ptemp, (void *) _result,"_wxBitmap_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
@@ -905,8 +905,8 @@ static PyObject *_wrap_wxResourceCreateIcon(PyObject *self, PyObject *args) {
self = self;
if(!PyArg_ParseTuple(args,"s:wxResourceCreateIcon",&_arg0))
return NULL;
_result = (wxIcon *)wxResourceCreateIcon(_arg0);
SWIG_MakePtr(_ptemp, (char *) _result,"_wxIcon_p");
_result = new wxIcon (wxResourceCreateIcon(_arg0));
SWIG_MakePtr(_ptemp, (void *) _result,"_wxIcon_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}

2
utils/wxPython/src/msw/misc.py
View File

@@ -487,11 +487,13 @@ wxResourceClear = miscc.wxResourceClear
def wxResourceCreateBitmap(arg0):
val = miscc.wxResourceCreateBitmap(arg0)
val = wxBitmapPtr(val)
val.thisown = 1
return val
def wxResourceCreateIcon(arg0):
val = miscc.wxResourceCreateIcon(arg0)
val = wxIconPtr(val)
val.thisown = 1
return val
def wxResourceCreateMenuBar(arg0):

1285
utils/wxPython/src/msw/stattool.cpp
View File

File diff suppressed because it is too large Load Diff

86
utils/wxPython/src/msw/stattool.py
View File

@@ -170,98 +170,85 @@ class wxToolBarTool(wxToolBarToolPtr):
class wxToolBarBasePtr(wxControlPtr):
class wxToolBarPtr(wxControlPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def AddSeparator(self):
val = stattoolc.wxToolBarBase_AddSeparator(self.this)
val = stattoolc.wxToolBar_AddSeparator(self.this)
return val
def AddTool(self,arg0,arg1,*args):
argl = map(None,args)
try: argl[0] = argl[0].this
except: pass
args = tuple(argl)
val = apply(stattoolc.wxToolBarBase_AddTool,(self.this,arg0,arg1.this,)+args)
val = apply(stattoolc.wxToolBar_AddTool,(self.this,arg0,arg1.this,)+args)
val = wxToolBarToolPtr(val)
return val
def EnableTool(self,arg0,arg1):
val = stattoolc.wxToolBarBase_EnableTool(self.this,arg0,arg1)
val = stattoolc.wxToolBar_EnableTool(self.this,arg0,arg1)
return val
def FindToolForPosition(self,arg0,arg1):
val = stattoolc.wxToolBarBase_FindToolForPosition(self.this,arg0,arg1)
val = stattoolc.wxToolBar_FindToolForPosition(self.this,arg0,arg1)
val = wxToolBarToolPtr(val)
return val
def GetToolSize(self):
val = stattoolc.wxToolBarBase_GetToolSize(self.this)
val = stattoolc.wxToolBar_GetToolSize(self.this)
val = wxSizePtr(val)
val.thisown = 1
return val
def GetToolBitmapSize(self):
val = stattoolc.wxToolBarBase_GetToolBitmapSize(self.this)
val = stattoolc.wxToolBar_GetToolBitmapSize(self.this)
val = wxSizePtr(val)
val.thisown = 1
return val
def GetMaxSize(self):
val = stattoolc.wxToolBarBase_GetMaxSize(self.this)
val = stattoolc.wxToolBar_GetMaxSize(self.this)
val = wxSizePtr(val)
val.thisown = 1
return val
def GetToolEnabled(self,arg0):
val = stattoolc.wxToolBarBase_GetToolEnabled(self.this,arg0)
val = stattoolc.wxToolBar_GetToolEnabled(self.this,arg0)
return val
def GetToolLongHelp(self,arg0):
val = stattoolc.wxToolBarBase_GetToolLongHelp(self.this,arg0)
val = stattoolc.wxToolBar_GetToolLongHelp(self.this,arg0)
return val
def GetToolPacking(self):
val = stattoolc.wxToolBarBase_GetToolPacking(self.this)
val = stattoolc.wxToolBar_GetToolPacking(self.this)
return val
def GetToolSeparation(self):
val = stattoolc.wxToolBarBase_GetToolSeparation(self.this)
val = stattoolc.wxToolBar_GetToolSeparation(self.this)
return val
def GetToolShortHelp(self,arg0):
val = stattoolc.wxToolBarBase_GetToolShortHelp(self.this,arg0)
val = stattoolc.wxToolBar_GetToolShortHelp(self.this,arg0)
return val
def GetToolState(self,arg0):
val = stattoolc.wxToolBarBase_GetToolState(self.this,arg0)
val = stattoolc.wxToolBar_GetToolState(self.this,arg0)
return val
def Realize(self):
val = stattoolc.wxToolBarBase_Realize(self.this)
val = stattoolc.wxToolBar_Realize(self.this)
return val
def SetToolBitmapSize(self,arg0):
val = stattoolc.wxToolBarBase_SetToolBitmapSize(self.this,arg0.this)
return val
def SetMargins(self,arg0):
val = stattoolc.wxToolBarBase_SetMargins(self.this,arg0.this)
val = stattoolc.wxToolBar_SetToolBitmapSize(self.this,arg0.this)
return val
def SetToolLongHelp(self,arg0,arg1):
val = stattoolc.wxToolBarBase_SetToolLongHelp(self.this,arg0,arg1)
return val
def SetToolPacking(self,arg0):
val = stattoolc.wxToolBarBase_SetToolPacking(self.this,arg0)
val = stattoolc.wxToolBar_SetToolLongHelp(self.this,arg0,arg1)
return val
def SetToolShortHelp(self,arg0,arg1):
val = stattoolc.wxToolBarBase_SetToolShortHelp(self.this,arg0,arg1)
val = stattoolc.wxToolBar_SetToolShortHelp(self.this,arg0,arg1)
return val
def SetMargins(self,arg0):
val = stattoolc.wxToolBar_SetMargins(self.this,arg0.this)
return val
def SetToolPacking(self,arg0):
val = stattoolc.wxToolBar_SetToolPacking(self.this,arg0)
return val
def SetToolSeparation(self,arg0):
val = stattoolc.wxToolBarBase_SetToolSeparation(self.this,arg0)
val = stattoolc.wxToolBar_SetToolSeparation(self.this,arg0)
return val
def ToggleTool(self,arg0,arg1):
val = stattoolc.wxToolBarBase_ToggleTool(self.this,arg0,arg1)
val = stattoolc.wxToolBar_ToggleTool(self.this,arg0,arg1)
return val
def __repr__(self):
return "<C wxToolBarBase instance>"
class wxToolBarBase(wxToolBarBasePtr):
def __init__(self,this):
self.this = this
class wxToolBarPtr(wxToolBarBasePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxToolBar instance>"
class wxToolBar(wxToolBarPtr):
@@ -279,27 +266,6 @@ class wxToolBar(wxToolBarPtr):
class wxToolBarSimplePtr(wxToolBarBasePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxToolBarSimple instance>"
class wxToolBarSimple(wxToolBarSimplePtr):
def __init__(self,arg0,arg1,*args) :
argl = map(None,args)
try: argl[0] = argl[0].this
except: pass
try: argl[1] = argl[1].this
except: pass
args = tuple(argl)
self.this = apply(stattoolc.new_wxToolBarSimple,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
#-------------- FUNCTION WRAPPERS ------------------

2
utils/wxPython/src/msw/windows.cpp
View File

@@ -4441,7 +4441,6 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel);
SWIG_RegisterMapping("_wxPanel","_wxDialog",SwigwxDialogTowxPanel);
SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
@@ -4502,7 +4501,6 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
SWIG_RegisterMapping("_unsigned_char","_byte",0);
SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);

2
utils/wxPython/src/msw/windows2.cpp
View File

@@ -3200,7 +3200,6 @@ SWIGEXPORT(void,initwindows2c)() {
SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0);
SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxPanel","_class_wxGrid",SwigwxGridTowxPanel);
SWIG_RegisterMapping("_wxPanel","_wxGrid",SwigwxGridTowxPanel);
SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
@@ -3305,7 +3304,6 @@ SWIGEXPORT(void,initwindows2c)() {
SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
SWIG_RegisterMapping("_unsigned_char","_byte",0);
SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);

21
utils/wxPython/src/msw/wxp.cpp
View File

@@ -33,8 +33,10 @@
* and things like that.
*
* $Log$
* Revision 1.2 1998/10/02 06:42:02 RD
* Version 0.4 of wxPython for MSW.
* Revision 1.3 1998/10/20 06:45:09 RD
* New wxTreeCtrl wrappers (untested)
* some changes in helpers
* etc.
*
************************************************************************/
@@ -1303,6 +1305,7 @@ SWIGEXPORT(void,initwxpc)() {
PyDict_SetItemString(d,"wxBU_NOAUTODRAW", PyInt_FromLong((long) wxBU_NOAUTODRAW));
PyDict_SetItemString(d,"wxTR_HAS_BUTTONS", PyInt_FromLong((long) wxTR_HAS_BUTTONS));
PyDict_SetItemString(d,"wxTR_EDIT_LABELS", PyInt_FromLong((long) wxTR_EDIT_LABELS));
PyDict_SetItemString(d,"wxTR_LINES_AT_ROOT", PyInt_FromLong((long) wxTR_LINES_AT_ROOT));
PyDict_SetItemString(d,"wxLC_ICON", PyInt_FromLong((long) wxLC_ICON));
PyDict_SetItemString(d,"wxLC_SMALL_ICON", PyInt_FromLong((long) wxLC_SMALL_ICON));
PyDict_SetItemString(d,"wxLC_LIST", PyInt_FromLong((long) wxLC_LIST));
@@ -1719,7 +1722,7 @@ SWIGEXPORT(void,initwxpc)() {
PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING));
PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
PyDict_SetItemString(d,"__version__", PyString_FromString("0.3.1"));
PyDict_SetItemString(d,"__version__", PyString_FromString("0.4.1"));
PyDict_SetItemString(d,"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);
@@ -1761,7 +1764,6 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_class_wxToolBarBase","_wxToolBarBase",0);
SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
@@ -1791,7 +1793,6 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
SWIG_RegisterMapping("_class_wxStatusBar","_wxStatusBar",0);
SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
@@ -1821,6 +1822,7 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0);
SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
SWIG_RegisterMapping("_wxTreeItemData","_class_wxTreeItemData",0);
SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0);
SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
SWIG_RegisterMapping("_wxPrintDialog","_class_wxPrintDialog",0);
@@ -1835,7 +1837,6 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0);
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_wxToolBarSimple","_class_wxToolBarSimple",0);
SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
SWIG_RegisterMapping("_wxListItem","_class_wxListItem",0);
SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
@@ -1876,7 +1877,6 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0);
SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0);
SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
SWIG_RegisterMapping("_class_wxToolBarSimple","_wxToolBarSimple",0);
SWIG_RegisterMapping("_class_wxMDIChildFrame","_wxMDIChildFrame",0);
SWIG_RegisterMapping("_WXTYPE","_short",0);
SWIG_RegisterMapping("_WXTYPE","_signed_short",0);
@@ -1891,7 +1891,6 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_class_wxStaticText","_wxStaticText",0);
SWIG_RegisterMapping("_class_wxFont","_wxFont",0);
SWIG_RegisterMapping("_class_wxCloseEvent","_wxCloseEvent",0);
SWIG_RegisterMapping("_wxTreeItem","_class_wxTreeItem",0);
SWIG_RegisterMapping("_class_wxMenuEvent","_wxMenuEvent",0);
SWIG_RegisterMapping("_wxClientDC","_class_wxClientDC",0);
SWIG_RegisterMapping("_wxMouseEvent","_class_wxMouseEvent",0);
@@ -1912,8 +1911,8 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_class_wxToolBarTool","_wxToolBarTool",0);
SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0);
SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0);
SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0);
SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
SWIG_RegisterMapping("_wxTreeItemId","_class_wxTreeItemId",0);
SWIG_RegisterMapping("_unsigned_char","_byte",0);
SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
@@ -1961,7 +1960,7 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
SWIG_RegisterMapping("_class_wxComboBox","_wxComboBox",0);
SWIG_RegisterMapping("_class_wxRadioButton","_wxRadioButton",0);
SWIG_RegisterMapping("_wxToolBarBase","_class_wxToolBarBase",0);
SWIG_RegisterMapping("_class_wxTreeItemId","_wxTreeItemId",0);
SWIG_RegisterMapping("_wxTreeCtrl","_class_wxTreeCtrl",0);
SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
SWIG_RegisterMapping("_wxIconizeEvent","_class_wxIconizeEvent",0);
@@ -1981,11 +1980,11 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);
SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0);
SWIG_RegisterMapping("_class_wxTreeItem","_wxTreeItem",0);
SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0);
SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0);
SWIG_RegisterMapping("_class_wxListCtrl","_wxListCtrl",0);
SWIG_RegisterMapping("_class_wxTreeItemData","_wxTreeItemData",0);
SWIG_RegisterMapping("_class_wxGridCell","_wxGridCell",0);
SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);

55
utils/wxPython/src/msw/wxp.py
View File

@@ -199,6 +199,7 @@ wxBU_AUTODRAW = wxpc.wxBU_AUTODRAW
wxBU_NOAUTODRAW = wxpc.wxBU_NOAUTODRAW
wxTR_HAS_BUTTONS = wxpc.wxTR_HAS_BUTTONS
wxTR_EDIT_LABELS = wxpc.wxTR_EDIT_LABELS
wxTR_LINES_AT_ROOT = wxpc.wxTR_LINES_AT_ROOT
wxLC_ICON = wxpc.wxLC_ICON
wxLC_SMALL_ICON = wxpc.wxLC_SMALL_ICON
wxLC_LIST = wxpc.wxLC_LIST
@@ -964,7 +965,7 @@ def EVT_COMMAND_ENTER(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_ENTER, func)
# wxNotebook events
def EVT_NOTEBOOK_PAGE_CHANGED(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, func)
@@ -972,6 +973,50 @@ def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, func)
#wxTreeCtrl events
def EVT_TREE_BEGIN_DRAG(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_BEGIN_DRAG, func)
def EVT_TREE_BEGIN_RDRAG(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_BEGIN_RDRAG, func)
def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func)
def EVT_TREE_END_LABEL_EDIT(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_END_LABEL_EDIT, func)
def EVT_TREE_GET_INFO(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_GET_INFO, func)
def EVT_TREE_SET_INFO(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_SET_INFO, func)
def EVT_TREE_ITEM_EXPANDED(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_EXPANDED, func)
def EVT_TREE_ITEM_EXPANDING(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_EXPANDING, func)
def EVT_TREE_ITEM_COLLAPSED(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_COLLAPSED, func)
def EVT_TREE_ITEM_COLLAPSING(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_ITEM_COLLAPSING, func)
def EVT_TREE_SEL_CHANGED(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_SEL_CHANGED, func)
def EVT_TREE_SEL_CHANGING(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_SEL_CHANGING, func)
def EVT_TREE_KEY_DOWN(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_KEY_DOWN, func)
def EVT_TREE_DELETE_ITEM(win, id, func):
win.Connect(id, -1. wxEVT_COMMAND_TREE_DELETE_ITEM, func)
#----------------------------------------------------------------------
@@ -1068,7 +1113,13 @@ class wxApp(wxPyApp):
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.2 1998/10/02 06:42:04 RD
# Revision 1.3 1998/10/20 06:45:11 RD
# New wxTreeCtrl wrappers (untested)
# some changes in helpers
# etc.
#
# Revision 1.3 1998/10/02 06:40:33 RD
#
# Version 0.4 of wxPython for MSW.
#
# Revision 1.2 1998/08/18 19:48:12 RD