Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-22 06:05:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Number() to GetCount() and other changes needed for wxPython to

Browse Source 
compile with current CVS.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-07-14 03:37:47 +00:00
parent 257ed895d5
commit 0adbc1660e
17 changed files with 429 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/src/__version__.py
+1 -1
View File
@@ -1 +1 @@
ver = '2.3.1'
ver = '2.3.2b1'
wxPython/src/_defs.i
-20
View File
@@ -305,26 +305,6 @@ enum {
wxTR_MULTIPLE,
wxTR_SINGLE,
wxTR_HAS_VARIABLE_ROW_HEIGHT,
wxLC_ICON,
wxLC_SMALL_ICON,
wxLC_LIST,
wxLC_REPORT,
wxLC_ALIGN_TOP,
wxLC_ALIGN_LEFT,
wxLC_AUTOARRANGE,
wxLC_USER_TEXT,
wxLC_EDIT_LABELS,
wxLC_NO_HEADER,
wxLC_NO_SORT_HEADER,
wxLC_SINGLE_SEL,
wxLC_SORT_ASCENDING,
wxLC_SORT_DESCENDING,
wxLC_MASK_TYPE,
wxLC_MASK_ALIGN,
wxLC_MASK_SORT,
wxLC_HRULES,
wxLC_VRULES,
//wxLC_VIRTUAL,
wxSP_VERTICAL,
wxSP_HORIZONTAL,
wxSP_ARROW_KEYS,
wxPython/src/controls.i
+25 -7
View File
@@ -158,15 +158,23 @@ public:
void Append(const wxString& item);
void Clear();
void Delete(int n);
int FindString(const wxString& string);
int GetColumns();
int GetSelection();
wxString GetString(const int n);
wxString GetStringSelection();
int Number();
int GetCount();
void SetColumns(const int n = 1);
void SetSelection(const int n);
void SetStringSelection(const wxString& string);
void SetString(int n, const wxString& s);
%pragma(python) addtoclass = "
Number = GetCount
Select = SetSelection
"
};
//----------------------------------------------------------------------
@@ -198,7 +206,6 @@ public:
wxString GetString(int n);
wxString GetStringSelection();
wxString GetValue();
int Number();
void Paste();
void Replace(long from, long to, const wxString& text);
void Remove(long from, long to);
@@ -208,6 +215,7 @@ public:
void SetSelection(int n);
%name(SetMark)void SetSelection(long from, long to);
void SetValue(const wxString& text);
void SetEditable(bool editable);
};
//----------------------------------------------------------------------
@@ -314,7 +322,9 @@ public:
wxString GetString(int n);
wxString GetStringSelection();
int Number();
int GetCount();
%pragma(python) addtoclass = "Number = GetCount"
bool IsSelected(const int n);
bool Selected(const int n);
void Set(int LCOUNT, wxString* choices);
// TODO: void SetClientData(const int n, char* data);
@@ -518,12 +528,20 @@ public:
//*** wxString GetLabel();
//*** void SetLabel(const wxString& label);
%name(GetItemLabel)wxString GetLabel(int n);
int GetSelection();
wxString GetString(int n);
void SetString(int n, const wxString& label);
%pragma(python) addtoclass = "
GetItemLabel = GetString
SetItemLabel = SetString
"
int GetSelection();
wxString GetStringSelection();
int Number();
%name(SetItemLabel)void SetLabel(int n, const wxString& label);
int GetCount();
%pragma(python) addtoclass = "Number = GetCount"
int GetColumnCount();
int GetRowCount();
void SetSelection(int n);
void SetStringSelection(const wxString& string);
void Show(bool show);
wxPython/src/controls2.i
+24
View File
@@ -112,6 +112,30 @@ enum {
wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK,
};
enum {
/* Style flags */
wxLC_ICON,
wxLC_SMALL_ICON,
wxLC_LIST,
wxLC_REPORT,
wxLC_ALIGN_TOP,
wxLC_ALIGN_LEFT,
wxLC_AUTOARRANGE,
wxLC_USER_TEXT,
wxLC_EDIT_LABELS,
wxLC_NO_HEADER,
wxLC_NO_SORT_HEADER,
wxLC_SINGLE_SEL,
wxLC_SORT_ASCENDING,
wxLC_SORT_DESCENDING,
wxLC_MASK_TYPE,
wxLC_MASK_ALIGN,
wxLC_MASK_SORT,
wxLC_HRULES,
wxLC_VRULES,
wxLC_VIRTUAL,
};
class wxListItemAttr
wxPython/src/helpers.cpp
+1 -4
View File
@@ -1016,10 +1016,7 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
PyObject* o1 = PyTuple_GetItem(o, 0);
PyObject* o2 = PyTuple_GetItem(o, 1);
PyObject* o3 = PyTuple_GetItem(o, 2);
temp[x].m_flags = PyInt_AsLong(o1);
temp[x].m_keyCode = PyInt_AsLong(o2);
temp[x].m_command = PyInt_AsLong(o3);
temp[x].Set(PyInt_AsLong(o1), PyInt_AsLong(o2), PyInt_AsLong(o3));
}
else {
PyErr_SetString(PyExc_TypeError, "Expected a list of 3-tuples or wxAcceleratorEntry objects.");
wxPython/src/misc2.i
+1 -1
View File
@@ -835,7 +835,7 @@ public:
//----------------------------------------------------------------------
%{
#if !wxUSE_WAVE && !defined(__WXMSW__)
#if !wxUSE_WAVE
// A C++ stub class for wxWave for platforms that don't have it.
class wxWave : public wxObject
{
wxPython/src/msw/controls.cpp
+284 -144
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/controls.py
+38 -16
View File
@@ -142,6 +142,9 @@ class wxChoicePtr(wxControlPtr):
def Clear(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_Clear,(self,) + _args, _kwargs)
return val
def Delete(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_Delete,(self,) + _args, _kwargs)
return val
def FindString(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_FindString,(self,) + _args, _kwargs)
return val
@@ -157,8 +160,8 @@ class wxChoicePtr(wxControlPtr):
def GetStringSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_GetStringSelection,(self,) + _args, _kwargs)
return val
def Number(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_Number,(self,) + _args, _kwargs)
def GetCount(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_GetCount,(self,) + _args, _kwargs)
return val
def SetColumns(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_SetColumns,(self,) + _args, _kwargs)
@@ -169,8 +172,15 @@ class wxChoicePtr(wxControlPtr):
def SetStringSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_SetStringSelection,(self,) + _args, _kwargs)
return val
def SetString(self, *_args, **_kwargs):
val = apply(controlsc.wxChoice_SetString,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxChoice instance at %s>" % (self.this,)
Number = GetCount
Select = SetSelection
class wxChoice(wxChoicePtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(controlsc.new_wxChoice,_args,_kwargs)
@@ -220,9 +230,6 @@ class wxComboBoxPtr(wxChoicePtr):
def GetValue(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_GetValue,(self,) + _args, _kwargs)
return val
def Number(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_Number,(self,) + _args, _kwargs)
return val
def Paste(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_Paste,(self,) + _args, _kwargs)
return val
@@ -247,6 +254,9 @@ class wxComboBoxPtr(wxChoicePtr):
def SetValue(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_SetValue,(self,) + _args, _kwargs)
return val
def SetEditable(self, *_args, **_kwargs):
val = apply(controlsc.wxComboBox_SetEditable,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxComboBox instance at %s>" % (self.this,)
class wxComboBox(wxComboBoxPtr):
@@ -380,8 +390,11 @@ class wxListBoxPtr(wxControlPtr):
def GetStringSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_GetStringSelection,(self,) + _args, _kwargs)
return val
def Number(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_Number,(self,) + _args, _kwargs)
def GetCount(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_GetCount,(self,) + _args, _kwargs)
return val
def IsSelected(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_IsSelected,(self,) + _args, _kwargs)
return val
def Selected(self, *_args, **_kwargs):
val = apply(controlsc.wxListBox_Selected,(self,) + _args, _kwargs)
@@ -406,6 +419,7 @@ class wxListBoxPtr(wxControlPtr):
return val
def __repr__(self):
return "<C wxListBox instance at %s>" % (self.this,)
Number = GetCount
class wxListBox(wxListBoxPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(controlsc.new_wxListBox,_args,_kwargs)
@@ -725,23 +739,26 @@ class wxRadioBoxPtr(wxControlPtr):
def FindString(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_FindString,(self,) + _args, _kwargs)
return val
def GetItemLabel(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_GetItemLabel,(self,) + _args, _kwargs)
def GetString(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs)
return val
def SetString(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_SetString,(self,) + _args, _kwargs)
return val
def GetSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs)
return val
def GetString(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs)
return val
def GetStringSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_GetStringSelection,(self,) + _args, _kwargs)
return val
def Number(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_Number,(self,) + _args, _kwargs)
def GetCount(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_GetCount,(self,) + _args, _kwargs)
return val
def SetItemLabel(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_SetItemLabel,(self,) + _args, _kwargs)
def GetColumnCount(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_GetColumnCount,(self,) + _args, _kwargs)
return val
def GetRowCount(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_GetRowCount,(self,) + _args, _kwargs)
return val
def SetSelection(self, *_args, **_kwargs):
val = apply(controlsc.wxRadioBox_SetSelection,(self,) + _args, _kwargs)
@@ -757,6 +774,11 @@ class wxRadioBoxPtr(wxControlPtr):
return val
def __repr__(self):
return "<C wxRadioBox instance at %s>" % (self.this,)
GetItemLabel = GetString
SetItemLabel = SetString
Number = GetCount
class wxRadioBox(wxRadioBoxPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(controlsc.new_wxRadioBox,_args,_kwargs)
wxPython/src/msw/controls2.cpp
+21 -1
View File
@@ -2925,7 +2925,7 @@ static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args, PyObject *
wxWindowID _arg1;
wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg3 = (wxSize *) &wxDefaultSize;
long _arg4 = (long ) wxLC_ICON;
long _arg4 = (long ) (wxLC_ICON);
wxValidator * _arg5 = (wxValidator *) &wxDefaultValidator;
char * _arg6 = (char *) "listCtrl";
PyObject * _argo0 = 0;
@@ -8603,6 +8603,26 @@ SWIGEXPORT(void) initcontrols2c() {
PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_ACTIVATED", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_ACTIVATED));
PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK));
PyDict_SetItemString(d,"wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK", PyInt_FromLong((long) wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK));
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));
PyDict_SetItemString(d,"wxLC_REPORT", PyInt_FromLong((long) wxLC_REPORT));
PyDict_SetItemString(d,"wxLC_ALIGN_TOP", PyInt_FromLong((long) wxLC_ALIGN_TOP));
PyDict_SetItemString(d,"wxLC_ALIGN_LEFT", PyInt_FromLong((long) wxLC_ALIGN_LEFT));
PyDict_SetItemString(d,"wxLC_AUTOARRANGE", PyInt_FromLong((long) wxLC_AUTOARRANGE));
PyDict_SetItemString(d,"wxLC_USER_TEXT", PyInt_FromLong((long) wxLC_USER_TEXT));
PyDict_SetItemString(d,"wxLC_EDIT_LABELS", PyInt_FromLong((long) wxLC_EDIT_LABELS));
PyDict_SetItemString(d,"wxLC_NO_HEADER", PyInt_FromLong((long) wxLC_NO_HEADER));
PyDict_SetItemString(d,"wxLC_NO_SORT_HEADER", PyInt_FromLong((long) wxLC_NO_SORT_HEADER));
PyDict_SetItemString(d,"wxLC_SINGLE_SEL", PyInt_FromLong((long) wxLC_SINGLE_SEL));
PyDict_SetItemString(d,"wxLC_SORT_ASCENDING", PyInt_FromLong((long) wxLC_SORT_ASCENDING));
PyDict_SetItemString(d,"wxLC_SORT_DESCENDING", PyInt_FromLong((long) wxLC_SORT_DESCENDING));
PyDict_SetItemString(d,"wxLC_MASK_TYPE", PyInt_FromLong((long) wxLC_MASK_TYPE));
PyDict_SetItemString(d,"wxLC_MASK_ALIGN", PyInt_FromLong((long) wxLC_MASK_ALIGN));
PyDict_SetItemString(d,"wxLC_MASK_SORT", PyInt_FromLong((long) wxLC_MASK_SORT));
PyDict_SetItemString(d,"wxLC_HRULES", PyInt_FromLong((long) wxLC_HRULES));
PyDict_SetItemString(d,"wxLC_VRULES", PyInt_FromLong((long) wxLC_VRULES));
PyDict_SetItemString(d,"wxLC_VIRTUAL", PyInt_FromLong((long) wxLC_VIRTUAL));
PyDict_SetItemString(d,"wxTreeItemIcon_Normal", PyInt_FromLong((long) wxTreeItemIcon_Normal));
PyDict_SetItemString(d,"wxTreeItemIcon_Selected", PyInt_FromLong((long) wxTreeItemIcon_Selected));
PyDict_SetItemString(d,"wxTreeItemIcon_Expanded", PyInt_FromLong((long) wxTreeItemIcon_Expanded));
wxPython/src/msw/controls2.py
+20
View File
@@ -891,6 +891,26 @@ wxEVT_COMMAND_LIST_COL_CLICK = controls2c.wxEVT_COMMAND_LIST_COL_CLICK
wxEVT_COMMAND_LIST_ITEM_ACTIVATED = controls2c.wxEVT_COMMAND_LIST_ITEM_ACTIVATED
wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = controls2c.wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK
wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = controls2c.wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
wxLC_ICON = controls2c.wxLC_ICON
wxLC_SMALL_ICON = controls2c.wxLC_SMALL_ICON
wxLC_LIST = controls2c.wxLC_LIST
wxLC_REPORT = controls2c.wxLC_REPORT
wxLC_ALIGN_TOP = controls2c.wxLC_ALIGN_TOP
wxLC_ALIGN_LEFT = controls2c.wxLC_ALIGN_LEFT
wxLC_AUTOARRANGE = controls2c.wxLC_AUTOARRANGE
wxLC_USER_TEXT = controls2c.wxLC_USER_TEXT
wxLC_EDIT_LABELS = controls2c.wxLC_EDIT_LABELS
wxLC_NO_HEADER = controls2c.wxLC_NO_HEADER
wxLC_NO_SORT_HEADER = controls2c.wxLC_NO_SORT_HEADER
wxLC_SINGLE_SEL = controls2c.wxLC_SINGLE_SEL
wxLC_SORT_ASCENDING = controls2c.wxLC_SORT_ASCENDING
wxLC_SORT_DESCENDING = controls2c.wxLC_SORT_DESCENDING
wxLC_MASK_TYPE = controls2c.wxLC_MASK_TYPE
wxLC_MASK_ALIGN = controls2c.wxLC_MASK_ALIGN
wxLC_MASK_SORT = controls2c.wxLC_MASK_SORT
wxLC_HRULES = controls2c.wxLC_HRULES
wxLC_VRULES = controls2c.wxLC_VRULES
wxLC_VIRTUAL = controls2c.wxLC_VIRTUAL
wxTreeItemIcon_Normal = controls2c.wxTreeItemIcon_Normal
wxTreeItemIcon_Selected = controls2c.wxTreeItemIcon_Selected
wxTreeItemIcon_Expanded = controls2c.wxTreeItemIcon_Expanded
wxPython/src/msw/misc2.cpp
+1 -1
View File
@@ -252,7 +252,7 @@ public:
};
#endif
#if !wxUSE_WAVE && !defined(__WXMSW__)
#if !wxUSE_WAVE
// A C++ stub class for wxWave for platforms that don't have it.
class wxWave : public wxObject
{
wxPython/src/msw/windows.cpp
-49
View File
@@ -6533,54 +6533,6 @@ static PyObject *_wrap_wxScrolledWindow_GetViewStart(PyObject *self, PyObject *a
return _resultobj;
}
#define wxScrolledWindow_ViewStart(_swigobj,_swigarg0,_swigarg1) (_swigobj->ViewStart(_swigarg0,_swigarg1))
static PyObject *_wrap_wxScrolledWindow_ViewStart(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxScrolledWindow * _arg0;
int * _arg1;
int temp;
int * _arg2;
int temp0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
{
_arg1 = &temp;
}
{
_arg2 = &temp0;
}
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrolledWindow_ViewStart",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrolledWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrolledWindow_ViewStart. Expected _wxScrolledWindow_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxScrolledWindow_ViewStart(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg1));
_resultobj = t_output_helper(_resultobj, o);
}
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg2));
_resultobj = t_output_helper(_resultobj, o);
}
return _resultobj;
}
#define wxScrolledWindow_CalcScrolledPosition(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->CalcScrolledPosition(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
static PyObject *_wrap_wxScrolledWindow_CalcScrolledPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -10433,7 +10385,6 @@ static PyMethodDef windowscMethods[] = {
{ "wxScrolledWindow_SetScale", (PyCFunction) _wrap_wxScrolledWindow_SetScale, METH_VARARGS | METH_KEYWORDS },
{ "wxScrolledWindow_CalcUnscrolledPosition", (PyCFunction) _wrap_wxScrolledWindow_CalcUnscrolledPosition, METH_VARARGS | METH_KEYWORDS },
{ "wxScrolledWindow_CalcScrolledPosition", (PyCFunction) _wrap_wxScrolledWindow_CalcScrolledPosition, METH_VARARGS | METH_KEYWORDS },
{ "wxScrolledWindow_ViewStart", (PyCFunction) _wrap_wxScrolledWindow_ViewStart, METH_VARARGS | METH_KEYWORDS },
{ "wxScrolledWindow_GetViewStart", (PyCFunction) _wrap_wxScrolledWindow_GetViewStart, METH_VARARGS | METH_KEYWORDS },
{ "wxScrolledWindow_SetTargetWindow", (PyCFunction) _wrap_wxScrolledWindow_SetTargetWindow, METH_VARARGS | METH_KEYWORDS },
{ "wxScrolledWindow_SetScrollPageSize", (PyCFunction) _wrap_wxScrolledWindow_SetScrollPageSize, METH_VARARGS | METH_KEYWORDS },
wxPython/src/msw/windows.py
+1 -3
View File
@@ -647,9 +647,6 @@ class wxScrolledWindowPtr(wxPanelPtr):
def GetViewStart(self, *_args, **_kwargs):
val = apply(windowsc.wxScrolledWindow_GetViewStart,(self,) + _args, _kwargs)
return val
def ViewStart(self, *_args, **_kwargs):
val = apply(windowsc.wxScrolledWindow_ViewStart,(self,) + _args, _kwargs)
return val
def CalcScrolledPosition(self, *_args, **_kwargs):
val = apply(windowsc.wxScrolledWindow_CalcScrolledPosition,(self,) + _args, _kwargs)
return val
@@ -670,6 +667,7 @@ class wxScrolledWindowPtr(wxPanelPtr):
return val
def __repr__(self):
return "<C wxScrolledWindow instance at %s>" % (self.this,)
ViewStart = GetViewStart
class wxScrolledWindow(wxScrolledWindowPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(windowsc.new_wxScrolledWindow,_args,_kwargs)
wxPython/src/msw/wx.cpp
+2 -19
View File
@@ -1945,6 +1945,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxED_STATIC_LINE", PyInt_FromLong((long) wxED_STATIC_LINE));
PyDict_SetItemString(d,"wxEXT_DIALOG_STYLE", PyInt_FromLong((long) wxEXT_DIALOG_STYLE));
PyDict_SetItemString(d,"wxCLIP_CHILDREN", PyInt_FromLong((long) wxCLIP_CHILDREN));
PyDict_SetItemString(d,"wxCLIP_SIBLINGS", PyInt_FromLong((long) wxCLIP_SIBLINGS));
PyDict_SetItemString(d,"wxRETAINED", PyInt_FromLong((long) wxRETAINED));
PyDict_SetItemString(d,"wxBACKINGSTORE", PyInt_FromLong((long) wxBACKINGSTORE));
PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS));
@@ -2019,25 +2020,6 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxTR_MULTIPLE", PyInt_FromLong((long) wxTR_MULTIPLE));
PyDict_SetItemString(d,"wxTR_SINGLE", PyInt_FromLong((long) wxTR_SINGLE));
PyDict_SetItemString(d,"wxTR_HAS_VARIABLE_ROW_HEIGHT", PyInt_FromLong((long) wxTR_HAS_VARIABLE_ROW_HEIGHT));
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));
PyDict_SetItemString(d,"wxLC_REPORT", PyInt_FromLong((long) wxLC_REPORT));
PyDict_SetItemString(d,"wxLC_ALIGN_TOP", PyInt_FromLong((long) wxLC_ALIGN_TOP));
PyDict_SetItemString(d,"wxLC_ALIGN_LEFT", PyInt_FromLong((long) wxLC_ALIGN_LEFT));
PyDict_SetItemString(d,"wxLC_AUTOARRANGE", PyInt_FromLong((long) wxLC_AUTOARRANGE));
PyDict_SetItemString(d,"wxLC_USER_TEXT", PyInt_FromLong((long) wxLC_USER_TEXT));
PyDict_SetItemString(d,"wxLC_EDIT_LABELS", PyInt_FromLong((long) wxLC_EDIT_LABELS));
PyDict_SetItemString(d,"wxLC_NO_HEADER", PyInt_FromLong((long) wxLC_NO_HEADER));
PyDict_SetItemString(d,"wxLC_NO_SORT_HEADER", PyInt_FromLong((long) wxLC_NO_SORT_HEADER));
PyDict_SetItemString(d,"wxLC_SINGLE_SEL", PyInt_FromLong((long) wxLC_SINGLE_SEL));
PyDict_SetItemString(d,"wxLC_SORT_ASCENDING", PyInt_FromLong((long) wxLC_SORT_ASCENDING));
PyDict_SetItemString(d,"wxLC_SORT_DESCENDING", PyInt_FromLong((long) wxLC_SORT_DESCENDING));
PyDict_SetItemString(d,"wxLC_MASK_TYPE", PyInt_FromLong((long) wxLC_MASK_TYPE));
PyDict_SetItemString(d,"wxLC_MASK_ALIGN", PyInt_FromLong((long) wxLC_MASK_ALIGN));
PyDict_SetItemString(d,"wxLC_MASK_SORT", PyInt_FromLong((long) wxLC_MASK_SORT));
PyDict_SetItemString(d,"wxLC_HRULES", PyInt_FromLong((long) wxLC_HRULES));
PyDict_SetItemString(d,"wxLC_VRULES", PyInt_FromLong((long) wxLC_VRULES));
PyDict_SetItemString(d,"wxSP_VERTICAL", PyInt_FromLong((long) wxSP_VERTICAL));
PyDict_SetItemString(d,"wxSP_HORIZONTAL", PyInt_FromLong((long) wxSP_HORIZONTAL));
PyDict_SetItemString(d,"wxSP_ARROW_KEYS", PyInt_FromLong((long) wxSP_ARROW_KEYS));
@@ -2177,6 +2159,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT));
PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT));
PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM));
PyDict_SetItemString(d,"wxNB_MULTILINE", PyInt_FromLong((long) wxNB_MULTILINE));
PyDict_SetItemString(d,"wxLI_HORIZONTAL", PyInt_FromLong((long) wxLI_HORIZONTAL));
PyDict_SetItemString(d,"wxLI_VERTICAL", PyInt_FromLong((long) wxLI_VERTICAL));
PyDict_SetItemString(d,"wxHW_SCROLLBAR_NEVER", PyInt_FromLong((long) wxHW_SCROLLBAR_NEVER));
wxPython/src/msw/wx.py
+2 -19
View File
@@ -213,6 +213,7 @@ wxED_BUTTONS_RIGHT = wxc.wxED_BUTTONS_RIGHT
wxED_STATIC_LINE = wxc.wxED_STATIC_LINE
wxEXT_DIALOG_STYLE = wxc.wxEXT_DIALOG_STYLE
wxCLIP_CHILDREN = wxc.wxCLIP_CHILDREN
wxCLIP_SIBLINGS = wxc.wxCLIP_SIBLINGS
wxRETAINED = wxc.wxRETAINED
wxBACKINGSTORE = wxc.wxBACKINGSTORE
wxTB_3DBUTTONS = wxc.wxTB_3DBUTTONS
@@ -287,25 +288,6 @@ wxTR_LINES_AT_ROOT = wxc.wxTR_LINES_AT_ROOT
wxTR_MULTIPLE = wxc.wxTR_MULTIPLE
wxTR_SINGLE = wxc.wxTR_SINGLE
wxTR_HAS_VARIABLE_ROW_HEIGHT = wxc.wxTR_HAS_VARIABLE_ROW_HEIGHT
wxLC_ICON = wxc.wxLC_ICON
wxLC_SMALL_ICON = wxc.wxLC_SMALL_ICON
wxLC_LIST = wxc.wxLC_LIST
wxLC_REPORT = wxc.wxLC_REPORT
wxLC_ALIGN_TOP = wxc.wxLC_ALIGN_TOP
wxLC_ALIGN_LEFT = wxc.wxLC_ALIGN_LEFT
wxLC_AUTOARRANGE = wxc.wxLC_AUTOARRANGE
wxLC_USER_TEXT = wxc.wxLC_USER_TEXT
wxLC_EDIT_LABELS = wxc.wxLC_EDIT_LABELS
wxLC_NO_HEADER = wxc.wxLC_NO_HEADER
wxLC_NO_SORT_HEADER = wxc.wxLC_NO_SORT_HEADER
wxLC_SINGLE_SEL = wxc.wxLC_SINGLE_SEL
wxLC_SORT_ASCENDING = wxc.wxLC_SORT_ASCENDING
wxLC_SORT_DESCENDING = wxc.wxLC_SORT_DESCENDING
wxLC_MASK_TYPE = wxc.wxLC_MASK_TYPE
wxLC_MASK_ALIGN = wxc.wxLC_MASK_ALIGN
wxLC_MASK_SORT = wxc.wxLC_MASK_SORT
wxLC_HRULES = wxc.wxLC_HRULES
wxLC_VRULES = wxc.wxLC_VRULES
wxSP_VERTICAL = wxc.wxSP_VERTICAL
wxSP_HORIZONTAL = wxc.wxSP_HORIZONTAL
wxSP_ARROW_KEYS = wxc.wxSP_ARROW_KEYS
@@ -445,6 +427,7 @@ wxNB_FIXEDWIDTH = wxc.wxNB_FIXEDWIDTH
wxNB_LEFT = wxc.wxNB_LEFT
wxNB_RIGHT = wxc.wxNB_RIGHT
wxNB_BOTTOM = wxc.wxNB_BOTTOM
wxNB_MULTILINE = wxc.wxNB_MULTILINE
wxLI_HORIZONTAL = wxc.wxLI_HORIZONTAL
wxLI_VERTICAL = wxc.wxLI_VERTICAL
wxHW_SCROLLBAR_NEVER = wxc.wxHW_SCROLLBAR_NEVER
wxPython/src/windows.i
+6 -1
View File
@@ -520,6 +520,11 @@ public:
//---------------------------------------------------------------------------
// TODO: Add wrappers for the wxScrollHelper class, make wxScrolledWindow
// derive from it and wxPanel.
class wxScrolledWindow : public wxPanel {
public:
wxScrolledWindow(wxWindow* parent,
@@ -546,7 +551,7 @@ public:
void SetScrollPageSize(int orient, int pageSize);
void SetTargetWindow(wxWindow* window);
void GetViewStart(int* OUTPUT, int* OUTPUT);
void ViewStart(int* OUTPUT, int* OUTPUT);
%pragma(python) addtoclass = "ViewStart = GetViewStart"
void CalcScrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
void CalcUnscrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);