diff --git a/utils/wxPython/modules/html/html.cpp b/utils/wxPython/modules/html/html.cpp
index b928c927f6..527702a74e 100644
--- a/utils/wxPython/modules/html/html.cpp
+++ b/utils/wxPython/modules/html/html.cpp
@@ -1,5 +1,5 @@
/*
- * FILE : html.cpp
+ * FILE : ./html.cpp
*
* This file was automatically generated by :
* Simplified Wrapper and Interface Generator (SWIG)
@@ -6174,6 +6174,9 @@ SWIGEXPORT(void) inithtmlc() {
#if wxUSE_FS_ZIP
wxFileSystem::AddHandler(new wxZipFSHandler);
#endif
+ #if wxUSE_FS_INET
+// wxFileSystem::AddHandler(new wxInternetFSHandler);
+ #endif
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
diff --git a/utils/wxPython/modules/html/html.i b/utils/wxPython/modules/html/html.i
index 4e8951e682..ac4b21f6e0 100644
--- a/utils/wxPython/modules/html/html.i
+++ b/utils/wxPython/modules/html/html.i
@@ -566,6 +566,9 @@ public:
#if wxUSE_FS_ZIP
wxFileSystem::AddHandler(new wxZipFSHandler);
#endif
+ #if wxUSE_FS_INET
+// wxFileSystem::AddHandler(new wxInternetFSHandler);
+ #endif
%}
//----------------------------------------------------------------------
diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index 8209f1a2a9..ce3a96a54a 100644
--- a/utils/wxPython/src/_defs.i
+++ b/utils/wxPython/src/_defs.i
@@ -543,8 +543,8 @@ typedef enum {
wxNAND, // (NOT src) OR (NOT dst)
wxOR, // src OR dst
wxSET, // 1
- wxSRC_OR, // source _bitmap_ OR destination
- wxSRC_AND // source _bitmap_ AND destination
+// wxSRC_OR, // source _bitmap_ OR destination
+// wxSRC_AND // source _bitmap_ AND destination
} form_ops_t;
enum _Virtual_keycodes {
@@ -830,6 +830,7 @@ enum wxEventType {
wxEVT_SCROLL_PAGEUP,
wxEVT_SCROLL_PAGEDOWN,
wxEVT_SCROLL_THUMBTRACK,
+ wxEVT_SCROLL_THUMBRELEASE,
/*
* Scrolled Window
@@ -841,6 +842,7 @@ enum wxEventType {
wxEVT_SCROLLWIN_PAGEUP,
wxEVT_SCROLLWIN_PAGEDOWN,
wxEVT_SCROLLWIN_THUMBTRACK,
+ wxEVT_SCROLLWIN_THUMBRELEASE,
wxEVT_SIZE = wxEVT_FIRST + 200,
wxEVT_MOVE,
diff --git a/utils/wxPython/src/_extras.py b/utils/wxPython/src/_extras.py
index 24a2e61146..a3d76e54f5 100644
--- a/utils/wxPython/src/_extras.py
+++ b/utils/wxPython/src/_extras.py
@@ -224,6 +224,7 @@ def EVT_COMMAND(win, id, cmd, func):
def EVT_COMMAND_RANGE(win, id1, id2, cmd, func):
win.Connect(id1, id2, cmd, func)
+
# Scrolling
def EVT_SCROLL(win, func):
win.Connect(-1, -1, wxEVT_SCROLL_TOP, func)
@@ -233,6 +234,7 @@ def EVT_SCROLL(win, func):
win.Connect(-1, -1, wxEVT_SCROLL_PAGEUP, func)
win.Connect(-1, -1, wxEVT_SCROLL_PAGEDOWN, func)
win.Connect(-1, -1, wxEVT_SCROLL_THUMBTRACK,func)
+ win.Connect(-1, -1, wxEVT_SCROLL_THUMBRELEASE,func)
def EVT_SCROLL_TOP(win, func):
win.Connect(-1, -1, wxEVT_SCROLL_TOP, func)
@@ -255,6 +257,9 @@ def EVT_SCROLL_PAGEDOWN(win, func):
def EVT_SCROLL_THUMBTRACK(win, func):
win.Connect(-1, -1, wxEVT_SCROLL_THUMBTRACK, func)
+def EVT_SCROLL_THUMBRELEASE(win, func):
+ win.Connect(-1, -1, wxEVT_SCROLL_THUMBRELEASE, func)
+
# Scrolling, with an id
@@ -266,6 +271,7 @@ def EVT_COMMAND_SCROLL(win, id, func):
win.Connect(id, -1, wxEVT_SCROLL_PAGEUP, func)
win.Connect(id, -1, wxEVT_SCROLL_PAGEDOWN, func)
win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func)
+ win.Connect(id, -1, wxEVT_SCROLL_THUMBRELEASE,func)
def EVT_COMMAND_SCROLL_TOP(win, id, func):
win.Connect(id, -1, wxEVT_SCROLL_TOP, func)
@@ -288,15 +294,19 @@ def EVT_COMMAND_SCROLL_PAGEDOWN(win, id, func):
def EVT_COMMAND_SCROLL_THUMBTRACK(win, id, func):
win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK, func)
+def EVT_COMMAND_SCROLL_THUMBRELEASE(win, id, func):
+ win.Connect(id, -1, wxEVT_SCROLL_THUMBRELEASE, func)
+
#---
def EVT_SCROLLWIN(win, func):
- win.Connect(-1, -1, wxEVT_SCROLLWIN_TOP, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_BOTTOM, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEUP, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEDOWN, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEUP, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEDOWN, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBTRACK,func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_TOP, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_BOTTOM, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEUP, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEDOWN, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEUP, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEDOWN, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBTRACK, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBRELEASE,func)
def EVT_SCROLLWIN_TOP(win, func):
win.Connect(-1, -1, wxEVT_SCROLLWIN_TOP, func)
@@ -319,17 +329,21 @@ def EVT_SCROLLWIN_PAGEDOWN(win, func):
def EVT_SCROLLWIN_THUMBTRACK(win, func):
win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBTRACK, func)
+def EVT_SCROLLWIN_THUMBRELEASE(win, func):
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBRELEASE, func)
+
# Scrolling, with an id
def EVT_COMMAND_SCROLLWIN(win, id, func):
- win.Connect(id, -1, wxEVT_SCROLLWIN_TOP, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_BOTTOM, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_LINEUP, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_LINEDOWN, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEUP, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEDOWN, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBTRACK,func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_TOP, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_BOTTOM, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_LINEUP, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_LINEDOWN, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEUP, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEDOWN, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBTRACK, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBRELEASE,func)
def EVT_COMMAND_SCROLLWIN_TOP(win, id, func):
win.Connect(id, -1, wxEVT_SCROLLWIN_TOP, func)
@@ -352,6 +366,10 @@ def EVT_COMMAND_SCROLLWIN_PAGEDOWN(win, id, func):
def EVT_COMMAND_SCROLLWIN_THUMBTRACK(win, id, func):
win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBTRACK, func)
+def EVT_COMMAND_SCROLLWIN_THUMBRELEASE(win, id, func):
+ win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBRELEASE, func)
+
+
# Convenience commands
def EVT_BUTTON(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_BUTTON_CLICKED, func)
diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i
index 931bfebd9d..129a23b1d3 100644
--- a/utils/wxPython/src/controls.i
+++ b/utils/wxPython/src/controls.i
@@ -447,6 +447,7 @@ public:
int GetPageSize();
int GetThumbPosition();
int GetThumbSize();
+ %name(GetThumbLength) int GetThumbSize(); // to match the docs
void SetThumbPosition(int viewStart);
void SetScrollbar(int position, int thumbSize,
int range, int pageSize,
diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i
index 1ff1ff3639..d6c263814c 100644
--- a/utils/wxPython/src/controls2.i
+++ b/utils/wxPython/src/controls2.i
@@ -412,6 +412,7 @@ public:
//size_t GetSelections(wxArrayTreeItemIds& selection);
%addmethods {
PyObject* GetSelections() {
+ bool doSave = wxPyRestoreThread();
PyObject* rval = PyList_New(0);
wxArrayTreeItemIds array;
size_t num, x;
@@ -421,6 +422,7 @@ public:
"wxTreeItemId");
PyList_Append(rval, item);
}
+ wxPySaveThread(doSave);
return rval;
}
}
diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i
index e08669323c..78bbb9e946 100644
--- a/utils/wxPython/src/gdi.i
+++ b/utils/wxPython/src/gdi.i
@@ -365,12 +365,14 @@ public:
// I'll do it this way to use long-lived objects and not have to
// worry about when python may delete the object.
%addmethods {
- wxBrush(wxColour* colour, int style=wxSOLID) {
+ wxBrush(const wxColour* colour, int style=wxSOLID) {
return wxTheBrushList->FindOrCreateBrush(*colour, style);
}
// NO Destructor.
}
+// wxBrush(const wxColour& colour, int style=wxSOLID);
+
wxColour& GetColour();
wxBitmap * GetStipple();
int GetStyle();
@@ -522,8 +524,8 @@ class wxScreenDC : public wxDC {
public:
wxScreenDC();
- bool StartDrawingOnTop(wxWindow* window);
- %name(StartDrawingOnTopRect) bool StartDrawingOnTop(wxRect* rect = NULL);
+ %name(StartDrawingOnTopWin) bool StartDrawingOnTop(wxWindow* window);
+ bool StartDrawingOnTop(wxRect* rect = NULL);
bool EndDrawingOnTop();
};
diff --git a/utils/wxPython/src/msw/controls.cpp b/utils/wxPython/src/msw/controls.cpp
index 19daa75ca0..898b7a380f 100644
--- a/utils/wxPython/src/msw/controls.cpp
+++ b/utils/wxPython/src/msw/controls.cpp
@@ -7204,6 +7204,7 @@ static PyMethodDef controlscMethods[] = {
{ "new_wxSpinButton", (PyCFunction) _wrap_new_wxSpinButton, METH_VARARGS | METH_KEYWORDS },
{ "wxScrollBar_SetScrollbar", (PyCFunction) _wrap_wxScrollBar_SetScrollbar, METH_VARARGS | METH_KEYWORDS },
{ "wxScrollBar_SetThumbPosition", (PyCFunction) _wrap_wxScrollBar_SetThumbPosition, METH_VARARGS | METH_KEYWORDS },
+ { "wxScrollBar_GetThumbLength", (PyCFunction) _wrap_wxScrollBar_GetThumbSize, METH_VARARGS | METH_KEYWORDS },
{ "wxScrollBar_GetThumbSize", (PyCFunction) _wrap_wxScrollBar_GetThumbSize, METH_VARARGS | METH_KEYWORDS },
{ "wxScrollBar_GetThumbPosition", (PyCFunction) _wrap_wxScrollBar_GetThumbPosition, METH_VARARGS | METH_KEYWORDS },
{ "wxScrollBar_GetPageSize", (PyCFunction) _wrap_wxScrollBar_GetPageSize, METH_VARARGS | METH_KEYWORDS },
diff --git a/utils/wxPython/src/msw/controls.py b/utils/wxPython/src/msw/controls.py
index df2650c7aa..f0c8a8c0de 100644
--- a/utils/wxPython/src/msw/controls.py
+++ b/utils/wxPython/src/msw/controls.py
@@ -572,6 +572,9 @@ class wxScrollBarPtr(wxControlPtr):
def GetThumbSize(self, *_args, **_kwargs):
val = apply(controlsc.wxScrollBar_GetThumbSize,(self,) + _args, _kwargs)
return val
+ def GetThumbLength(self, *_args, **_kwargs):
+ val = apply(controlsc.wxScrollBar_GetThumbLength,(self,) + _args, _kwargs)
+ return val
def SetThumbPosition(self, *_args, **_kwargs):
val = apply(controlsc.wxScrollBar_SetThumbPosition,(self,) + _args, _kwargs)
return val
diff --git a/utils/wxPython/src/msw/controls2.cpp b/utils/wxPython/src/msw/controls2.cpp
index f46ae71271..254d7ad97a 100644
--- a/utils/wxPython/src/msw/controls2.cpp
+++ b/utils/wxPython/src/msw/controls2.cpp
@@ -4469,6 +4469,7 @@ static PyObject *_wrap_wxTreeCtrl_GetItemParent(PyObject *self, PyObject *args,
}
static PyObject * wxTreeCtrl_GetSelections(wxTreeCtrl *self) {
+ bool doSave = wxPyRestoreThread();
PyObject* rval = PyList_New(0);
wxArrayTreeItemIds array;
size_t num, x;
@@ -4478,6 +4479,7 @@ static PyObject * wxTreeCtrl_GetSelections(wxTreeCtrl *self) {
"wxTreeItemId");
PyList_Append(rval, item);
}
+ wxPySaveThread(doSave);
return rval;
}
static PyObject *_wrap_wxTreeCtrl_GetSelections(PyObject *self, PyObject *args, PyObject *kwargs) {
diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp
index c7d9136440..00391d32a2 100644
--- a/utils/wxPython/src/msw/gdi.cpp
+++ b/utils/wxPython/src/msw/gdi.cpp
@@ -3734,7 +3734,7 @@ static PyObject *_wrap_wxPen_SetStipple(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
-static wxBrush *new_wxBrush(wxColour *colour,int style) {
+static wxBrush *new_wxBrush(const wxColour *colour,int style) {
return wxTheBrushList->FindOrCreateBrush(*colour, style);
}
@@ -6935,8 +6935,8 @@ static PyObject *_wrap_new_wxScreenDC(PyObject *self, PyObject *args, PyObject *
return _resultobj;
}
-#define wxScreenDC_StartDrawingOnTop(_swigobj,_swigarg0) (_swigobj->StartDrawingOnTop(_swigarg0))
-static PyObject *_wrap_wxScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxScreenDC_StartDrawingOnTopWin(_swigobj,_swigarg0) (_swigobj->StartDrawingOnTop(_swigarg0))
+static PyObject *_wrap_wxScreenDC_StartDrawingOnTopWin(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxScreenDC * _arg0;
@@ -6946,33 +6946,33 @@ static PyObject *_wrap_wxScreenDC_StartDrawingOnTop(PyObject *self, PyObject *ar
char *_kwnames[] = { "self","window", NULL };
self = self;
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxScreenDC_StartDrawingOnTop",_kwnames,&_argo0,&_argo1))
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxScreenDC_StartDrawingOnTopWin",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScreenDC_p")) {
- PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_StartDrawingOnTop. Expected _wxScreenDC_p.");
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_StartDrawingOnTopWin. Expected _wxScreenDC_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxWindow_p")) {
- PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScreenDC_StartDrawingOnTop. Expected _wxWindow_p.");
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxScreenDC_StartDrawingOnTopWin. Expected _wxWindow_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (bool )wxScreenDC_StartDrawingOnTop(_arg0,_arg1);
+ _result = (bool )wxScreenDC_StartDrawingOnTopWin(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
-#define wxScreenDC_StartDrawingOnTopRect(_swigobj,_swigarg0) (_swigobj->StartDrawingOnTop(_swigarg0))
-static PyObject *_wrap_wxScreenDC_StartDrawingOnTopRect(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxScreenDC_StartDrawingOnTop(_swigobj,_swigarg0) (_swigobj->StartDrawingOnTop(_swigarg0))
+static PyObject *_wrap_wxScreenDC_StartDrawingOnTop(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxScreenDC * _arg0;
@@ -6983,12 +6983,12 @@ static PyObject *_wrap_wxScreenDC_StartDrawingOnTopRect(PyObject *self, PyObject
char *_kwnames[] = { "self","rect", NULL };
self = self;
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxScreenDC_StartDrawingOnTopRect",_kwnames,&_argo0,&_obj1))
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxScreenDC_StartDrawingOnTop",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScreenDC_p")) {
- PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_StartDrawingOnTopRect. Expected _wxScreenDC_p.");
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScreenDC_StartDrawingOnTop. Expected _wxScreenDC_p.");
return NULL;
}
}
@@ -7000,7 +7000,7 @@ static PyObject *_wrap_wxScreenDC_StartDrawingOnTopRect(PyObject *self, PyObject
}
{
wxPy_BEGIN_ALLOW_THREADS;
- _result = (bool )wxScreenDC_StartDrawingOnTopRect(_arg0,_arg1);
+ _result = (bool )wxScreenDC_StartDrawingOnTop(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
@@ -7938,8 +7938,8 @@ static PyMethodDef gdicMethods[] = {
{ "new_wxPaintDC", (PyCFunction) _wrap_new_wxPaintDC, METH_VARARGS | METH_KEYWORDS },
{ "new_wxClientDC", (PyCFunction) _wrap_new_wxClientDC, METH_VARARGS | METH_KEYWORDS },
{ "wxScreenDC_EndDrawingOnTop", (PyCFunction) _wrap_wxScreenDC_EndDrawingOnTop, METH_VARARGS | METH_KEYWORDS },
- { "wxScreenDC_StartDrawingOnTopRect", (PyCFunction) _wrap_wxScreenDC_StartDrawingOnTopRect, METH_VARARGS | METH_KEYWORDS },
{ "wxScreenDC_StartDrawingOnTop", (PyCFunction) _wrap_wxScreenDC_StartDrawingOnTop, METH_VARARGS | METH_KEYWORDS },
+ { "wxScreenDC_StartDrawingOnTopWin", (PyCFunction) _wrap_wxScreenDC_StartDrawingOnTopWin, METH_VARARGS | METH_KEYWORDS },
{ "new_wxScreenDC", (PyCFunction) _wrap_new_wxScreenDC, METH_VARARGS | METH_KEYWORDS },
{ "wxMemoryDC_SelectObject", (PyCFunction) _wrap_wxMemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS },
{ "new_wxMemoryDC", (PyCFunction) _wrap_new_wxMemoryDC, METH_VARARGS | METH_KEYWORDS },
diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py
index ea97d9e79b..b19e0c86e4 100644
--- a/utils/wxPython/src/msw/gdi.py
+++ b/utils/wxPython/src/msw/gdi.py
@@ -680,12 +680,12 @@ class wxScreenDCPtr(wxDCPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
+ def StartDrawingOnTopWin(self, *_args, **_kwargs):
+ val = apply(gdic.wxScreenDC_StartDrawingOnTopWin,(self,) + _args, _kwargs)
+ return val
def StartDrawingOnTop(self, *_args, **_kwargs):
val = apply(gdic.wxScreenDC_StartDrawingOnTop,(self,) + _args, _kwargs)
return val
- def StartDrawingOnTopRect(self, *_args, **_kwargs):
- val = apply(gdic.wxScreenDC_StartDrawingOnTopRect,(self,) + _args, _kwargs)
- return val
def EndDrawingOnTop(self, *_args, **_kwargs):
val = apply(gdic.wxScreenDC_EndDrawingOnTop,(self,) + _args, _kwargs)
return val
diff --git a/utils/wxPython/src/msw/stattool.cpp b/utils/wxPython/src/msw/stattool.cpp
index 9192ba9ded..4a737f496b 100644
--- a/utils/wxPython/src/msw/stattool.cpp
+++ b/utils/wxPython/src/msw/stattool.cpp
@@ -278,104 +278,57 @@ static PyObject *_wrap_wxStatusBar_GetStatusText(PyObject *self, PyObject *args,
return _resultobj;
}
-#define wxStatusBar_DrawField(_swigobj,_swigarg0,_swigarg1) (_swigobj->DrawField(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxStatusBar_DrawField(PyObject *self, PyObject *args, PyObject *kwargs) {
- PyObject * _resultobj;
- wxStatusBar * _arg0;
- wxDC * _arg1;
- int _arg2;
- PyObject * _argo0 = 0;
- PyObject * _argo1 = 0;
- char *_kwnames[] = { "self","dc","i", NULL };
-
- self = self;
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxStatusBar_DrawField",_kwnames,&_argo0,&_argo1,&_arg2))
- return NULL;
- if (_argo0) {
- if (_argo0 == Py_None) { _arg0 = NULL; }
- else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {
- PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_DrawField. Expected _wxStatusBar_p.");
- return NULL;
- }
- }
- if (_argo1) {
- if (_argo1 == Py_None) { _arg1 = NULL; }
- else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) {
- PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxStatusBar_DrawField. Expected _wxDC_p.");
- return NULL;
- }
- }
-{
- wxPy_BEGIN_ALLOW_THREADS;
- wxStatusBar_DrawField(_arg0,*_arg1,_arg2);
-
- wxPy_END_ALLOW_THREADS;
-} Py_INCREF(Py_None);
- _resultobj = Py_None;
- return _resultobj;
-}
-
-#define wxStatusBar_DrawFieldText(_swigobj,_swigarg0,_swigarg1) (_swigobj->DrawFieldText(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxStatusBar_DrawFieldText(PyObject *self, PyObject *args, PyObject *kwargs) {
- PyObject * _resultobj;
- wxStatusBar * _arg0;
- wxDC * _arg1;
- int _arg2;
- PyObject * _argo0 = 0;
- PyObject * _argo1 = 0;
- char *_kwnames[] = { "self","dc","i", NULL };
-
- self = self;
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxStatusBar_DrawFieldText",_kwnames,&_argo0,&_argo1,&_arg2))
- return NULL;
- if (_argo0) {
- if (_argo0 == Py_None) { _arg0 = NULL; }
- else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {
- PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_DrawFieldText. Expected _wxStatusBar_p.");
- return NULL;
- }
- }
- if (_argo1) {
- if (_argo1 == Py_None) { _arg1 = NULL; }
- else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxDC_p")) {
- PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxStatusBar_DrawFieldText. Expected _wxDC_p.");
- return NULL;
- }
- }
-{
- wxPy_BEGIN_ALLOW_THREADS;
- wxStatusBar_DrawFieldText(_arg0,*_arg1,_arg2);
-
- wxPy_END_ALLOW_THREADS;
-} Py_INCREF(Py_None);
- _resultobj = Py_None;
- return _resultobj;
-}
-
-#define wxStatusBar_InitColours(_swigobj) (_swigobj->InitColours())
-static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args, PyObject *kwargs) {
+#define wxStatusBar_GetBorderX(_swigobj) (_swigobj->GetBorderX())
+static PyObject *_wrap_wxStatusBar_GetBorderX(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
+ int _result;
wxStatusBar * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
- if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStatusBar_InitColours",_kwnames,&_argo0))
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStatusBar_GetBorderX",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {
- PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_InitColours. Expected _wxStatusBar_p.");
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_GetBorderX. Expected _wxStatusBar_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
- wxStatusBar_InitColours(_arg0);
+ _result = (int )wxStatusBar_GetBorderX(_arg0);
wxPy_END_ALLOW_THREADS;
-} Py_INCREF(Py_None);
- _resultobj = Py_None;
+} _resultobj = Py_BuildValue("i",_result);
+ return _resultobj;
+}
+
+#define wxStatusBar_GetBorderY(_swigobj) (_swigobj->GetBorderY())
+static PyObject *_wrap_wxStatusBar_GetBorderY(PyObject *self, PyObject *args, PyObject *kwargs) {
+ PyObject * _resultobj;
+ int _result;
+ wxStatusBar * _arg0;
+ PyObject * _argo0 = 0;
+ char *_kwnames[] = { "self", NULL };
+
+ self = self;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStatusBar_GetBorderY",_kwnames,&_argo0))
+ return NULL;
+ if (_argo0) {
+ if (_argo0 == Py_None) { _arg0 = NULL; }
+ else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_GetBorderY. Expected _wxStatusBar_p.");
+ return NULL;
+ }
+ }
+{
+ wxPy_BEGIN_ALLOW_THREADS;
+ _result = (int )wxStatusBar_GetBorderY(_arg0);
+
+ wxPy_END_ALLOW_THREADS;
+} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -496,6 +449,34 @@ static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *arg
return _resultobj;
}
+#define wxStatusBar_SetMinHeight(_swigobj,_swigarg0) (_swigobj->SetMinHeight(_swigarg0))
+static PyObject *_wrap_wxStatusBar_SetMinHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
+ PyObject * _resultobj;
+ wxStatusBar * _arg0;
+ int _arg1;
+ PyObject * _argo0 = 0;
+ char *_kwnames[] = { "self","height", NULL };
+
+ self = self;
+ if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStatusBar_SetMinHeight",_kwnames,&_argo0,&_arg1))
+ return NULL;
+ if (_argo0) {
+ if (_argo0 == Py_None) { _arg0 = NULL; }
+ else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStatusBar_p")) {
+ PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStatusBar_SetMinHeight. Expected _wxStatusBar_p.");
+ return NULL;
+ }
+ }
+{
+ wxPy_BEGIN_ALLOW_THREADS;
+ wxStatusBar_SetMinHeight(_arg0,_arg1);
+
+ wxPy_END_ALLOW_THREADS;
+} Py_INCREF(Py_None);
+ _resultobj = Py_None;
+ return _resultobj;
+}
+
static void wxToolBarToolBase_Destroy(wxToolBarToolBase *self) { delete self; }
static PyObject *_wrap_wxToolBarToolBase_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3114,12 +3095,12 @@ static PyMethodDef stattoolcMethods[] = {
{ "wxToolBarToolBase_GetControl", (PyCFunction) _wrap_wxToolBarToolBase_GetControl, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarToolBase_GetId", (PyCFunction) _wrap_wxToolBarToolBase_GetId, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarToolBase_Destroy", (PyCFunction) _wrap_wxToolBarToolBase_Destroy, METH_VARARGS | METH_KEYWORDS },
+ { "wxStatusBar_SetMinHeight", (PyCFunction) _wrap_wxStatusBar_SetMinHeight, METH_VARARGS | METH_KEYWORDS },
{ "wxStatusBar_SetStatusWidths", (PyCFunction) _wrap_wxStatusBar_SetStatusWidths, METH_VARARGS | METH_KEYWORDS },
{ "wxStatusBar_SetStatusText", (PyCFunction) _wrap_wxStatusBar_SetStatusText, METH_VARARGS | METH_KEYWORDS },
{ "wxStatusBar_SetFieldsCount", (PyCFunction) _wrap_wxStatusBar_SetFieldsCount, METH_VARARGS | METH_KEYWORDS },
- { "wxStatusBar_InitColours", (PyCFunction) _wrap_wxStatusBar_InitColours, METH_VARARGS | METH_KEYWORDS },
- { "wxStatusBar_DrawFieldText", (PyCFunction) _wrap_wxStatusBar_DrawFieldText, METH_VARARGS | METH_KEYWORDS },
- { "wxStatusBar_DrawField", (PyCFunction) _wrap_wxStatusBar_DrawField, METH_VARARGS | METH_KEYWORDS },
+ { "wxStatusBar_GetBorderY", (PyCFunction) _wrap_wxStatusBar_GetBorderY, METH_VARARGS | METH_KEYWORDS },
+ { "wxStatusBar_GetBorderX", (PyCFunction) _wrap_wxStatusBar_GetBorderX, METH_VARARGS | METH_KEYWORDS },
{ "wxStatusBar_GetStatusText", (PyCFunction) _wrap_wxStatusBar_GetStatusText, METH_VARARGS | METH_KEYWORDS },
{ "wxStatusBar_GetFieldsCount", (PyCFunction) _wrap_wxStatusBar_GetFieldsCount, METH_VARARGS | METH_KEYWORDS },
{ "wxStatusBar_GetFieldRect", (PyCFunction) _wrap_wxStatusBar_GetFieldRect, METH_VARARGS | METH_KEYWORDS },
diff --git a/utils/wxPython/src/msw/stattool.py b/utils/wxPython/src/msw/stattool.py
index 1c54ead378..f9cc36b5f9 100644
--- a/utils/wxPython/src/msw/stattool.py
+++ b/utils/wxPython/src/msw/stattool.py
@@ -27,14 +27,11 @@ class wxStatusBarPtr(wxWindowPtr):
def GetStatusText(self, *_args, **_kwargs):
val = apply(stattoolc.wxStatusBar_GetStatusText,(self,) + _args, _kwargs)
return val
- def DrawField(self, *_args, **_kwargs):
- val = apply(stattoolc.wxStatusBar_DrawField,(self,) + _args, _kwargs)
+ def GetBorderX(self, *_args, **_kwargs):
+ val = apply(stattoolc.wxStatusBar_GetBorderX,(self,) + _args, _kwargs)
return val
- def DrawFieldText(self, *_args, **_kwargs):
- val = apply(stattoolc.wxStatusBar_DrawFieldText,(self,) + _args, _kwargs)
- return val
- def InitColours(self, *_args, **_kwargs):
- val = apply(stattoolc.wxStatusBar_InitColours,(self,) + _args, _kwargs)
+ def GetBorderY(self, *_args, **_kwargs):
+ val = apply(stattoolc.wxStatusBar_GetBorderY,(self,) + _args, _kwargs)
return val
def SetFieldsCount(self, *_args, **_kwargs):
val = apply(stattoolc.wxStatusBar_SetFieldsCount,(self,) + _args, _kwargs)
@@ -45,6 +42,9 @@ class wxStatusBarPtr(wxWindowPtr):
def SetStatusWidths(self, *_args, **_kwargs):
val = apply(stattoolc.wxStatusBar_SetStatusWidths,(self,) + _args, _kwargs)
return val
+ def SetMinHeight(self, *_args, **_kwargs):
+ val = apply(stattoolc.wxStatusBar_SetMinHeight,(self,) + _args, _kwargs)
+ return val
def __repr__(self):
return "" % (self.this,)
class wxStatusBar(wxStatusBarPtr):
diff --git a/utils/wxPython/src/msw/wx.cpp b/utils/wxPython/src/msw/wx.cpp
index 2ee0471c70..57f6466ec7 100644
--- a/utils/wxPython/src/msw/wx.cpp
+++ b/utils/wxPython/src/msw/wx.cpp
@@ -2419,8 +2419,6 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxNAND", PyInt_FromLong((long) wxNAND));
PyDict_SetItemString(d,"wxOR", PyInt_FromLong((long) wxOR));
PyDict_SetItemString(d,"wxSET", PyInt_FromLong((long) wxSET));
- PyDict_SetItemString(d,"wxSRC_OR", PyInt_FromLong((long) wxSRC_OR));
- PyDict_SetItemString(d,"wxSRC_AND", PyInt_FromLong((long) wxSRC_AND));
PyDict_SetItemString(d,"WXK_BACK", PyInt_FromLong((long) WXK_BACK));
PyDict_SetItemString(d,"WXK_TAB", PyInt_FromLong((long) WXK_TAB));
PyDict_SetItemString(d,"WXK_RETURN", PyInt_FromLong((long) WXK_RETURN));
@@ -2655,6 +2653,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxEVT_SCROLL_PAGEUP", PyInt_FromLong((long) wxEVT_SCROLL_PAGEUP));
PyDict_SetItemString(d,"wxEVT_SCROLL_PAGEDOWN", PyInt_FromLong((long) wxEVT_SCROLL_PAGEDOWN));
PyDict_SetItemString(d,"wxEVT_SCROLL_THUMBTRACK", PyInt_FromLong((long) wxEVT_SCROLL_THUMBTRACK));
+ PyDict_SetItemString(d,"wxEVT_SCROLL_THUMBRELEASE", PyInt_FromLong((long) wxEVT_SCROLL_THUMBRELEASE));
PyDict_SetItemString(d,"wxEVT_SCROLLWIN_TOP", PyInt_FromLong((long) wxEVT_SCROLLWIN_TOP));
PyDict_SetItemString(d,"wxEVT_SCROLLWIN_BOTTOM", PyInt_FromLong((long) wxEVT_SCROLLWIN_BOTTOM));
PyDict_SetItemString(d,"wxEVT_SCROLLWIN_LINEUP", PyInt_FromLong((long) wxEVT_SCROLLWIN_LINEUP));
@@ -2662,6 +2661,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxEVT_SCROLLWIN_PAGEUP", PyInt_FromLong((long) wxEVT_SCROLLWIN_PAGEUP));
PyDict_SetItemString(d,"wxEVT_SCROLLWIN_PAGEDOWN", PyInt_FromLong((long) wxEVT_SCROLLWIN_PAGEDOWN));
PyDict_SetItemString(d,"wxEVT_SCROLLWIN_THUMBTRACK", PyInt_FromLong((long) wxEVT_SCROLLWIN_THUMBTRACK));
+ PyDict_SetItemString(d,"wxEVT_SCROLLWIN_THUMBRELEASE", PyInt_FromLong((long) wxEVT_SCROLLWIN_THUMBRELEASE));
PyDict_SetItemString(d,"wxEVT_SIZE", PyInt_FromLong((long) wxEVT_SIZE));
PyDict_SetItemString(d,"wxEVT_MOVE", PyInt_FromLong((long) wxEVT_MOVE));
PyDict_SetItemString(d,"wxEVT_CLOSE_WINDOW", PyInt_FromLong((long) wxEVT_CLOSE_WINDOW));
diff --git a/utils/wxPython/src/msw/wx.py b/utils/wxPython/src/msw/wx.py
index 439dce752c..4bf2ab1dbe 100644
--- a/utils/wxPython/src/msw/wx.py
+++ b/utils/wxPython/src/msw/wx.py
@@ -482,8 +482,6 @@ wxOR_INVERT = wxc.wxOR_INVERT
wxNAND = wxc.wxNAND
wxOR = wxc.wxOR
wxSET = wxc.wxSET
-wxSRC_OR = wxc.wxSRC_OR
-wxSRC_AND = wxc.wxSRC_AND
WXK_BACK = wxc.WXK_BACK
WXK_TAB = wxc.WXK_TAB
WXK_RETURN = wxc.WXK_RETURN
@@ -718,6 +716,7 @@ wxEVT_SCROLL_LINEDOWN = wxc.wxEVT_SCROLL_LINEDOWN
wxEVT_SCROLL_PAGEUP = wxc.wxEVT_SCROLL_PAGEUP
wxEVT_SCROLL_PAGEDOWN = wxc.wxEVT_SCROLL_PAGEDOWN
wxEVT_SCROLL_THUMBTRACK = wxc.wxEVT_SCROLL_THUMBTRACK
+wxEVT_SCROLL_THUMBRELEASE = wxc.wxEVT_SCROLL_THUMBRELEASE
wxEVT_SCROLLWIN_TOP = wxc.wxEVT_SCROLLWIN_TOP
wxEVT_SCROLLWIN_BOTTOM = wxc.wxEVT_SCROLLWIN_BOTTOM
wxEVT_SCROLLWIN_LINEUP = wxc.wxEVT_SCROLLWIN_LINEUP
@@ -725,6 +724,7 @@ wxEVT_SCROLLWIN_LINEDOWN = wxc.wxEVT_SCROLLWIN_LINEDOWN
wxEVT_SCROLLWIN_PAGEUP = wxc.wxEVT_SCROLLWIN_PAGEUP
wxEVT_SCROLLWIN_PAGEDOWN = wxc.wxEVT_SCROLLWIN_PAGEDOWN
wxEVT_SCROLLWIN_THUMBTRACK = wxc.wxEVT_SCROLLWIN_THUMBTRACK
+wxEVT_SCROLLWIN_THUMBRELEASE = wxc.wxEVT_SCROLLWIN_THUMBRELEASE
wxEVT_SIZE = wxc.wxEVT_SIZE
wxEVT_MOVE = wxc.wxEVT_MOVE
wxEVT_CLOSE_WINDOW = wxc.wxEVT_CLOSE_WINDOW
@@ -1046,6 +1046,7 @@ def EVT_COMMAND(win, id, cmd, func):
def EVT_COMMAND_RANGE(win, id1, id2, cmd, func):
win.Connect(id1, id2, cmd, func)
+
# Scrolling
def EVT_SCROLL(win, func):
win.Connect(-1, -1, wxEVT_SCROLL_TOP, func)
@@ -1055,6 +1056,7 @@ def EVT_SCROLL(win, func):
win.Connect(-1, -1, wxEVT_SCROLL_PAGEUP, func)
win.Connect(-1, -1, wxEVT_SCROLL_PAGEDOWN, func)
win.Connect(-1, -1, wxEVT_SCROLL_THUMBTRACK,func)
+ win.Connect(-1, -1, wxEVT_SCROLL_THUMBRELEASE,func)
def EVT_SCROLL_TOP(win, func):
win.Connect(-1, -1, wxEVT_SCROLL_TOP, func)
@@ -1077,6 +1079,9 @@ def EVT_SCROLL_PAGEDOWN(win, func):
def EVT_SCROLL_THUMBTRACK(win, func):
win.Connect(-1, -1, wxEVT_SCROLL_THUMBTRACK, func)
+def EVT_SCROLL_THUMBRELEASE(win, func):
+ win.Connect(-1, -1, wxEVT_SCROLL_THUMBRELEASE, func)
+
# Scrolling, with an id
@@ -1088,6 +1093,7 @@ def EVT_COMMAND_SCROLL(win, id, func):
win.Connect(id, -1, wxEVT_SCROLL_PAGEUP, func)
win.Connect(id, -1, wxEVT_SCROLL_PAGEDOWN, func)
win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func)
+ win.Connect(id, -1, wxEVT_SCROLL_THUMBRELEASE,func)
def EVT_COMMAND_SCROLL_TOP(win, id, func):
win.Connect(id, -1, wxEVT_SCROLL_TOP, func)
@@ -1110,15 +1116,19 @@ def EVT_COMMAND_SCROLL_PAGEDOWN(win, id, func):
def EVT_COMMAND_SCROLL_THUMBTRACK(win, id, func):
win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK, func)
+def EVT_COMMAND_SCROLL_THUMBRELEASE(win, id, func):
+ win.Connect(id, -1, wxEVT_SCROLL_THUMBRELEASE, func)
+
#---
def EVT_SCROLLWIN(win, func):
- win.Connect(-1, -1, wxEVT_SCROLLWIN_TOP, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_BOTTOM, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEUP, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEDOWN, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEUP, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEDOWN, func)
- win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBTRACK,func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_TOP, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_BOTTOM, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEUP, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_LINEDOWN, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEUP, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_PAGEDOWN, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBTRACK, func)
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBRELEASE,func)
def EVT_SCROLLWIN_TOP(win, func):
win.Connect(-1, -1, wxEVT_SCROLLWIN_TOP, func)
@@ -1141,17 +1151,21 @@ def EVT_SCROLLWIN_PAGEDOWN(win, func):
def EVT_SCROLLWIN_THUMBTRACK(win, func):
win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBTRACK, func)
+def EVT_SCROLLWIN_THUMBRELEASE(win, func):
+ win.Connect(-1, -1, wxEVT_SCROLLWIN_THUMBRELEASE, func)
+
# Scrolling, with an id
def EVT_COMMAND_SCROLLWIN(win, id, func):
- win.Connect(id, -1, wxEVT_SCROLLWIN_TOP, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_BOTTOM, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_LINEUP, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_LINEDOWN, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEUP, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEDOWN, func)
- win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBTRACK,func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_TOP, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_BOTTOM, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_LINEUP, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_LINEDOWN, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEUP, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_PAGEDOWN, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBTRACK, func)
+ win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBRELEASE,func)
def EVT_COMMAND_SCROLLWIN_TOP(win, id, func):
win.Connect(id, -1, wxEVT_SCROLLWIN_TOP, func)
@@ -1174,6 +1188,10 @@ def EVT_COMMAND_SCROLLWIN_PAGEDOWN(win, id, func):
def EVT_COMMAND_SCROLLWIN_THUMBTRACK(win, id, func):
win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBTRACK, func)
+def EVT_COMMAND_SCROLLWIN_THUMBRELEASE(win, id, func):
+ win.Connect(id, -1, wxEVT_SCROLLWIN_THUMBRELEASE, func)
+
+
# Convenience commands
def EVT_BUTTON(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_BUTTON_CLICKED, func)
diff --git a/utils/wxPython/src/stattool.i b/utils/wxPython/src/stattool.i
index c20a042361..575f8880b5 100644
--- a/utils/wxPython/src/stattool.i
+++ b/utils/wxPython/src/stattool.i
@@ -53,13 +53,17 @@ public:
}
int GetFieldsCount(void);
wxString GetStatusText(int ir = 0);
- void DrawField(wxDC& dc, int i);
- void DrawFieldText(wxDC& dc, int i);
- void InitColours(void);
+ int GetBorderX();
+ int GetBorderY();
+
+// void DrawField(wxDC& dc, int i);
+// void DrawFieldText(wxDC& dc, int i);
+// void InitColours(void);
void SetFieldsCount(int number = 1);
void SetStatusText(const wxString& text, int i = 0);
void SetStatusWidths(int LCOUNT, int* choices);
+ void SetMinHeight(int height);
};
diff --git a/utils/wxPython/src/wxc.rc b/utils/wxPython/src/wxc.rc
index 9d6118d5b5..a4d4738e9a 100644
--- a/utils/wxPython/src/wxc.rc
+++ b/utils/wxPython/src/wxc.rc
@@ -1,2 +1,3 @@
wxpicon ICON "wxp.ico"
#include "wx/msw/wx.rc"
+#include "wx/html/msw/wxhtml.rc"