From edf2f43eade1ec5d3c6cbd96cb13551acabc9a99 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 5 Jul 2001 02:16:20 +0000 Subject: [PATCH] odds and ends... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/MANIFEST.in | 17 ++++++ wxPython/contrib/ogl/oglcanvas.i | 4 +- wxPython/contrib/ogl/oglcanvas.py | 2 + wxPython/demo/GridSimple.py | 1 + wxPython/demo/XMLtreeview.py | 33 +++++++++++ wxPython/demo/wxFrame.py | 8 ++- wxPython/demo/wxStyledTextCtrl_2.py | 2 +- wxPython/distrib/make_installer.py | 1 + wxPython/src/_defs.i | 2 + wxPython/src/frames.i | 1 + wxPython/src/grid.i | 1 + wxPython/src/misc2.i | 14 +---- wxPython/src/msw/frames.cpp | 29 ++++++++++ wxPython/src/msw/frames.py | 3 + wxPython/src/msw/grid.cpp | 29 ++++++++++ wxPython/src/msw/grid.py | 3 + wxPython/src/msw/misc2.cpp | 88 +++++++++++++---------------- wxPython/src/msw/misc2.py | 8 +-- 18 files changed, 177 insertions(+), 69 deletions(-) diff --git a/wxPython/MANIFEST.in b/wxPython/MANIFEST.in index 1c10e3d8b4..90c13a0c68 100644 --- a/wxPython/MANIFEST.in +++ b/wxPython/MANIFEST.in @@ -31,6 +31,8 @@ include demo/data/*.i include demo/data/*.h include demo/data/*.py include demo/data/*.wav +include demo/data/*.wdr +include demo/data/*.xrc include samples/doodle/*.txt include samples/doodle/*.py @@ -113,3 +115,18 @@ include contrib/stc/contrib/src/stc/scintilla/include/*.iface include contrib/stc/contrib/src/stc/scintilla/src/*.h include contrib/stc/contrib/src/stc/scintilla/src/*.cxx +include contrib/xrc/*.txt +include contrib/xrc/*.i +include contrib/xrc/*.py +include contrib/xrc/*.cpp +include contrib/xrc/*.c +include contrib/xrc/*.h +include contrib/xrc/contrib/include/wx/xrc/*.h +include contrib/xrc/contrib/src/xrc/*.cpp +include contrib/xrc/contrib/src/xrc/*.txt +include contrib/xrc/contrib/src/xrc/README.EXPAT +include contrib/xrc/contrib/src/xrc/expat/*.txt +include contrib/xrc/contrib/src/xrc/expat/xmlparse/*.c +include contrib/xrc/contrib/src/xrc/expat/xmlparse/*.h +include contrib/xrc/contrib/src/xrc/expat/xmltok/*.c +include contrib/xrc/contrib/src/xrc/expat/xmltok/*.h diff --git a/wxPython/contrib/ogl/oglcanvas.i b/wxPython/contrib/ogl/oglcanvas.i index 1761f82f8a..0794f68e2b 100644 --- a/wxPython/contrib/ogl/oglcanvas.i +++ b/wxPython/contrib/ogl/oglcanvas.i @@ -31,7 +31,7 @@ %include _ogldefs.i -%extern oglbasic.i +%import oglbasic.i %pragma(python) code = "import wx" @@ -45,7 +45,7 @@ public: wxDiagram(); //~wxDiagram(); - void AddShape(wxPyShape*shape, wxPyShape *addAfter = NULL); + void AddShape(wxPyShape* shape, wxPyShape *addAfter = NULL); void Clear(wxDC& dc); void DeleteAllShapes(); void DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2); diff --git a/wxPython/contrib/ogl/oglcanvas.py b/wxPython/contrib/ogl/oglcanvas.py index 218121aae1..b80e23933a 100644 --- a/wxPython/contrib/ogl/oglcanvas.py +++ b/wxPython/contrib/ogl/oglcanvas.py @@ -40,6 +40,8 @@ from sizers import * from filesys import * from utils import * + +from oglbasic import * import wx class wxDiagramPtr(wxObjectPtr): def __init__(self,this): diff --git a/wxPython/demo/GridSimple.py b/wxPython/demo/GridSimple.py index 7a135bd9e3..96a4a200f5 100644 --- a/wxPython/demo/GridSimple.py +++ b/wxPython/demo/GridSimple.py @@ -71,6 +71,7 @@ class SimpleGrid(wxGrid, wxGridAutoEditMixin): EVT_GRID_EDITOR_CREATED(self, self.OnEditorCreated) + def OnCellLeftClick(self, evt): self.log.write("OnCellLeftClick: (%d,%d) %s\n" % (evt.GetRow(), evt.GetCol(), evt.GetPosition())) diff --git a/wxPython/demo/XMLtreeview.py b/wxPython/demo/XMLtreeview.py index c53e4010c9..ce14928ce8 100644 --- a/wxPython/demo/XMLtreeview.py +++ b/wxPython/demo/XMLtreeview.py @@ -32,6 +32,39 @@ else: wxTreeCtrl.__init__(self, parent, ID) self.nodeStack = [self.AddRoot("Root")] + # Trees need an image list to do DnD... + self.il = wxImageList(16,16) + self.SetImageList(self.il) + + # event handlers for DnD + EVT_TREE_BEGIN_DRAG(self, ID, self.OnBeginDrag) + EVT_TREE_END_DRAG(self, ID, self.OnEndDrag) + + + def OnBeginDrag(self, event): + item = event.GetItem() + if item != self.GetRootItem(): + self.draggingItem = item + event.Allow() # if DnD of this item is okay Allow it. + + + def OnEndDrag(self, evt): + itemSrc = self.draggingItem + itemDst = evt.GetItem() + self.draggingItem = None + + if not itemDst.IsOk(): + print "Can't drag to here..." + return + + # For this simple example just take the text of the source item + # and append it to the destination item. In real life you would + # possibly want to copy subtrees... + text = self.GetItemText(itemSrc) + self.AppendItem(itemDst, text) + self.Delete(itemSrc) + + # Define a handler for start element events def StartElement(self, name, attrs ): if py2: diff --git a/wxPython/demo/wxFrame.py b/wxPython/demo/wxFrame.py index 9b96b2b7ba..8f4e1a17d7 100644 --- a/wxPython/demo/wxFrame.py +++ b/wxPython/demo/wxFrame.py @@ -4,8 +4,9 @@ from wxPython.wx import * #--------------------------------------------------------------------------- class MyFrame(wxFrame): - def __init__(self, parent, ID, title, pos, size): - wxFrame.__init__(self, parent, ID, title, pos, size) + def __init__(self, parent, ID, title, pos=wxDefaultPosition, + size=wxDefaultSize, style=wxDEFAULT_FRAME_STYLE): + wxFrame.__init__(self, parent, ID, title, pos, size, style) panel = wxPanel(self, -1) button = wxButton(panel, 1003, "Close Me") @@ -23,7 +24,8 @@ class MyFrame(wxFrame): #--------------------------------------------------------------------------- def runTest(frame, nb, log): - win = MyFrame(frame, -1, "This is a wxFrame", wxDefaultPosition, wxSize(350, 200)) + win = MyFrame(frame, -1, "This is a wxFrame", size=(350, 200), + style = wxDEFAULT_FRAME_STYLE | wxFRAME_TOOL_WINDOW ) frame.otherWin = win win.Show(true) diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/wxStyledTextCtrl_2.py index bd59137245..f1e602048e 100644 --- a/wxPython/demo/wxStyledTextCtrl_2.py +++ b/wxPython/demo/wxStyledTextCtrl_2.py @@ -12,7 +12,7 @@ demoText = """\ """ -wxSTC_CMD_ZOOMIN + #---------------------------------------------------------------------- diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 51693745c0..7e0ae8964d 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -102,6 +102,7 @@ Source: "demo\data\*.i"; DestDir: "{app}\wxPython\demo\data"; Source: "demo\data\*.h"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.txt"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.wav"; DestDir: "{app}\wxPython\demo\data"; Components: demo +Source: "demo\data\*.xrc"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "README.txt"; DestDir: "{app}\wxPython\docs"; Flags: isreadme; Components: core Source: "CHANGES.txt"; DestDir: "{app}\wxPython\docs"; Components: core diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index 39bedb9c45..4b01bdb564 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -228,6 +228,7 @@ enum { wxEXT_DIALOG_STYLE, wxCLIP_CHILDREN, + wxCLIP_SIBLINGS, wxRETAINED, wxBACKINGSTORE, @@ -323,6 +324,7 @@ enum { wxLC_MASK_SORT, wxLC_HRULES, wxLC_VRULES, + //wxLC_VIRTUAL, wxSP_VERTICAL, wxSP_HORIZONTAL, wxSP_ARROW_KEYS, diff --git a/wxPython/src/frames.i b/wxPython/src/frames.i index 27b589f068..7758a36ebf 100644 --- a/wxPython/src/frames.i +++ b/wxPython/src/frames.i @@ -86,6 +86,7 @@ public: bool Command(int id); bool ProcessCommand(int id); bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); + bool IsFullScreen(); }; //--------------------------------------------------------------------------- diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i index 0859bf204a..82c34448b9 100644 --- a/wxPython/src/grid.i +++ b/wxPython/src/grid.i @@ -1361,6 +1361,7 @@ public: void BeginBatch(); void EndBatch(); int GetBatchCount(); + void ForceRefresh(); // ------ edit control functions diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i index be23e14bf0..5ed670e78c 100644 --- a/wxPython/src/misc2.i +++ b/wxPython/src/misc2.i @@ -284,18 +284,10 @@ public: wxString GetTip(); // *** Not in the "public" interface void SetWindow(wxWindow *win); wxWindow *GetWindow(); -}; - - -%inline %{ - void wxToolTip_Enable(bool flag) { - wxToolTip::Enable(flag); - } - void wxToolTip_SetDelay(long milliseconds) { - wxToolTip::SetDelay(milliseconds); - } -%} + static void Enable(bool flag); + static void SetDelay(long milliseconds); +}; //---------------------------------------------------------------------- diff --git a/wxPython/src/msw/frames.cpp b/wxPython/src/msw/frames.cpp index 0c8640cc2c..09360b3ef7 100644 --- a/wxPython/src/msw/frames.cpp +++ b/wxPython/src/msw/frames.cpp @@ -1078,6 +1078,34 @@ static PyObject *_wrap_wxFrame_ShowFullScreen(PyObject *self, PyObject *args, Py return _resultobj; } +#define wxFrame_IsFullScreen(_swigobj) (_swigobj->IsFullScreen()) +static PyObject *_wrap_wxFrame_IsFullScreen(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxFrame * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFrame_IsFullScreen",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_IsFullScreen. Expected _wxFrame_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxFrame_IsFullScreen(_arg0); + + wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static void *SwigwxMiniFrameTowxFrame(void *ptr) { wxMiniFrame *src; wxFrame *dest; @@ -1192,6 +1220,7 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args, PyObject static PyMethodDef framescMethods[] = { { "new_wxMiniFrame", (PyCFunction) _wrap_new_wxMiniFrame, METH_VARARGS | METH_KEYWORDS }, + { "wxFrame_IsFullScreen", (PyCFunction) _wrap_wxFrame_IsFullScreen, METH_VARARGS | METH_KEYWORDS }, { "wxFrame_ShowFullScreen", (PyCFunction) _wrap_wxFrame_ShowFullScreen, METH_VARARGS | METH_KEYWORDS }, { "wxFrame_ProcessCommand", (PyCFunction) _wrap_wxFrame_ProcessCommand, METH_VARARGS | METH_KEYWORDS }, { "wxFrame_Command", (PyCFunction) _wrap_wxFrame_Command, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/frames.py b/wxPython/src/msw/frames.py index 41bd817636..8652452be8 100644 --- a/wxPython/src/msw/frames.py +++ b/wxPython/src/msw/frames.py @@ -99,6 +99,9 @@ class wxFramePtr(wxWindowPtr): def ShowFullScreen(self, *_args, **_kwargs): val = apply(framesc.wxFrame_ShowFullScreen,(self,) + _args, _kwargs) return val + def IsFullScreen(self, *_args, **_kwargs): + val = apply(framesc.wxFrame_IsFullScreen,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxFrame(wxFramePtr): diff --git a/wxPython/src/msw/grid.cpp b/wxPython/src/msw/grid.cpp index 5b4fcc65a6..aa65a43ed1 100644 --- a/wxPython/src/msw/grid.cpp +++ b/wxPython/src/msw/grid.cpp @@ -7725,6 +7725,34 @@ static PyObject *_wrap_wxGrid_GetBatchCount(PyObject *self, PyObject *args, PyOb return _resultobj; } +#define wxGrid_ForceRefresh(_swigobj) (_swigobj->ForceRefresh()) +static PyObject *_wrap_wxGrid_ForceRefresh(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGrid * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_ForceRefresh",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_ForceRefresh. Expected _wxGrid_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxGrid_ForceRefresh(_arg0); + + wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxGrid_IsEditable(_swigobj) (_swigobj->IsEditable()) static PyObject *_wrap_wxGrid_IsEditable(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -13834,6 +13862,7 @@ static PyMethodDef gridcMethods[] = { { "wxGrid_EnableCellEditControl", (PyCFunction) _wrap_wxGrid_EnableCellEditControl, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_EnableEditing", (PyCFunction) _wrap_wxGrid_EnableEditing, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_IsEditable", (PyCFunction) _wrap_wxGrid_IsEditable, METH_VARARGS | METH_KEYWORDS }, + { "wxGrid_ForceRefresh", (PyCFunction) _wrap_wxGrid_ForceRefresh, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_GetBatchCount", (PyCFunction) _wrap_wxGrid_GetBatchCount, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_EndBatch", (PyCFunction) _wrap_wxGrid_EndBatch, METH_VARARGS | METH_KEYWORDS }, { "wxGrid_BeginBatch", (PyCFunction) _wrap_wxGrid_BeginBatch, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py index 723c0e0a0a..04c9de468f 100644 --- a/wxPython/src/msw/grid.py +++ b/wxPython/src/msw/grid.py @@ -903,6 +903,9 @@ class wxGridPtr(wxScrolledWindowPtr): def GetBatchCount(self, *_args, **_kwargs): val = apply(gridc.wxGrid_GetBatchCount,(self,) + _args, _kwargs) return val + def ForceRefresh(self, *_args, **_kwargs): + val = apply(gridc.wxGrid_ForceRefresh,(self,) + _args, _kwargs) + return val def IsEditable(self, *_args, **_kwargs): val = apply(gridc.wxGrid_IsEditable,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/msw/misc2.cpp b/wxPython/src/msw/misc2.cpp index 21a8d86023..752038f2f5 100644 --- a/wxPython/src/msw/misc2.cpp +++ b/wxPython/src/msw/misc2.cpp @@ -119,14 +119,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { return wxSystemSettings::GetSystemMetric(index); } - void wxToolTip_Enable(bool flag) { - wxToolTip::Enable(flag); - } - - void wxToolTip_SetDelay(long milliseconds) { - wxToolTip::SetDelay(milliseconds); - } - int wxCaret_GetBlinkTime() { return wxCaret::GetBlinkTime(); } @@ -1693,44 +1685,6 @@ static PyObject *_wrap_wxSystemSettings_GetSystemMetric(PyObject *self, PyObject return _resultobj; } -static PyObject *_wrap_wxToolTip_Enable(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _arg0; - int tempbool0; - char *_kwnames[] = { "flag", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxToolTip_Enable",_kwnames,&tempbool0)) - return NULL; - _arg0 = (bool ) tempbool0; -{ - wxPy_BEGIN_ALLOW_THREADS; - wxToolTip_Enable(_arg0); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -static PyObject *_wrap_wxToolTip_SetDelay(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - long _arg0; - char *_kwnames[] = { "milliseconds", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"l:wxToolTip_SetDelay",_kwnames,&_arg0)) - return NULL; -{ - wxPy_BEGIN_ALLOW_THREADS; - wxToolTip_SetDelay(_arg0); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - static PyObject *_wrap_wxCaret_GetBlinkTime(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; int _result; @@ -2646,6 +2600,44 @@ static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args, PyObj return _resultobj; } +static PyObject *_wrap_wxToolTip_Enable(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _arg0; + int tempbool0; + char *_kwnames[] = { "flag", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxToolTip_Enable",_kwnames,&tempbool0)) + return NULL; + _arg0 = (bool ) tempbool0; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxToolTip::Enable(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxToolTip_SetDelay(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + long _arg0; + char *_kwnames[] = { "milliseconds", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"l:wxToolTip_SetDelay",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxToolTip::SetDelay(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define new_wxCaret(_swigarg0,_swigarg1) (new wxCaret(_swigarg0,_swigarg1)) static PyObject *_wrap_new_wxCaret(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -7205,6 +7197,8 @@ static PyMethodDef misc2cMethods[] = { { "wxCaret_IsOk", (PyCFunction) _wrap_wxCaret_IsOk, METH_VARARGS | METH_KEYWORDS }, { "delete_wxCaret", (PyCFunction) _wrap_delete_wxCaret, METH_VARARGS | METH_KEYWORDS }, { "new_wxCaret", (PyCFunction) _wrap_new_wxCaret, METH_VARARGS | METH_KEYWORDS }, + { "wxToolTip_SetDelay", (PyCFunction) _wrap_wxToolTip_SetDelay, METH_VARARGS | METH_KEYWORDS }, + { "wxToolTip_Enable", (PyCFunction) _wrap_wxToolTip_Enable, METH_VARARGS | METH_KEYWORDS }, { "wxToolTip_GetWindow", (PyCFunction) _wrap_wxToolTip_GetWindow, METH_VARARGS | METH_KEYWORDS }, { "wxToolTip_GetTip", (PyCFunction) _wrap_wxToolTip_GetTip, METH_VARARGS | METH_KEYWORDS }, { "wxToolTip_SetTip", (PyCFunction) _wrap_wxToolTip_SetTip, METH_VARARGS | METH_KEYWORDS }, @@ -7237,8 +7231,6 @@ static PyMethodDef misc2cMethods[] = { { "wxSafeYield", (PyCFunction) _wrap_wxSafeYield, METH_VARARGS | METH_KEYWORDS }, { "wxCaret_SetBlinkTime", (PyCFunction) _wrap_wxCaret_SetBlinkTime, METH_VARARGS | METH_KEYWORDS }, { "wxCaret_GetBlinkTime", (PyCFunction) _wrap_wxCaret_GetBlinkTime, METH_VARARGS | METH_KEYWORDS }, - { "wxToolTip_SetDelay", (PyCFunction) _wrap_wxToolTip_SetDelay, METH_VARARGS | METH_KEYWORDS }, - { "wxToolTip_Enable", (PyCFunction) _wrap_wxToolTip_Enable, METH_VARARGS | METH_KEYWORDS }, { "wxSystemSettings_GetSystemMetric", (PyCFunction) _wrap_wxSystemSettings_GetSystemMetric, METH_VARARGS | METH_KEYWORDS }, { "wxSystemSettings_GetSystemFont", (PyCFunction) _wrap_wxSystemSettings_GetSystemFont, METH_VARARGS | METH_KEYWORDS }, { "wxSystemSettings_GetSystemColour", (PyCFunction) _wrap_wxSystemSettings_GetSystemColour, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/misc2.py b/wxPython/src/msw/misc2.py index c52a0c9924..560ac688d2 100644 --- a/wxPython/src/msw/misc2.py +++ b/wxPython/src/msw/misc2.py @@ -766,10 +766,6 @@ def wxSystemSettings_GetSystemFont(*_args, **_kwargs): wxSystemSettings_GetSystemMetric = misc2c.wxSystemSettings_GetSystemMetric -wxToolTip_Enable = misc2c.wxToolTip_Enable - -wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay - wxCaret_GetBlinkTime = misc2c.wxCaret_GetBlinkTime wxCaret_SetBlinkTime = misc2c.wxCaret_SetBlinkTime @@ -844,6 +840,10 @@ def wxWaveData(*_args, **_kwargs): if val: val = wxWavePtr(val); val.thisown = 1 return val +wxToolTip_Enable = misc2c.wxToolTip_Enable + +wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay + wxLog_IsEnabled = misc2c.wxLog_IsEnabled wxLog_EnableLogging = misc2c.wxLog_EnableLogging -- 2.45.2