From eec92d76f8798c69f117315a7b41d08b769e31e0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 31 Jan 2000 21:07:04 +0000 Subject: [PATCH 1/1] Some minor updates, fixes, etc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/BUILD.txt | 46 ++- utils/wxPython/CHANGES.txt | 2 + utils/wxPython/demo/.cvsignore | 1 + utils/wxPython/demo/wxButton.py | 6 +- utils/wxPython/demo/wxHtmlWindow.py | 8 +- utils/wxPython/demo/wxNotebook.py | 95 +++-- utils/wxPython/demo/wxRadioBox.py | 9 +- utils/wxPython/demo/wxScrolledWindow.py | 9 + utils/wxPython/distrib/autobuild.py | 9 +- utils/wxPython/distrib/build.py | 2 +- utils/wxPython/distrib/wxPython.wse | 6 +- utils/wxPython/lib/buttons.py | 5 +- utils/wxPython/lib/grids.py | 3 + utils/wxPython/modules/html/htmlhelp.cpp | 96 ----- utils/wxPython/modules/html/htmlhelp.i | 8 +- utils/wxPython/modules/html/htmlhelp.py | 3 - utils/wxPython/modules/ogl/oglshapes.cpp | 114 ++++-- utils/wxPython/modules/ogl/oglshapes.i | 12 +- utils/wxPython/modules/ogl/oglshapes.py | 2 + utils/wxPython/src/_extras.py | 6 - utils/wxPython/src/cmndlgs.i | 4 +- utils/wxPython/src/controls.i | 16 +- utils/wxPython/src/events.i | 2 +- utils/wxPython/src/frames.i | 2 +- utils/wxPython/src/gdi.i | 43 ++- utils/wxPython/src/misc.i | 2 +- utils/wxPython/src/misc2.i | 8 +- utils/wxPython/src/msw/clip_dnd.cpp | 4 +- utils/wxPython/src/msw/cmndlgs.cpp | 24 +- utils/wxPython/src/msw/controls.cpp | 44 +-- utils/wxPython/src/msw/controls2.cpp | 10 +- utils/wxPython/src/msw/events.cpp | 16 +- utils/wxPython/src/msw/events.py | 2 +- utils/wxPython/src/msw/frames.cpp | 4 +- utils/wxPython/src/msw/gdi.cpp | 450 ++++++++++++++++++++++- utils/wxPython/src/msw/gdi.py | 38 ++ utils/wxPython/src/msw/image.cpp | 6 +- utils/wxPython/src/msw/misc.cpp | 6 +- utils/wxPython/src/msw/misc2.cpp | 68 +--- utils/wxPython/src/msw/misc2.py | 6 - utils/wxPython/src/msw/printfw.cpp | 2 +- utils/wxPython/src/msw/stattool.cpp | 12 +- utils/wxPython/src/msw/windows.cpp | 26 +- utils/wxPython/src/msw/windows2.cpp | 8 +- utils/wxPython/src/msw/wx.cpp | 6 +- utils/wxPython/src/msw/wx.py | 17 +- utils/wxPython/src/my_typemaps.i | 77 ++-- utils/wxPython/src/stattool.i | 2 +- utils/wxPython/tests/.cvsignore | 2 + 49 files changed, 887 insertions(+), 462 deletions(-) diff --git a/utils/wxPython/BUILD.txt b/utils/wxPython/BUILD.txt index 210a1e1a15..6d95d40008 100644 --- a/utils/wxPython/BUILD.txt +++ b/utils/wxPython/BUILD.txt @@ -21,8 +21,11 @@ below.) 1. Build and install wxWindows as described in its BuildCVS.txt or - INSTALL.txt file. For *nix systems I run configure with these - flags: + INSTALL.txt file. + +1a. Building wxWindows on Unix/Linux. + + For *nix systems I run configure with these flags: --with-gtk --with-libjpeg @@ -34,12 +37,42 @@ below.) --enable-shared=yes --disable-std_iostreams - You can use whatever flags you want, but these work for me. + You can use whatever flags you want, but these work for me. be + sure to run "make install" to install the wxWindows headers and + shared library. You can check where the wxPython build will expect + to find them by running "wx-config --cflags" and "wx-config --libs" + +1b. Building wxWindows on Win32. For Win32 systems I use Visual C++ 6.0, but 5.0 should work. The wxPython build utility currently does not support any other win32 compilers. Be sure to copy include/wx/msw/setup0.h to - include/wx/msw/setup.h and edit it for the options you want. + include/wx/msw/setup.h and edit it for the options you want. At a + minimum you should set the following: + + wxUSE_NEW_GRID 0 + wxUSE_GLOBAL_MEMORY_OPERATORS 0 + wxUSE_LIBTIFF 1 + + I also change these: + + wxUSE_DIALUP_MANAGER 0 + wxUSE_SOCKETS 0 + wxUSE_FS_INET 0 + + There are probably other flags that can be disabled to remove + things not being used in wxPython, but I havn't investigated all + the potential configurations yet. + + I find it easiest to build wxWindows using the makefiles, that way + I don't have to worry about what the IDE might be doing behind the + scenes that might screw things up. Simply go to the src/msw + directory and run: + + nmake -f makefile.vc CRTFLAG=/MD EXTRAFLAGS=-D__NO_VC_CRTDBG__ dll pch + + If you want to make a release build, add FINAL=1 to the nmake + command, as well as to build.local for wxPython, (see below.) 2. For either platform, you should be sure to set an environment @@ -113,8 +146,3 @@ below.) To run it without requiring a console on win32, you can use the pythonw.exe version of Python either from the command line or from a shortcut. - - - - - diff --git a/utils/wxPython/CHANGES.txt b/utils/wxPython/CHANGES.txt index 704e4bc728..172cdaa938 100644 --- a/utils/wxPython/CHANGES.txt +++ b/utils/wxPython/CHANGES.txt @@ -75,6 +75,8 @@ Added some missing EVT_ functions. Added Dirk Holtwic's editor classes to the wxPython.lib.editor package. +Changed all the "LIST" parameter names to "choices" to match the docs. + diff --git a/utils/wxPython/demo/.cvsignore b/utils/wxPython/demo/.cvsignore index a0a19f67a4..dd4052d12f 100644 --- a/utils/wxPython/demo/.cvsignore +++ b/utils/wxPython/demo/.cvsignore @@ -2,4 +2,5 @@ .emacs.desktop hangman_dict.txt setup.bat +test.out tmphtml.txt diff --git a/utils/wxPython/demo/wxButton.py b/utils/wxPython/demo/wxButton.py index d65cafd59d..758c8907df 100644 --- a/utils/wxPython/demo/wxButton.py +++ b/utils/wxPython/demo/wxButton.py @@ -18,8 +18,10 @@ class TestPanel(wxPanel): EVT_BUTTON(self, 20, self.OnClick) bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP) - mask = wxMaskColour(bmp, wxBLUE) - bmp.SetMask(mask) + # the mask is still having troubles on win95/98... + #mask = wxMaskColour(bmp, wxBLUE) + #bmp.SetMask(mask) + wxBitmapButton(self, 30, bmp, wxPoint(140, 20), wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10)) EVT_BUTTON(self, 30, self.OnClick) diff --git a/utils/wxPython/demo/wxHtmlWindow.py b/utils/wxPython/demo/wxHtmlWindow.py index 15d437e4b9..5991378be8 100644 --- a/utils/wxPython/demo/wxHtmlWindow.py +++ b/utils/wxPython/demo/wxHtmlWindow.py @@ -18,7 +18,7 @@ class MyHtmlWindow(wxHtmlWindow): def OnLinkClicked(self, linkinfo): self.log.WriteText('OnLinkClicked: %s\n' % linkinfo.GetHref()) - # Virtuals in the base class have been renamed with base_ on the font. + # Virtuals in the base class have been renamed with base_ on the front. self.base_OnLinkClicked(linkinfo) @@ -26,6 +26,8 @@ class MyHtmlWindow(wxHtmlWindow): self.log.WriteText('OnSetTitle: %s\n' % title) self.base_OnSetTitle(title) + def __del__(self): + print 'MyHtmlWindow.__del__' class TestHtmlPanel(wxPanel): @@ -37,7 +39,6 @@ class TestHtmlPanel(wxPanel): if not self.cwd: self.cwd = os.getcwd() - self.html = MyHtmlWindow(self, -1, log) self.html.SetRelatedFrame(frame, "wxPython: (A Demonstration) -- %s") self.html.SetRelatedStatusBar(0) @@ -86,6 +87,9 @@ class TestHtmlPanel(wxPanel): self.OnShowDefault(None) + def __del__(self): + print 'TestHtmlPanel.__del__' + def OnShowDefault(self, event): diff --git a/utils/wxPython/demo/wxNotebook.py b/utils/wxPython/demo/wxNotebook.py index 18640e07d2..fb18f41b9a 100644 --- a/utils/wxPython/demo/wxNotebook.py +++ b/utils/wxPython/demo/wxNotebook.py @@ -8,55 +8,65 @@ import wxScrolledWindow #---------------------------------------------------------------------------- -def runTest(frame, nb, log): +class TestNB(wxNotebook): + def __init__(self, parent, id, log): + wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM) + self.log = log - testWin = wxNotebook(nb, -1, style=wxNB_BOTTOM) + win = ColorPanel.ColoredPanel(self, wxBLUE) + self.AddPage(win, "Blue") + st = wxStaticText(win, -1, + "You can put nearly any type of window here,\n" + "and the tabs can be on any side... (look below.)", + wxPoint(10, 10)) + st.SetForegroundColour(wxWHITE) + st.SetBackgroundColour(wxBLUE) - win = ColorPanel.ColoredPanel(testWin, wxBLUE) - testWin.AddPage(win, "Blue") - st = wxStaticText(win, -1, - "You can put nearly any type of window here,\n" - "and the tabs can be on any side... (look below.)", - wxPoint(10, 10)) - st.SetForegroundColour(wxWHITE) - st.SetBackgroundColour(wxBLUE) + win = ColorPanel.ColoredPanel(self, wxRED) + self.AddPage(win, "Red") - win = ColorPanel.ColoredPanel(testWin, wxRED) - testWin.AddPage(win, "Red") + win = wxScrolledWindow.MyCanvas(self) + self.AddPage(win, 'ScrolledWindow') - win = wxScrolledWindow.MyCanvas(testWin) - testWin.AddPage(win, 'ScrolledWindow') + win = ColorPanel.ColoredPanel(self, wxGREEN) + self.AddPage(win, "Green") - win = ColorPanel.ColoredPanel(testWin, wxGREEN) - testWin.AddPage(win, "Green") + win = wxGrid.TestGrid(self, log) + self.AddPage(win, "Grid") - win = wxGrid.TestGrid(testWin, log) - testWin.AddPage(win, "Grid") + win = wxListCtrl.TestListCtrlPanel(self, log) + self.AddPage(win, 'List') - win = wxListCtrl.TestListCtrlPanel(testWin, log) - testWin.AddPage(win, 'List') + win = ColorPanel.ColoredPanel(self, wxCYAN) + self.AddPage(win, "Cyan") - win = ColorPanel.ColoredPanel(testWin, wxCYAN) - testWin.AddPage(win, "Cyan") + win = ColorPanel.ColoredPanel(self, wxWHITE) + self.AddPage(win, "White") - win = ColorPanel.ColoredPanel(testWin, wxWHITE) - testWin.AddPage(win, "White") + win = ColorPanel.ColoredPanel(self, wxBLACK) + self.AddPage(win, "Black") - win = ColorPanel.ColoredPanel(testWin, wxBLACK) - testWin.AddPage(win, "Black") + win = ColorPanel.ColoredPanel(self, wxNamedColour('MIDNIGHT BLUE')) + self.AddPage(win, "MIDNIGHT BLUE") - win = ColorPanel.ColoredPanel(testWin, wxNamedColour('MIDNIGHT BLUE')) - testWin.AddPage(win, "MIDNIGHT BLUE") + win = ColorPanel.ColoredPanel(self, wxNamedColour('INDIAN RED')) + self.AddPage(win, "INDIAN RED") - win = ColorPanel.ColoredPanel(testWin, wxNamedColour('INDIAN RED')) - testWin.AddPage(win, "INDIAN RED") + EVT_NOTEBOOK_PAGE_CHANGED(self, self.GetId(), self.OnPageChanged) - return testWin -#---------------------------------------------------------------------------- + def OnPageChanged(self, event): + self.log.write('OnPageChanged\n') + event.Skip() +#---------------------------------------------------------------------------- +def runTest(frame, nb, log): + testWin = TestNB(nb, -1, log) + return testWin + +#---------------------------------------------------------------------------- @@ -74,25 +84,4 @@ This class represents a notebook control, which manages multiple windows with as To use the class, create a wxNotebook object and call AddPage or InsertPage, passing a window to be used as the page. Do not explicitly delete the window for a page that is currently managed by wxNotebook. -wxNotebook() -------------------------- - -Default constructor. - -wxNotebook(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size, long style = 0, const wxString& name = "notebook") - -Constructs a notebook control. - -Parameters -------------------- - -parent = The parent window. Must be non-NULL. - -id = The window identifier. - -pos = The window position. - -size = The window size. - -style = The window style. Its value is a bit list of zero or more of wxTC_MULTILINE, wxTC_RIGHTJUSTIFY, wxTC_FIXEDWIDTH and wxTC_OWNERDRAW. """ diff --git a/utils/wxPython/demo/wxRadioBox.py b/utils/wxPython/demo/wxRadioBox.py index 3fa4904172..0b734d23ff 100644 --- a/utils/wxPython/demo/wxRadioBox.py +++ b/utils/wxPython/demo/wxRadioBox.py @@ -7,6 +7,7 @@ class TestRadioButtons(wxPanel): def __init__(self, parent, log): self.log = log wxPanel.__init__(self, parent, -1) + #self.SetBackgroundColour(wxBLUE) sampleList = ['zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight'] @@ -14,11 +15,15 @@ class TestRadioButtons(wxPanel): rb = wxRadioBox(self, 30, "wxRadioBox", wxPoint(35, 30), wxDefaultSize, sampleList, 3, wxRA_SPECIFY_COLS) EVT_RADIOBOX(self, 30, self.EvtRadioBox) + #rb.SetBackgroundColour(wxBLUE) + rb.SetToolTip(wxToolTip("This is a ToolTip!")) + wxRadioButton(self, 32, "wxRadioButton", (235, 35)) + wxRadioButton(self, 33, "wxRadioButton", (235, 55)) - rb = wxRadioBox(self, 30, "", wxPoint(35, 120), wxDefaultSize, + rb = wxRadioBox(self, 35, "", wxPoint(35, 120), wxDefaultSize, sampleList, 3, wxRA_SPECIFY_COLS | wxNO_BORDER) - EVT_RADIOBOX(self, 30, self.EvtRadioBox) + EVT_RADIOBOX(self, 35, self.EvtRadioBox) def EvtRadioBox(self, event): diff --git a/utils/wxPython/demo/wxScrolledWindow.py b/utils/wxPython/demo/wxScrolledWindow.py index b51757f6c2..d04508458f 100644 --- a/utils/wxPython/demo/wxScrolledWindow.py +++ b/utils/wxPython/demo/wxScrolledWindow.py @@ -73,10 +73,19 @@ class MyCanvas(wxScrolledWindow): for a in range(0, 360, 45): dc.DrawRotatedText("Rotated text...", 300, 300, a) + dc.SetPen(wxTRANSPARENT_PEN) + dc.SetBrush(wxBLUE_BRUSH) + dc.DrawRectangle(50,500,50,50) + dc.DrawRectangle(100,500,50,50) + + #from wxPython import dch + #dch.FillRect(dc, wxRect(50, 400, 50, 50), wxBLACK) + self.DrawSavedLines(dc) dc.EndDrawing() + def DrawSavedLines(self, dc): dc.SetPen(wxPen(wxNamedColour('MEDIUM FOREST GREEN'), 4)) for line in self.lines: diff --git a/utils/wxPython/distrib/autobuild.py b/utils/wxPython/distrib/autobuild.py index a7c5ad2b6b..8af6ed3f2d 100644 --- a/utils/wxPython/distrib/autobuild.py +++ b/utils/wxPython/distrib/autobuild.py @@ -6,8 +6,8 @@ from ftplib import FTP logfile = 'e:\\temp\\autobuild.log' WXDIR = os.environ['WXWIN'] -dllVer = '21_11' -wxpVer = '2.1.11' +dllVer = '21_12' +wxpVer = '2.1.12' dateSt = time.strftime("%Y%m%d", time.localtime(time.time())) #---------------------------------------------------------------------- @@ -128,7 +128,9 @@ FINAL=1 destName = WXDIR+'\\utils\\wxPython\\distrib\\wxPython-'+wxpVer+'-'+dateSt+'.EXE' validateFile(srcName) try: + time.sleep(5) os.rename(srcName, destName) + validateFile(destName) except: pass @@ -145,6 +147,9 @@ FINAL=1 pass + + return + logSeparator("Uploading to website...") do('python d:\util32\sendwxp.py %s' % destName) do('python d:\util32\sendwxp.py %s' % destZName) diff --git a/utils/wxPython/distrib/build.py b/utils/wxPython/distrib/build.py index 5b4692ceca..243eef4e9c 100755 --- a/utils/wxPython/distrib/build.py +++ b/utils/wxPython/distrib/build.py @@ -604,7 +604,7 @@ $(CPPFLAGS) /c $< $(TARGET) : $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(RESFILE) $(link) @<< /out:$@ -$(LFLAGS) /def:$(MODULE).def /implib:./$(MODULE).lib +$(LFLAGS) /export:init$(MODULE) /implib:./$(MODULE).lib $(DUMMYOBJ) $(OBJECTS) $(RESFILE) $(LIBS) << diff --git a/utils/wxPython/distrib/wxPython.wse b/utils/wxPython/distrib/wxPython.wse index 81bc8ccee0..12dca79c7b 100644 --- a/utils/wxPython/distrib/wxPython.wse +++ b/utils/wxPython/distrib/wxPython.wse @@ -17,7 +17,7 @@ item: Global Patch Flags=0000000000001001 Patch Threshold=85 Patch Memory=4000 - EXE Filename=wxPython-2.1.11.exe + EXE Filename=wxPython-2.1.12.exe FTP Cluster Size=20 Per-User Version ID=1 Dialogs Version=6 @@ -815,8 +815,8 @@ item: Install File Flags=0000001010000011 end item: Install File - Source=e:\projects\wx\lib\wx21_11.dll - Destination=%SYS%\wx21_11.dll + Source=e:\projects\wx\lib\wx21_12.dll + Destination=%SYS%\wx21_12.dll Flags=0000001010010010 end item: Install File diff --git a/utils/wxPython/lib/buttons.py b/utils/wxPython/lib/buttons.py index 9c4a79110a..e02f28850e 100644 --- a/utils/wxPython/lib/buttons.py +++ b/utils/wxPython/lib/buttons.py @@ -232,6 +232,7 @@ class wxGenButton(wxControl): if self.hasFocus and self.useFocusInd: self.DrawFocusIndicator(dc, width, height) + def OnEraseBackground(self, event): pass @@ -293,6 +294,7 @@ class wxGenButton(wxControl): self.Refresh() event.Skip() + def OnKeyUp(self, event): if self.hasFocus and event.KeyCode() == ord(" "): self.up = true @@ -361,7 +363,8 @@ class wxGenBitmapButton(wxGenButton): bw,bh = bmp.GetWidth(), bmp.GetHeight() if not self.up: dw = dy = 1 - dc.DrawBitmap(bmp, (width-bw)/2+dw, (height-bh)/2+dy, true) + hasMask = bmp.GetMask() != None + dc.DrawBitmap(bmp, (width-bw)/2+dw, (height-bh)/2+dy, hasMask) diff --git a/utils/wxPython/lib/grids.py b/utils/wxPython/lib/grids.py index 12f866e427..2b26ec9ece 100644 --- a/utils/wxPython/lib/grids.py +++ b/utils/wxPython/lib/grids.py @@ -224,6 +224,9 @@ class wxFlexGridSizer(wxGridSizer): for idx in self.growableCols: self.colWidths[idx] = self.colWidths[idx] + delta + # bottom right corner + sz = wxSize(pt.x + sz.width, pt.y + sz.height) + # Layout each cell x = pt.x for c in range(ncols): diff --git a/utils/wxPython/modules/html/htmlhelp.cpp b/utils/wxPython/modules/html/htmlhelp.cpp index a86f271520..ca05dc43ee 100644 --- a/utils/wxPython/modules/html/htmlhelp.cpp +++ b/utils/wxPython/modules/html/htmlhelp.cpp @@ -1323,101 +1323,6 @@ static PyObject *_wrap_wxHtmlHelpData_AddBook(PyObject *self, PyObject *args, Py return _resultobj; } -#define wxHtmlHelpData_AddBookParam(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->AddBookParam(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) -static PyObject *_wrap_wxHtmlHelpData_AddBookParam(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - bool _result; - wxHtmlHelpData * _arg0; - wxString * _arg1; - wxString * _arg2; - wxString * _arg3 = (wxString *) &wxEmptyString; - wxString * _arg4 = (wxString *) &wxEmptyString; - wxString * _arg5 = (wxString *) &wxEmptyString; - PyObject * _argo0 = 0; - PyObject * _obj1 = 0; - PyObject * _obj2 = 0; - PyObject * _obj3 = 0; - PyObject * _obj4 = 0; - PyObject * _obj5 = 0; - char *_kwnames[] = { "self","title","contfile","indexfile","deftopic","path", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|OOO:wxHtmlHelpData_AddBookParam",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3,&_obj4,&_obj5)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlHelpData_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlHelpData_AddBookParam. Expected _wxHtmlHelpData_p."); - return NULL; - } - } -{ - if (!PyString_Check(_obj1)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1)); -} -{ - if (!PyString_Check(_obj2)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2)); -} - if (_obj3) -{ - if (!PyString_Check(_obj3)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg3 = new wxString(PyString_AsString(_obj3), PyString_Size(_obj3)); -} - if (_obj4) -{ - if (!PyString_Check(_obj4)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg4 = new wxString(PyString_AsString(_obj4), PyString_Size(_obj4)); -} - if (_obj5) -{ - if (!PyString_Check(_obj5)) { - PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); - return NULL; - } - _arg5 = new wxString(PyString_AsString(_obj5), PyString_Size(_obj5)); -} -{ - wxPy_BEGIN_ALLOW_THREADS; - _result = (bool )wxHtmlHelpData_AddBookParam(_arg0,*_arg1,*_arg2,*_arg3,*_arg4,*_arg5); - - wxPy_END_ALLOW_THREADS; -} _resultobj = Py_BuildValue("i",_result); -{ - if (_obj1) - delete _arg1; -} -{ - if (_obj2) - delete _arg2; -} -{ - if (_obj3) - delete _arg3; -} -{ - if (_obj4) - delete _arg4; -} -{ - if (_obj5) - delete _arg5; -} - return _resultobj; -} - #define wxHtmlHelpData_FindPageByName(_swigobj,_swigarg0) (_swigobj->FindPageByName(_swigarg0)) static PyObject *_wrap_wxHtmlHelpData_FindPageByName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2682,7 +2587,6 @@ static PyMethodDef htmlhelpcMethods[] = { { "wxHtmlHelpData_GetBookRecArray", (PyCFunction) _wrap_wxHtmlHelpData_GetBookRecArray, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlHelpData_FindPageById", (PyCFunction) _wrap_wxHtmlHelpData_FindPageById, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlHelpData_FindPageByName", (PyCFunction) _wrap_wxHtmlHelpData_FindPageByName, METH_VARARGS | METH_KEYWORDS }, - { "wxHtmlHelpData_AddBookParam", (PyCFunction) _wrap_wxHtmlHelpData_AddBookParam, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlHelpData_AddBook", (PyCFunction) _wrap_wxHtmlHelpData_AddBook, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlHelpData_SetTempDir", (PyCFunction) _wrap_wxHtmlHelpData_SetTempDir, METH_VARARGS | METH_KEYWORDS }, { "delete_wxHtmlHelpData", (PyCFunction) _wrap_delete_wxHtmlHelpData, METH_VARARGS | METH_KEYWORDS }, diff --git a/utils/wxPython/modules/html/htmlhelp.i b/utils/wxPython/modules/html/htmlhelp.i index 4b9dffcb4a..b4f99649b5 100644 --- a/utils/wxPython/modules/html/htmlhelp.i +++ b/utils/wxPython/modules/html/htmlhelp.i @@ -123,10 +123,10 @@ public: void SetTempDir(const wxString& path); bool AddBook(const wxString& book); - bool AddBookParam(const wxString& title, const wxString& contfile, - const wxString& indexfile=wxEmptyString, - const wxString& deftopic=wxEmptyString, - const wxString& path=wxEmptyString); +// bool AddBookParam(const wxString& title, const wxString& contfile, +// const wxString& indexfile=wxEmptyString, +// const wxString& deftopic=wxEmptyString, +// const wxString& path=wxEmptyString); wxString FindPageByName(const wxString& page); wxString FindPageById(int id); diff --git a/utils/wxPython/modules/html/htmlhelp.py b/utils/wxPython/modules/html/htmlhelp.py index d3219b72b3..a3634b13aa 100644 --- a/utils/wxPython/modules/html/htmlhelp.py +++ b/utils/wxPython/modules/html/htmlhelp.py @@ -201,9 +201,6 @@ class wxHtmlHelpDataPtr : def AddBook(self, *_args, **_kwargs): val = apply(htmlhelpc.wxHtmlHelpData_AddBook,(self,) + _args, _kwargs) return val - def AddBookParam(self, *_args, **_kwargs): - val = apply(htmlhelpc.wxHtmlHelpData_AddBookParam,(self,) + _args, _kwargs) - return val def FindPageByName(self, *_args, **_kwargs): val = apply(htmlhelpc.wxHtmlHelpData_FindPageByName,(self,) + _args, _kwargs) return val diff --git a/utils/wxPython/modules/ogl/oglshapes.cpp b/utils/wxPython/modules/ogl/oglshapes.cpp index ad63511b3d..c44a3d7f6c 100644 --- a/utils/wxPython/modules/ogl/oglshapes.cpp +++ b/utils/wxPython/modules/ogl/oglshapes.cpp @@ -1246,7 +1246,7 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawLines(PyObject *self, PyObject *args wxPoint * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST", NULL }; + char *_kwnames[] = { "self","points", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_DrawLines",_kwnames,&_argo0,&_obj2)) @@ -1295,7 +1295,7 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawPolygon(PyObject *self, PyObject *ar int _arg3 = (int ) 0; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST","flags", NULL }; + char *_kwnames[] = { "self","points","flags", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxPseudoMetaFile_DrawPolygon",_kwnames,&_argo0,&_obj2,&_arg3)) @@ -1343,7 +1343,7 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawSpline(PyObject *self, PyObject *arg wxPoint * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST", NULL }; + char *_kwnames[] = { "self","points", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_DrawSpline",_kwnames,&_argo0,&_obj2)) @@ -4061,7 +4061,7 @@ static PyObject *_wrap_wxPyBitmapShape_GetFilename(PyObject *self, PyObject *arg wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -5461,7 +5461,7 @@ static PyObject *_wrap_wxPyDrawnShape_DrawLines(PyObject *self, PyObject *args, wxPoint * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST", NULL }; + char *_kwnames[] = { "self","points", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_DrawLines",_kwnames,&_argo0,&_obj2)) @@ -5545,7 +5545,7 @@ static PyObject *_wrap_wxPyDrawnShape_DrawPolygon(PyObject *self, PyObject *args int _arg3 = (int ) 0; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST","flags", NULL }; + char *_kwnames[] = { "self","points","flags", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxPyDrawnShape_DrawPolygon",_kwnames,&_argo0,&_obj2,&_arg3)) @@ -5664,7 +5664,7 @@ static PyObject *_wrap_wxPyDrawnShape_DrawSpline(PyObject *self, PyObject *args, wxPoint * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST", NULL }; + char *_kwnames[] = { "self","points", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_DrawSpline",_kwnames,&_argo0,&_obj2)) @@ -10506,7 +10506,7 @@ static PyObject *_wrap_wxPyDivisionShape_GetLeftSideColour(PyObject *self, PyObj wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -12404,9 +12404,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_signed_long","_long",0}, { "_wxMenuEvent","_class_wxMenuEvent",0}, { "_class_wxJPEGHandler","_wxJPEGHandler",0}, + { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0}, + { "_wxBitmapDataObject","_class_wxBitmapDataObject",0}, { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, { "_wxBMPHandler","_class_wxBMPHandler",0}, { "_wxImage","_class_wxImage",0}, + { "_wxPrintQuality","_wxCoord",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, { "_wxPrintQuality","_unsigned_int",0}, @@ -12414,9 +12417,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_uint",0}, { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, + { "_class_wxCustomDataObject","_wxCustomDataObject",0}, { "_wxFontData","_class_wxFontData",0}, - { "___wxPyCleanup","_class___wxPyCleanup",0}, { "_class_wxRegionIterator","_wxRegionIterator",0}, + { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0}, { "_class_wxMenuBar","_wxMenuBar",0}, { "_class_wxPyTreeItemData","_wxPyTreeItemData",0}, { "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0}, @@ -12444,6 +12448,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxPyRectangleShape","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyRectangleShape}, { "_class_wxPyRectangleShape","_wxPyControlPoint",SwigwxPyControlPointTowxPyRectangleShape}, { "_class_wxPyRectangleShape","_wxPyRectangleShape",0}, + { "_class_wxToolBarBase","_wxToolBarBase",0}, { "_class_wxTreeCtrl","_wxTreeCtrl",0}, { "_wxMask","_class_wxMask",0}, { "_wxToolTip","_class_wxToolTip",0}, @@ -12457,26 +12462,33 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPen","_class_wxPen",0}, { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0}, { "_byte","_unsigned_char",0}, + { "_wxDataObject","_class_wxDataObject",0}, + { "_class_wxPyFontEnumerator","_wxPyFontEnumerator",0}, { "_wxStaticBox","_class_wxStaticBox",0}, + { "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0}, + { "_wxPyDropSource","_class_wxPyDropSource",0}, { "_wxChoice","_class_wxChoice",0}, { "_wxSlider","_class_wxSlider",0}, { "_wxNotebookEvent","_class_wxNotebookEvent",0}, { "_wxPyPrintout","_class_wxPyPrintout",0}, { "_wxShapeRegion","_class_wxShapeRegion",0}, - { "_long","_wxDash",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, { "_wxImageList","_class_wxImageList",0}, + { "_wxDataObjectSimple","_class_wxDataObjectSimple",0}, { "_wxDropFilesEvent","_class_wxDropFilesEvent",0}, { "_wxBitmapButton","_class_wxBitmapButton",0}, { "_wxSashWindow","_class_wxSashWindow",0}, { "_class_wxSizer","_wxSizer",0}, + { "_class_wxTIFFHandler","_wxTIFFHandler",0}, { "_class_wxPrintDialogData","_wxPrintDialogData",0}, { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, + { "_class_wxClipboard","_wxClipboard",0}, { "_class_wxGauge","_wxGauge",0}, { "_class_wxSashEvent","_wxSashEvent",0}, { "_wxDC","_class_wxDC",0}, { "_wxSizerItem","_class_wxSizerItem",0}, + { "_class_wxBitmapDataObject","_wxBitmapDataObject",0}, { "_wxListEvent","_class_wxListEvent",0}, { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0}, { "_wxProgressDialog","_class_wxProgressDialog",0}, @@ -12485,13 +12497,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxSpinEvent","_class_wxSpinEvent",0}, { "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0}, { "_wxPyBitmapShape","_class_wxPyBitmapShape",0}, + { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_unsigned_int",0}, { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, { "_class_wxRealPoint","_wxRealPoint",0}, - { "_wxPrinterDC","_class_wxPrinterDC",0}, + { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0}, + { "_wxPNMHandler","_class_wxPNMHandler",0}, + { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0}, { "_class_wxPyShapeEvtHandler","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShapeEvtHandler}, { "_class_wxPyShapeEvtHandler","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShapeEvtHandler}, { "_class_wxPyShapeEvtHandler","_class_wxPyDividedShape",SwigwxPyDividedShapeTowxPyShapeEvtHandler}, @@ -12516,23 +12531,28 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxPyCompositeShape","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyCompositeShape}, { "_class_wxPyCompositeShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyCompositeShape}, { "_class_wxPyCompositeShape","_wxPyCompositeShape",0}, + { "_class_wxPostScriptDC","_wxPostScriptDC",0}, { "_wxPanel","_class_wxPanel",0}, { "_wxInitDialogEvent","_class_wxInitDialogEvent",0}, { "_wxCheckBox","_class_wxCheckBox",0}, { "_wxPyEvent","_class_wxPyEvent",0}, { "_wxTextCtrl","_class_wxTextCtrl",0}, { "_class_wxMask","_wxMask",0}, - { "_class_wxToolTip","_wxToolTip",0}, + { "_wxTextDataObject","_class_wxTextDataObject",0}, { "_class_wxKeyEvent","_wxKeyEvent",0}, + { "_class_wxToolTip","_wxToolTip",0}, { "_class_wxGrid","_wxGrid",0}, { "_class_wxPNGHandler","_wxPNGHandler",0}, { "_wxColour","_class_wxColour",0}, { "_class_wxDialog","_wxDialog",0}, + { "_wxBusyCursor","_class_wxBusyCursor",0}, { "_wxPageSetupDialog","_class_wxPageSetupDialog",0}, { "_class_wxPrinter","_wxPrinter",0}, + { "_class_wxFileDataObject","_wxFileDataObject",0}, { "_wxIdleEvent","_class_wxIdleEvent",0}, { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0}, { "_wxToolBar","_class_wxToolBar",0}, + { "_class_wxDataObject","_wxDataObject",0}, { "_wxCaret","_class_wxCaret",0}, { "_wxStaticLine","_class_wxStaticLine",0}, { "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0}, @@ -12540,9 +12560,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxMiniFrame","_class_wxMiniFrame",0}, { "_class_wxNotebookEvent","_wxNotebookEvent",0}, { "_class_wxPyPrintout","_wxPyPrintout",0}, + { "_wxDataFormat","_class_wxDataFormat",0}, + { "_class_wxDataObjectSimple","_wxDataObjectSimple",0}, { "_class_wxSashWindow","_wxSashWindow",0}, { "_wxShowEvent","_class_wxShowEvent",0}, { "_class_wxPyDivisionShape","_wxPyDivisionShape",0}, + { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_size_t",0}, { "_uint","_unsigned_int",0}, @@ -12563,17 +12586,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxButton","_wxButton",0}, { "_wxRadioBox","_class_wxRadioBox",0}, { "_class_wxFontData","_wxFontData",0}, + { "_class_wxPNMHandler","_wxPNMHandler",0}, { "_wxBoxSizer","_class_wxBoxSizer",0}, - { "_class___wxPyCleanup","___wxPyCleanup",0}, { "_wxBitmap","_class_wxBitmap",0}, - { "_wxTaskBarIcon","_class_wxTaskBarIcon",0}, + { "_char","_wxDash",0}, { "_wxPrintDialog","_class_wxPrintDialog",0}, { "_wxPyControlPoint","_class_wxPyControlPoint",0}, { "_wxPyTimer","_class_wxPyTimer",0}, { "_wxWindowDC","_class_wxWindowDC",0}, { "_wxScrollBar","_class_wxScrollBar",0}, { "_wxSpinButton","_class_wxSpinButton",0}, - { "_wxToolBarTool","_class_wxToolBarTool",0}, { "_wxColourDialog","_class_wxColourDialog",0}, { "_wxPrintData","_class_wxPrintData",0}, { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, @@ -12585,33 +12607,42 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxIconizeEvent","_wxIconizeEvent",0}, { "_class_wxStaticBitmap","_wxStaticBitmap",0}, { "_class_wxPyDrawnShape","_wxPyDrawnShape",0}, + { "_class_wxBusyCursor","_wxBusyCursor",0}, + { "_wxToolBarSimple","_class_wxToolBarSimple",0}, { "_wxMDIChildFrame","_class_wxMDIChildFrame",0}, { "_wxListItem","_class_wxListItem",0}, { "_class_wxPseudoMetaFile","_wxPseudoMetaFile",0}, { "_class_wxToolBar","_wxToolBar",0}, + { "_wxDropTarget","_class_wxDropTarget",0}, { "_class_wxStaticLine","_wxStaticLine",0}, { "_wxScrollEvent","_class_wxScrollEvent",0}, + { "_wxToolBarToolBase","_class_wxToolBarToolBase",0}, { "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0}, { "_class_wxShapeRegion","_wxShapeRegion",0}, + { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_class_wxRegion","_wxRegion",0}, + { "_class_wxDataFormat","_wxDataFormat",0}, { "_class_wxDropFilesEvent","_wxDropFilesEvent",0}, + { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0}, { "_class_wxPreviewFrame","_wxPreviewFrame",0}, { "_wxStaticText","_class_wxStaticText",0}, { "_wxFont","_class_wxFont",0}, + { "_class_wxPyDropTarget","_wxPyDropTarget",0}, { "_wxCloseEvent","_class_wxCloseEvent",0}, { "_class_wxSplitterEvent","_wxSplitterEvent",0}, { "_wxNotebook","_class_wxNotebook",0}, - { "_unsigned_long","_wxDash",0}, { "_unsigned_long","_long",0}, { "_class_wxRect","_wxRect",0}, { "_class_wxDC","_wxDC",0}, { "_wxScrollWinEvent","_class_wxScrollWinEvent",0}, { "_class_wxProgressDialog","_wxProgressDialog",0}, + { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0}, { "_wxPyApp","_class_wxPyApp",0}, + { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0}, { "_wxMDIParentFrame","_class_wxMDIParentFrame",0}, { "_class_wxTreeEvent","_wxTreeEvent",0}, { "_class_wxDirDialog","_wxDirDialog",0}, @@ -12625,22 +12656,25 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxComboBox","_class_wxComboBox",0}, { "_wxRadioButton","_class_wxRadioButton",0}, { "_class_wxMessageDialog","_wxMessageDialog",0}, + { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, { "_class_wxTextCtrl","_wxTextCtrl",0}, { "_wxLayoutConstraints","_class_wxLayoutConstraints",0}, - { "_wxMetaFileDC","_class_wxMetaFileDC",0}, + { "_class_wxTextDataObject","_wxTextDataObject",0}, { "_wxMenu","_class_wxMenu",0}, { "_class_wxMoveEvent","_wxMoveEvent",0}, { "_wxListBox","_class_wxListBox",0}, { "_wxScreenDC","_class_wxScreenDC",0}, + { "_class_wxToolBarSimple","_wxToolBarSimple",0}, { "_class_wxMDIChildFrame","_wxMDIChildFrame",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, { "_wxFileDialog","_class_wxFileDialog",0}, + { "_class_wxDropTarget","_wxDropTarget",0}, { "_class_wxCaret","_wxCaret",0}, { "_class_wxMDIClientWindow","_wxMDIClientWindow",0}, { "_class_wxBrush","_wxBrush",0}, @@ -12651,10 +12685,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxStaticText","_wxStaticText",0}, { "_wxPrintDialogData","_class_wxPrintDialogData",0}, { "_class_wxFont","_wxFont",0}, + { "_wxClipboard","_class_wxClipboard",0}, { "_class_wxPyValidator","_wxPyValidator",0}, { "_class_wxCloseEvent","_wxCloseEvent",0}, { "_wxSashEvent","_class_wxSashEvent",0}, + { "_wxBusyInfo","_class_wxBusyInfo",0}, { "_class_wxMenuEvent","_wxMenuEvent",0}, + { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0}, + { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0}, { "_wxClientDC","_class_wxClientDC",0}, { "_wxMouseEvent","_class_wxMouseEvent",0}, { "_wxListCtrl","_class_wxListCtrl",0}, @@ -12668,7 +12706,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, { "_wxMemoryDC","_class_wxMemoryDC",0}, - { "_class_wxTaskBarIcon","_wxTaskBarIcon",0}, + { "_wxPyTextDataObject","_class_wxPyTextDataObject",0}, { "_class_wxPrintDialog","_wxPrintDialog",0}, { "_class_wxPyControlPoint","_wxPyControlPoint",0}, { "_wxPaintDC","_class_wxPaintDC",0}, @@ -12676,9 +12714,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxFocusEvent","_wxFocusEvent",0}, { "_class_wxMaximizeEvent","_wxMaximizeEvent",0}, { "_wxStatusBar","_class_wxStatusBar",0}, - { "_class_wxToolBarTool","_wxToolBarTool",0}, { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, { "_class_wxCursor","_wxCursor",0}, + { "_wxPostScriptDC","_class_wxPostScriptDC",0}, + { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, { "_class_wxImageHandler","_wxImageHandler",0}, { "_wxPyShape","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShape}, { "_wxPyShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShape}, @@ -12698,10 +12737,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxScrolledWindow","_class_wxScrolledWindow",0}, { "_wxTreeItemId","_class_wxTreeItemId",0}, { "_unsigned_char","_byte",0}, - { "_class_wxMetaFileDC","_wxMetaFileDC",0}, { "_class_wxMenu","_wxMenu",0}, { "_wxControl","_class_wxControl",0}, { "_class_wxListBox","_wxListBox",0}, + { "_unsigned_int","_wxCoord",0}, { "_unsigned_int","_wxPrintQuality",0}, { "_unsigned_int","_size_t",0}, { "_unsigned_int","_uint",0}, @@ -12718,6 +12757,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_short","_signed_short",0}, { "_class_wxStaticBox","_wxStaticBox",0}, { "_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0}, + { "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0}, + { "_class_wxPyDropSource","_wxPyDropSource",0}, { "_class_wxScrollEvent","_wxScrollEvent",0}, { "_wxJoystickEvent","_class_wxJoystickEvent",0}, { "_class_wxChoice","_wxChoice",0}, @@ -12726,9 +12767,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxImageList","_wxImageList",0}, { "_class_wxBitmapButton","_wxBitmapButton",0}, { "_wxFrame","_class_wxFrame",0}, + { "_wxPCXHandler","_class_wxPCXHandler",0}, { "_wxPyDivisionShape","_class_wxPyDivisionShape",0}, + { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, { "_class_wxNotebook","_wxNotebook",0}, { "_wxJPEGHandler","_class_wxJPEGHandler",0}, + { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, { "_wxWindowID","_size_t",0}, { "_wxWindowID","_EBool",0}, @@ -12738,6 +12782,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowID","_unsigned_int",0}, { "_class_wxScrollWinEvent","_wxScrollWinEvent",0}, { "_class_wxSizerItem","_wxSizerItem",0}, + { "_int","_wxCoord",0}, { "_int","_wxPrintQuality",0}, { "_int","_size_t",0}, { "_int","_EBool",0}, @@ -12750,16 +12795,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxListEvent","_wxListEvent",0}, { "_class_wxPrintPreview","_wxPrintPreview",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, + { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0}, + { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0}, { "_wxButton","_class_wxButton",0}, { "_class_wxPyApp","_wxPyApp",0}, { "_wxSize","_class_wxSize",0}, { "_wxRegionIterator","_class_wxRegionIterator",0}, - { "_class_wxPrinterDC","_wxPrinterDC",0}, + { "_class_wxPyTextDataObject","_wxPyTextDataObject",0}, { "_class_wxMDIParentFrame","_wxMDIParentFrame",0}, { "_wxPyTreeItemData","_class_wxPyTreeItemData",0}, { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0}, { "_class_wxPaintDC","_wxPaintDC",0}, { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0}, + { "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0}, { "_class_wxInitDialogEvent","_wxInitDialogEvent",0}, { "_class_wxComboBox","_wxComboBox",0}, { "_class_wxRadioButton","_wxRadioButton",0}, @@ -12779,6 +12827,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxPyShape","_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShape}, { "_class_wxPyShape","_wxPyShape",0}, { "_wxValidator","_class_wxValidator",0}, + { "_wxToolBarBase","_class_wxToolBarBase",0}, { "_class_wxTreeItemId","_wxTreeItemId",0}, { "_wxTreeCtrl","_class_wxTreeCtrl",0}, { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, @@ -12792,7 +12841,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxPageSetupDialog","_wxPageSetupDialog",0}, { "_wxPalette","_class_wxPalette",0}, { "_class_wxIdleEvent","_wxIdleEvent",0}, + { "_wxCoord","_int",0}, + { "_wxCoord","_signed_int",0}, + { "_wxCoord","_unsigned_int",0}, + { "_wxCoord","_wxWindowID",0}, + { "_wxCoord","_uint",0}, + { "_wxCoord","_EBool",0}, + { "_wxCoord","_size_t",0}, + { "_wxCoord","_wxPrintQuality",0}, { "_wxEraseEvent","_class_wxEraseEvent",0}, + { "_wxDataObjectComposite","_class_wxDataObjectComposite",0}, { "_class_wxJoystickEvent","_wxJoystickEvent",0}, { "_class_wxMiniFrame","_wxMiniFrame",0}, { "_wxFontDialog","_class_wxFontDialog",0}, @@ -12801,19 +12859,25 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPreviewFrame","_class_wxPreviewFrame",0}, { "_wxSizer","_class_wxSizer",0}, { "_class_wxShowEvent","_wxShowEvent",0}, + { "_class_wxPCXHandler","_wxPCXHandler",0}, + { "_wxTIFFHandler","_class_wxTIFFHandler",0}, + { "_wxPyDropTarget","_class_wxPyDropTarget",0}, { "_wxActivateEvent","_class_wxActivateEvent",0}, { "_wxGauge","_class_wxGauge",0}, { "_class_wxCheckListBox","_wxCheckListBox",0}, + { "_class_wxBusyInfo","_wxBusyInfo",0}, { "_class_wxGridEvent","_wxGridEvent",0}, { "_class_wxCommandEvent","_wxCommandEvent",0}, { "_class_wxClientDC","_wxClientDC",0}, { "_class_wxSizeEvent","_wxSizeEvent",0}, { "_class_wxListCtrl","_wxListCtrl",0}, { "_class_wxPyDividedShape","_wxPyDividedShape",0}, + { "_wxCustomDataObject","_class_wxCustomDataObject",0}, { "_class_wxGridCell","_wxGridCell",0}, { "_class_wxSize","_wxSize",0}, { "_class_wxBitmap","_wxBitmap",0}, { "_class_wxMemoryDC","_wxMemoryDC",0}, + { "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0}, { "_wxMenuBar","_class_wxMenuBar",0}, { "_wxTreeEvent","_class_wxTreeEvent",0}, { "_wxDirDialog","_class_wxDirDialog",0}, @@ -12837,8 +12901,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxScrollBar","_wxScrollBar",0}, { "_class_wxColourDialog","_wxColourDialog",0}, { "_class_wxPrintData","_wxPrintData",0}, - { "_wxDash","_unsigned_long",0}, - { "_wxDash","_long",0}, + { "_wxDash","_char",0}, { "_wxPyRectangleShape","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyRectangleShape}, { "_wxPyRectangleShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyRectangleShape}, { "_wxPyRectangleShape","_class_wxPyDividedShape",SwigwxPyDividedShapeTowxPyRectangleShape}, @@ -12860,11 +12923,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxColourData","_class_wxColourData",0}, { "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0}, { "_class_wxPalette","_wxPalette",0}, + { "_wxFileDataObject","_class_wxFileDataObject",0}, { "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0}, { "_class_wxEraseEvent","_wxEraseEvent",0}, + { "_wxPyFontEnumerator","_class_wxPyFontEnumerator",0}, { "_wxMDIClientWindow","_class_wxMDIClientWindow",0}, + { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, + { "_class_wxToolBarToolBase","_wxToolBarToolBase",0}, { "_class_wxFontDialog","_wxFontDialog",0}, { "_wxWindow","_class_wxWindow",0}, + { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0}, { "_class_wxFrame","_wxFrame",0}, {0,0,0}}; diff --git a/utils/wxPython/modules/ogl/oglshapes.i b/utils/wxPython/modules/ogl/oglshapes.i index 2013e96245..316d90a4c6 100644 --- a/utils/wxPython/modules/ogl/oglshapes.i +++ b/utils/wxPython/modules/ogl/oglshapes.i @@ -84,9 +84,9 @@ public: void DrawEllipse(const wxRect& rect); void DrawPoint(const wxPoint& pt); void DrawText(const wxString& text, const wxPoint& pt); - void DrawLines(int LCOUNT, wxPoint* LIST); - void DrawPolygon(int LCOUNT, wxPoint* LIST, int flags = 0); - void DrawSpline(int LCOUNT, wxPoint* LIST); + void DrawLines(int PCOUNT, wxPoint* points); + void DrawPolygon(int PCOUNT, wxPoint* points, int flags = 0); + void DrawSpline(int PCOUNT, wxPoint* points); void SetClippingRect(const wxRect& rect); void DestroyClippingRect(); void SetPen(wxPen* pen, bool isOutline = FALSE); @@ -264,12 +264,12 @@ public: void DrawAtAngle(int angle); void DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle); void DrawLine(const wxPoint& point1, const wxPoint& point2); - void DrawLines(int LCOUNT, wxPoint* LIST); + void DrawLines(int PCOUNT, wxPoint* points); void DrawPoint(const wxPoint& point); - void DrawPolygon(int LCOUNT, wxPoint* LIST, int flags = 0); + void DrawPolygon(int PCOUNT, wxPoint* points, int flags = 0); void DrawRectangle(const wxRect& rect); void DrawRoundedRectangle(const wxRect& rect, double radius); - void DrawSpline(int LCOUNT, wxPoint* LIST); + void DrawSpline(int PCOUNT, wxPoint* points); void DrawText(const wxString& text, const wxPoint& point); int GetAngle(); diff --git a/utils/wxPython/modules/ogl/oglshapes.py b/utils/wxPython/modules/ogl/oglshapes.py index 027ab140cb..d0d712d51f 100644 --- a/utils/wxPython/modules/ogl/oglshapes.py +++ b/utils/wxPython/modules/ogl/oglshapes.py @@ -9,6 +9,8 @@ from windows import * from gdi import * +from clip_dnd import * + from events import * from mdi import * diff --git a/utils/wxPython/src/_extras.py b/utils/wxPython/src/_extras.py index cad11d21a1..24a2e61146 100644 --- a/utils/wxPython/src/_extras.py +++ b/utils/wxPython/src/_extras.py @@ -29,12 +29,6 @@ def _checkForCallback(obj, name, event, theID=-1): except: pass else: obj.Connect(theID, -1, event, cb) -## def _checkClassCallback(obj, name): -## try: cb = getattr(obj, name) -## except: pass -## else: obj._addCallback(name, cb) - - def _StdWindowCallbacks(win): _checkForCallback(win, "OnChar", wxEVT_CHAR) _checkForCallback(win, "OnSize", wxEVT_SIZE) diff --git a/utils/wxPython/src/cmndlgs.i b/utils/wxPython/src/cmndlgs.i index 5b51790333..dee7e09c4e 100644 --- a/utils/wxPython/src/cmndlgs.i +++ b/utils/wxPython/src/cmndlgs.i @@ -127,12 +127,12 @@ public: wxSingleChoiceDialog(wxWindow* parent, wxString* message, wxString* caption, - int LCOUNT, wxString* LIST, + int LCOUNT, wxString* choices, //char** clientData = NULL, long style = wxOK | wxCANCEL | wxCENTRE, wxPoint* pos = &wxPyDefaultPosition) { return new wxSingleChoiceDialog(parent, *message, *caption, - LCOUNT, LIST, NULL, style, *pos); + LCOUNT, choices, NULL, style, *pos); } } diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i index f695ceb0bb..931bfebd9d 100644 --- a/utils/wxPython/src/controls.i +++ b/utils/wxPython/src/controls.i @@ -174,7 +174,7 @@ public: wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, - int LCOUNT=0, wxString* LIST=NULL, + int LCOUNT=0, wxString* choices=NULL, long style = 0, const wxValidator& validator = wxPyDefaultValidator, char* name = "choice"); @@ -201,7 +201,7 @@ public: wxComboBox(wxWindow* parent, wxWindowID id, char* value = "", const wxPoint& pos = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, - int LCOUNT=0, wxString* LIST=NULL, + int LCOUNT=0, wxString* choices=NULL, long style = 0, const wxValidator& validator = wxPyDefaultValidator, char* name = "comboBox"); @@ -306,7 +306,7 @@ public: wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, - int LCOUNT, wxString* LIST = NULL, + int LCOUNT, wxString* choices = NULL, long style = 0, const wxValidator& validator = wxPyDefaultValidator, char* name = "listBox"); @@ -335,13 +335,13 @@ public: } } - void InsertItems(int LCOUNT, wxString* LIST, int pos); + void InsertItems(int LCOUNT, wxString* choices, int pos); wxString GetString(int n); wxString GetStringSelection(); int Number(); bool Selected(const int n); - void Set(int LCOUNT, wxString* LIST); + void Set(int LCOUNT, wxString* choices); // TODO: void SetClientData(const int n, char* data); void SetFirstItem(int n); %name(SetFirstItemStr)void SetFirstItem(const wxString& string); @@ -359,7 +359,7 @@ public: const wxPoint& pos = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, int LCOUNT = 0, - wxString* LIST = NULL, + wxString* choices = NULL, long style = 0, const wxValidator& validator = wxPyDefaultValidator, char* name = "listBox"); @@ -368,7 +368,7 @@ public: bool IsChecked(int uiIndex); void Check(int uiIndex, int bCheck = TRUE); - void InsertItems(int LCOUNT, wxString* LIST, int pos); + void InsertItems(int LCOUNT, wxString* choices, int pos); int GetItemHeight(); }; @@ -496,7 +496,7 @@ public: const wxString& label, const wxPoint& point = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, - int LCOUNT = 0, wxString* LIST = NULL, + int LCOUNT = 0, wxString* choices = NULL, int majorDimension = 0, long style = wxRA_HORIZONTAL, const wxValidator& validator = wxPyDefaultValidator, diff --git a/utils/wxPython/src/events.i b/utils/wxPython/src/events.i index 64613178d5..1464154828 100644 --- a/utils/wxPython/src/events.i +++ b/utils/wxPython/src/events.i @@ -176,7 +176,7 @@ public: //--------------------------------------------------------------------------- -class wxNavigationKeyEvent : public wxCommandEvent { +class wxNavigationKeyEvent : public wxEvent { public: wxNavigationKeyEvent(); diff --git a/utils/wxPython/src/frames.i b/utils/wxPython/src/frames.i index 5776606e60..7cea8d68a1 100644 --- a/utils/wxPython/src/frames.i +++ b/utils/wxPython/src/frames.i @@ -68,7 +68,7 @@ public: void SetMenuBar(wxMenuBar* menuBar); void SetStatusBar(wxStatusBar *statusBar); void SetStatusText(const wxString& text, int number = 0); - void SetStatusWidths(int LCOUNT, int* LIST); // uses typemap + void SetStatusWidths(int LCOUNT, int* choices); // uses typemap void SetTitle(const wxString& title); void SetToolBar(wxToolBar* toolbar); diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i index e926551dda..d0494d09a1 100644 --- a/utils/wxPython/src/gdi.i +++ b/utils/wxPython/src/gdi.i @@ -350,7 +350,7 @@ public: // **** This one needs to return a list of ints (wxDash) int GetDashes(wxDash **dashes); - void SetDashes(int LCOUNT, wxDash* LIST); + void SetDashes(int LCOUNT, wxDash* choices); #ifdef __WXMSW__ wxBitmap* GetStipple(); @@ -412,14 +412,14 @@ public: void DrawEllipticArc(long x, long y, long width, long height, long start, long end); void DrawIcon(const wxIcon& icon, long x, long y); void DrawLine(long x1, long y1, long x2, long y2); - void DrawLines(int LCOUNT, wxPoint* LIST, long xoffset=0, long yoffset=0); - void DrawPolygon(int LCOUNT, wxPoint* LIST, long xoffset=0, long yoffset=0, + void DrawLines(int PCOUNT, wxPoint* points, long xoffset=0, long yoffset=0); + void DrawPolygon(int PCOUNT, wxPoint* points, long xoffset=0, long yoffset=0, int fill_style=wxODDEVEN_RULE); void DrawPoint(long x, long y); void DrawRectangle(long x, long y, long width, long height); void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle); void DrawRoundedRectangle(long x, long y, long width, long height, long radius=20); - void DrawSpline(int LCOUNT, wxPoint* LIST); + void DrawSpline(int PCOUNT, wxPoint* points); void DrawText(const wxString& text, long x, long y); void EndDoc(); void EndDrawing(); @@ -433,6 +433,7 @@ public: long *OUTPUT, long *OUTPUT); wxFont& GetFont(); int GetLogicalFunction(); + void GetLogicalScale(double *OUTPUT, double *OUTPUT); int GetMapMode(); bool GetOptimization(); wxPen& GetPen(); @@ -445,12 +446,14 @@ public: } %name(GetSizeTuple)void GetSize(int* OUTPUT, int* OUTPUT); wxSize GetSize(); + wxSize GetSizeMM(); wxColour& GetTextBackground(); void GetTextExtent(const wxString& string, long *OUTPUT, long *OUTPUT); %name(GetFullTextExtent)void GetTextExtent(const wxString& string, long *OUTPUT, long *OUTPUT, long *OUTPUT, long* OUTPUT, const wxFont* font = NULL); wxColour& GetTextForeground(); + void GetUserScale(double *OUTPUT, double *OUTPUT); long LogicalToDeviceX(long x); long LogicalToDeviceXRel(long x); long LogicalToDeviceY(long y); @@ -468,6 +471,7 @@ public: void SetBrush(const wxBrush& brush); void SetFont(const wxFont& font); void SetLogicalFunction(int function); + void SetLogicalScale(double x, double y); void SetMapMode(int mode); void SetOptimization(bool optimize); void SetPen(const wxPen& pen); @@ -478,26 +482,21 @@ public: void StartPage(); -// Don't need this one anymore as wxWindows has one... -// %addmethods { -// // This one is my own creation... -// void DrawBitmap(wxBitmap& bitmap, long x, long y, bool swapPalette=TRUE) { -// wxMemoryDC* memDC = new wxMemoryDC; -// memDC->SelectObject(bitmap); -// #ifdef __WXMSW__ -// if (swapPalette) -// self->SetPalette(*bitmap.GetPalette()); -// #endif -// self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC, -// 0, 0, self->GetLogicalFunction()); -// memDC->SelectObject(wxNullBitmap); -// delete memDC; -// } -// } void DrawBitmap(const wxBitmap& bitmap, long x, long y, int useMask = FALSE); + bool CanDrawBitmap(); + bool CanGetTextExtent(); + int GetDepth(); + wxSize GetPPI(); + + void GetLogicalOrigin(int *OUTPUT, int *OUTPUT); + void SetLogicalOrigin(int x, int y); + void GetDeviceOrigin(int *OUTPUT, int *OUTPUT); + void SetDeviceOrigin(int x, int y); + void SetAxisOrientation(bool xLeftRight, bool yBottomUp); + }; @@ -644,7 +643,7 @@ extern wxColour wxNullColour; class wxPalette { public: - wxPalette(int LCOUNT, byte* LIST, byte* LIST, byte* LIST); + wxPalette(int LCOUNT, byte* choices, byte* choices, byte* choices); ~wxPalette(); int GetPixel(byte red, byte green, byte blue); @@ -666,7 +665,7 @@ enum { class wxImageList { public: - wxImageList(int width, int height, int mask=TRUE, int initialCount=1); + wxImageList(int width, int height, int mask=FALSE, int initialCount=1); ~wxImageList(); #ifdef __WXMSW__ diff --git a/utils/wxPython/src/misc.i b/utils/wxPython/src/misc.i index b458c4535c..482871611a 100644 --- a/utils/wxPython/src/misc.i +++ b/utils/wxPython/src/misc.i @@ -422,7 +422,7 @@ public: class wxAcceleratorTable { public: // Can also accept a list of 3-tuples - wxAcceleratorTable(int LCOUNT, wxAcceleratorEntry* LIST); + wxAcceleratorTable(int LCOUNT, wxAcceleratorEntry* choices); ~wxAcceleratorTable(); }; diff --git a/utils/wxPython/src/misc2.i b/utils/wxPython/src/misc2.i index efc53182e8..ccdade3cd7 100644 --- a/utils/wxPython/src/misc2.i +++ b/utils/wxPython/src/misc2.i @@ -56,21 +56,21 @@ wxString wxGetTextFromUser(const wxString& message, // TODO: Need to custom wrap this one... // int wxGetMultipleChoice(char* message, char* caption, -// int LCOUNT, char** LIST, +// int LCOUNT, char** choices, // int nsel, int *selection, // wxWindow *parent = NULL, int x = -1, int y = -1, // bool centre = TRUE, int width=150, int height=200); wxString wxGetSingleChoice(const wxString& message, const wxString& caption, - int LCOUNT, wxString* LIST, + int LCOUNT, wxString* choices, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = TRUE, int width=150, int height=200); int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, - int LCOUNT, wxString* LIST, + int LCOUNT, wxString* choices, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = TRUE, @@ -280,8 +280,6 @@ public: #endif void Show(int show = TRUE); void Hide(); - void OnSetFocus(); - void OnKillFocus(); }; %inline %{ diff --git a/utils/wxPython/src/msw/clip_dnd.cpp b/utils/wxPython/src/msw/clip_dnd.cpp index 1e81bc0deb..a1bcc8590e 100644 --- a/utils/wxPython/src/msw/clip_dnd.cpp +++ b/utils/wxPython/src/msw/clip_dnd.cpp @@ -542,7 +542,7 @@ static PyObject *_wrap_wxDataFormat_GetId(PyObject *self, PyObject *args, PyObje wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -1234,7 +1234,7 @@ static PyObject *_wrap_wxTextDataObject_GetText(PyObject *self, PyObject *args, wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; diff --git a/utils/wxPython/src/msw/cmndlgs.cpp b/utils/wxPython/src/msw/cmndlgs.cpp index 51c512cb26..95122f36d4 100644 --- a/utils/wxPython/src/msw/cmndlgs.cpp +++ b/utils/wxPython/src/msw/cmndlgs.cpp @@ -594,7 +594,7 @@ static PyObject *_wrap_wxDirDialog_GetPath(PyObject *self, PyObject *args, PyObj wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -626,7 +626,7 @@ static PyObject *_wrap_wxDirDialog_GetMessage(PyObject *self, PyObject *args, Py wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -872,7 +872,7 @@ static PyObject *_wrap_wxFileDialog_GetDirectory(PyObject *self, PyObject *args, wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -904,7 +904,7 @@ static PyObject *_wrap_wxFileDialog_GetFilename(PyObject *self, PyObject *args, wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -963,7 +963,7 @@ static PyObject *_wrap_wxFileDialog_GetMessage(PyObject *self, PyObject *args, P wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -995,7 +995,7 @@ static PyObject *_wrap_wxFileDialog_GetPath(PyObject *self, PyObject *args, PyOb wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -1054,7 +1054,7 @@ static PyObject *_wrap_wxFileDialog_GetWildcard(PyObject *self, PyObject *args, wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -1377,9 +1377,9 @@ static void *SwigwxSingleChoiceDialogTowxEvtHandler(void *ptr) { return (void *) dest; } -static wxSingleChoiceDialog *new_wxSingleChoiceDialog(wxWindow *parent,wxString *message,wxString *caption,int LCOUNT,wxString *LIST,long style,wxPoint *pos) { +static wxSingleChoiceDialog *new_wxSingleChoiceDialog(wxWindow *parent,wxString *message,wxString *caption,int LCOUNT,wxString *choices,long style,wxPoint *pos) { return new wxSingleChoiceDialog(parent, *message, *caption, - LCOUNT, LIST, NULL, style, *pos); + LCOUNT, choices, NULL, style, *pos); } static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args, PyObject *kwargs) { @@ -1398,7 +1398,7 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args, PyObject * _obj4 = 0; wxPoint temp; PyObject * _obj6 = 0; - char *_kwnames[] = { "parent","message","caption","LIST","style","pos", NULL }; + char *_kwnames[] = { "parent","message","caption","choices","style","pos", NULL }; char _ptemp[128]; self = self; @@ -1523,7 +1523,7 @@ static PyObject *_wrap_wxSingleChoiceDialog_GetStringSelection(PyObject *self, P wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -1689,7 +1689,7 @@ static PyObject *_wrap_wxTextEntryDialog_GetValue(PyObject *self, PyObject *args wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; diff --git a/utils/wxPython/src/msw/controls.cpp b/utils/wxPython/src/msw/controls.cpp index 1d1a23a8f4..19daa75ca0 100644 --- a/utils/wxPython/src/msw/controls.cpp +++ b/utils/wxPython/src/msw/controls.cpp @@ -302,7 +302,7 @@ static PyObject *_wrap_wxControl_GetLabel(PyObject *self, PyObject *args, PyObje wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -1141,7 +1141,7 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args, PyObject *kw PyObject * _obj3 = 0; PyObject * _obj5 = 0; PyObject * _argo7 = 0; - char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL }; + char *_kwnames[] = { "parent","id","pos","size","choices","style","validator","name", NULL }; char _ptemp[128]; self = self; @@ -1392,7 +1392,7 @@ static PyObject *_wrap_wxChoice_GetString(PyObject *self, PyObject *args, PyObje wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -1424,7 +1424,7 @@ static PyObject *_wrap_wxChoice_GetStringSelection(PyObject *self, PyObject *arg wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -1608,7 +1608,7 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args, PyObject * PyObject * _obj4 = 0; PyObject * _obj6 = 0; PyObject * _argo8 = 0; - char *_kwnames[] = { "parent","id","value","pos","size","LIST","style","validator","name", NULL }; + char *_kwnames[] = { "parent","id","value","pos","size","choices","style","validator","name", NULL }; char _ptemp[128]; self = self; @@ -1968,7 +1968,7 @@ static PyObject *_wrap_wxComboBox_GetString(PyObject *self, PyObject *args, PyOb wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -2000,7 +2000,7 @@ static PyObject *_wrap_wxComboBox_GetStringSelection(PyObject *self, PyObject *a wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -2032,7 +2032,7 @@ static PyObject *_wrap_wxComboBox_GetValue(PyObject *self, PyObject *args, PyObj wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -2913,7 +2913,7 @@ static PyObject *_wrap_wxStaticText_GetLabel(PyObject *self, PyObject *args, PyO wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -3005,7 +3005,7 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args, PyObject *k PyObject * _obj3 = 0; PyObject * _obj5 = 0; PyObject * _argo7 = 0; - char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL }; + char *_kwnames[] = { "parent","id","pos","size","choices","style","validator","name", NULL }; char _ptemp[128]; self = self; @@ -3306,7 +3306,7 @@ static PyObject *_wrap_wxListBox_InsertItems(PyObject *self, PyObject *args, PyO int _arg3; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST","pos", NULL }; + char *_kwnames[] = { "self","choices","pos", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxListBox_InsertItems",_kwnames,&_argo0,&_obj2,&_arg3)) @@ -3370,7 +3370,7 @@ static PyObject *_wrap_wxListBox_GetString(PyObject *self, PyObject *args, PyObj wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -3402,7 +3402,7 @@ static PyObject *_wrap_wxListBox_GetStringSelection(PyObject *self, PyObject *ar wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -3473,7 +3473,7 @@ static PyObject *_wrap_wxListBox_Set(PyObject *self, PyObject *args, PyObject *k wxString * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST", NULL }; + char *_kwnames[] = { "self","choices", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListBox_Set",_kwnames,&_argo0,&_obj2)) @@ -3748,7 +3748,7 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args, PyObje PyObject * _obj3 = 0; PyObject * _obj5 = 0; PyObject * _argo7 = 0; - char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL }; + char *_kwnames[] = { "parent","id","pos","size","choices","style","validator","name", NULL }; char _ptemp[128]; self = self; @@ -3879,7 +3879,7 @@ static PyObject *_wrap_wxCheckListBox_InsertItems(PyObject *self, PyObject *args int _arg3; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST","pos", NULL }; + char *_kwnames[] = { "self","choices","pos", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxCheckListBox_InsertItems",_kwnames,&_argo0,&_obj2,&_arg3)) @@ -4249,7 +4249,7 @@ static PyObject *_wrap_wxTextCtrl_GetLineText(PyObject *self, PyObject *args, Py wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -4308,7 +4308,7 @@ static PyObject *_wrap_wxTextCtrl_GetValue(PyObject *self, PyObject *args, PyObj wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -5882,7 +5882,7 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args, PyObject * PyObject * _obj4 = 0; PyObject * _obj6 = 0; PyObject * _argo9 = 0; - char *_kwnames[] = { "parent","id","label","point","size","LIST","majorDimension","style","validator","name", NULL }; + char *_kwnames[] = { "parent","id","label","point","size","choices","majorDimension","style","validator","name", NULL }; char _ptemp[128]; self = self; @@ -6084,7 +6084,7 @@ static PyObject *_wrap_wxRadioBox_GetItemLabel(PyObject *self, PyObject *args, P wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -6144,7 +6144,7 @@ static PyObject *_wrap_wxRadioBox_GetString(PyObject *self, PyObject *args, PyOb wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -6176,7 +6176,7 @@ static PyObject *_wrap_wxRadioBox_GetStringSelection(PyObject *self, PyObject *a wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; diff --git a/utils/wxPython/src/msw/controls2.cpp b/utils/wxPython/src/msw/controls2.cpp index f0bf2cfed2..41951ecfe7 100644 --- a/utils/wxPython/src/msw/controls2.cpp +++ b/utils/wxPython/src/msw/controls2.cpp @@ -450,7 +450,7 @@ static PyObject *_wrap_wxListItem_m_text_set(PyObject *self, PyObject *args, PyO wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { if (_obj1) @@ -483,7 +483,7 @@ static PyObject *_wrap_wxListItem_m_text_get(PyObject *self, PyObject *args, PyO wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } return _resultobj; } @@ -2084,7 +2084,7 @@ static PyObject *_wrap_wxListCtrl_GetItemText(PyObject *self, PyObject *args, Py wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -3391,7 +3391,7 @@ static PyObject *_wrap_wxTreeEvent_GetLabel(PyObject *self, PyObject *args, PyOb wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } return _resultobj; } @@ -3794,7 +3794,7 @@ static PyObject *_wrap_wxTreeCtrl_GetItemText(PyObject *self, PyObject *args, Py wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; diff --git a/utils/wxPython/src/msw/events.cpp b/utils/wxPython/src/msw/events.cpp index 12504fd095..fd83a70aa7 100644 --- a/utils/wxPython/src/msw/events.cpp +++ b/utils/wxPython/src/msw/events.cpp @@ -896,7 +896,7 @@ static PyObject *_wrap_wxCommandEvent_GetString(PyObject *self, PyObject *args, wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -2475,14 +2475,6 @@ static PyObject *_wrap_wxKeyEvent_GetPositionTuple(PyObject *self, PyObject *arg return _resultobj; } -static void *SwigwxNavigationKeyEventTowxCommandEvent(void *ptr) { - wxNavigationKeyEvent *src; - wxCommandEvent *dest; - src = (wxNavigationKeyEvent *) ptr; - dest = (wxCommandEvent *) src; - return (void *) dest; -} - static void *SwigwxNavigationKeyEventTowxEvent(void *ptr) { wxNavigationKeyEvent *src; wxEvent *dest; @@ -4031,7 +4023,7 @@ static PyObject *_wrap_wxUpdateUIEvent_GetText(PyObject *self, PyObject *args, P wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -5296,8 +5288,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCommandEvent","_wxPyCommandEvent",SwigwxPyCommandEventTowxCommandEvent}, { "_wxCommandEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, { "_wxCommandEvent","_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, - { "_wxCommandEvent","_class_wxNavigationKeyEvent",SwigwxNavigationKeyEventTowxCommandEvent}, - { "_wxCommandEvent","_wxNavigationKeyEvent",SwigwxNavigationKeyEventTowxCommandEvent}, { "_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent}, { "_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent}, { "_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent}, @@ -5417,8 +5407,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxCommandEvent","_wxPyCommandEvent",SwigwxPyCommandEventTowxCommandEvent}, { "_class_wxCommandEvent","_class_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, { "_class_wxCommandEvent","_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent}, - { "_class_wxCommandEvent","_class_wxNavigationKeyEvent",SwigwxNavigationKeyEventTowxCommandEvent}, - { "_class_wxCommandEvent","_wxNavigationKeyEvent",SwigwxNavigationKeyEventTowxCommandEvent}, { "_class_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent}, { "_class_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent}, { "_class_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent}, diff --git a/utils/wxPython/src/msw/events.py b/utils/wxPython/src/msw/events.py index d579ec5e18..f088e26c73 100644 --- a/utils/wxPython/src/msw/events.py +++ b/utils/wxPython/src/msw/events.py @@ -345,7 +345,7 @@ class wxKeyEvent(wxKeyEventPtr): -class wxNavigationKeyEventPtr(wxCommandEventPtr): +class wxNavigationKeyEventPtr(wxEventPtr): def __init__(self,this): self.this = this self.thisown = 0 diff --git a/utils/wxPython/src/msw/frames.cpp b/utils/wxPython/src/msw/frames.cpp index c3105f1b3b..9b157d3109 100644 --- a/utils/wxPython/src/msw/frames.cpp +++ b/utils/wxPython/src/msw/frames.cpp @@ -414,7 +414,7 @@ static PyObject *_wrap_wxFrame_GetTitle(PyObject *self, PyObject *args, PyObject wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -736,7 +736,7 @@ static PyObject *_wrap_wxFrame_SetStatusWidths(PyObject *self, PyObject *args, P int * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST", NULL }; + char *_kwnames[] = { "self","choices", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFrame_SetStatusWidths",_kwnames,&_argo0,&_obj2)) diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp index bdaa29bd62..c7d9136440 100644 --- a/utils/wxPython/src/msw/gdi.cpp +++ b/utils/wxPython/src/msw/gdi.cpp @@ -2492,7 +2492,7 @@ static PyObject *_wrap_wxFont_GetFaceName(PyObject *self, PyObject *args, PyObje wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -2923,7 +2923,7 @@ static PyObject *_wrap_wxFont_GetFamilyString(PyObject *self, PyObject *args, Py wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -2955,7 +2955,7 @@ static PyObject *_wrap_wxFont_GetStyleString(PyObject *self, PyObject *args, PyO wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -2987,7 +2987,7 @@ static PyObject *_wrap_wxFont_GetWeightString(PyObject *self, PyObject *args, Py wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -3624,7 +3624,7 @@ static PyObject *_wrap_wxPen_SetDashes(PyObject *self, PyObject *args, PyObject wxDash * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST", NULL }; + char *_kwnames[] = { "self","choices", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPen_SetDashes",_kwnames,&_argo0,&_obj2)) @@ -4494,7 +4494,7 @@ static PyObject *_wrap_wxDC_DrawLines(PyObject *self, PyObject *args, PyObject * long _arg4 = (long ) 0; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST","xoffset","yoffset", NULL }; + char *_kwnames[] = { "self","points","xoffset","yoffset", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|ll:wxDC_DrawLines",_kwnames,&_argo0,&_obj2,&_arg3,&_arg4)) @@ -4545,7 +4545,7 @@ static PyObject *_wrap_wxDC_DrawPolygon(PyObject *self, PyObject *args, PyObject int _arg5 = (int ) wxODDEVEN_RULE; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST","xoffset","yoffset","fill_style", NULL }; + char *_kwnames[] = { "self","points","xoffset","yoffset","fill_style", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|lli:wxDC_DrawPolygon",_kwnames,&_argo0,&_obj2,&_arg3,&_arg4,&_arg5)) @@ -4728,7 +4728,7 @@ static PyObject *_wrap_wxDC_DrawSpline(PyObject *self, PyObject *args, PyObject wxPoint * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST", NULL }; + char *_kwnames[] = { "self","points", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDC_DrawSpline",_kwnames,&_argo0,&_obj2)) @@ -5183,6 +5183,53 @@ static PyObject *_wrap_wxDC_GetLogicalFunction(PyObject *self, PyObject *args, P return _resultobj; } +#define wxDC_GetLogicalScale(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetLogicalScale(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxDC_GetLogicalScale(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDC * _arg0; + double * _arg1; + double temp; + double * _arg2; + double temp0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetLogicalScale",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetLogicalScale. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxDC_GetLogicalScale(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + #define wxDC_GetMapMode(_swigobj) (_swigobj->GetMapMode()) static PyObject *_wrap_wxDC_GetMapMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -5388,6 +5435,35 @@ static PyObject *_wrap_wxDC_GetSize(PyObject *self, PyObject *args, PyObject *kw return _resultobj; } +#define wxDC_GetSizeMM(_swigobj) (_swigobj->GetSizeMM()) +static PyObject *_wrap_wxDC_GetSizeMM(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _result; + wxDC * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetSizeMM",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetSizeMM. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxSize (wxDC_GetSizeMM(_arg0)); + + wxPy_END_ALLOW_THREADS; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxDC_GetTextBackground(_swigobj) (_swigobj->GetTextBackground()) static PyObject *_wrap_wxDC_GetTextBackground(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -5607,6 +5683,53 @@ static PyObject *_wrap_wxDC_GetTextForeground(PyObject *self, PyObject *args, Py return _resultobj; } +#define wxDC_GetUserScale(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetUserScale(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxDC_GetUserScale(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDC * _arg0; + double * _arg1; + double temp; + double * _arg2; + double temp0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; +{ + _arg1 = &temp; +} +{ + _arg2 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetUserScale",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetUserScale. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxDC_GetUserScale(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg1)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyFloat_FromDouble((double) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + #define wxDC_LogicalToDeviceX(_swigobj,_swigarg0) (_swigobj->LogicalToDeviceX(_swigarg0)) static PyObject *_wrap_wxDC_LogicalToDeviceX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6114,6 +6237,35 @@ static PyObject *_wrap_wxDC_SetLogicalFunction(PyObject *self, PyObject *args, P return _resultobj; } +#define wxDC_SetLogicalScale(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetLogicalScale(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxDC_SetLogicalScale(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDC * _arg0; + double _arg1; + double _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd:wxDC_SetLogicalScale",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetLogicalScale. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxDC_SetLogicalScale(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxDC_SetMapMode(_swigobj,_swigarg0) (_swigobj->SetMapMode(_swigarg0)) static PyObject *_wrap_wxDC_SetMapMode(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -6415,6 +6567,272 @@ static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args, PyObject return _resultobj; } +#define wxDC_CanDrawBitmap(_swigobj) (_swigobj->CanDrawBitmap()) +static PyObject *_wrap_wxDC_CanDrawBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxDC * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_CanDrawBitmap",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_CanDrawBitmap. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxDC_CanDrawBitmap(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxDC_CanGetTextExtent(_swigobj) (_swigobj->CanGetTextExtent()) +static PyObject *_wrap_wxDC_CanGetTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxDC * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_CanGetTextExtent",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_CanGetTextExtent. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxDC_CanGetTextExtent(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxDC_GetDepth(_swigobj) (_swigobj->GetDepth()) +static PyObject *_wrap_wxDC_GetDepth(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + int _result; + wxDC * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetDepth",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetDepth. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (int )wxDC_GetDepth(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxDC_GetPPI(_swigobj) (_swigobj->GetPPI()) +static PyObject *_wrap_wxDC_GetPPI(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxSize * _result; + wxDC * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDC_GetPPI",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetPPI. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxSize (wxDC_GetPPI(_arg0)); + + wxPy_END_ALLOW_THREADS; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxDC_GetLogicalOrigin(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetLogicalOrigin(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxDC_GetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDC * _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:wxDC_GetLogicalOrigin",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetLogicalOrigin. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxDC_GetLogicalOrigin(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} 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 wxDC_SetLogicalOrigin(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetLogicalOrigin(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxDC_SetLogicalOrigin(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDC * _arg0; + int _arg1; + int _arg2; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","x","y", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxDC_SetLogicalOrigin",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetLogicalOrigin. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxDC_SetLogicalOrigin(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxDC_GetDeviceOrigin(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetDeviceOrigin(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxDC_GetDeviceOrigin(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDC * _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:wxDC_GetDeviceOrigin",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetDeviceOrigin. Expected _wxDC_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxDC_GetDeviceOrigin(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} 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 wxDC_SetAxisOrientation(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetAxisOrientation(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxDC_SetAxisOrientation(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxDC * _arg0; + bool _arg1; + bool _arg2; + PyObject * _argo0 = 0; + int tempbool1; + int tempbool2; + char *_kwnames[] = { "self","xLeftRight","yBottomUp", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxDC_SetAxisOrientation",_kwnames,&_argo0,&tempbool1,&tempbool2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_SetAxisOrientation. Expected _wxDC_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + _arg2 = (bool ) tempbool2; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxDC_SetAxisOrientation(_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxMemoryDCTowxDC(void *ptr) { wxMemoryDC *src; wxDC *dest; @@ -6910,7 +7328,7 @@ static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args, PyObject *k PyObject * _obj1 = 0; PyObject * _obj2 = 0; PyObject * _obj3 = 0; - char *_kwnames[] = { "LIST","LIST","LIST", NULL }; + char *_kwnames[] = { "choices","choices","choices", NULL }; char _ptemp[128]; self = self; @@ -7112,7 +7530,7 @@ static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args, PyObject wxImageList * _result; int _arg0; int _arg1; - int _arg2 = (int ) TRUE; + int _arg2 = (int ) FALSE; int _arg3 = (int ) 1; char *_kwnames[] = { "width","height","mask","initialCount", NULL }; char _ptemp[128]; @@ -7525,6 +7943,14 @@ static PyMethodDef gdicMethods[] = { { "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 }, + { "wxDC_SetAxisOrientation", (PyCFunction) _wrap_wxDC_SetAxisOrientation, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetDeviceOrigin", (PyCFunction) _wrap_wxDC_GetDeviceOrigin, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetLogicalOrigin", (PyCFunction) _wrap_wxDC_SetLogicalOrigin, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetLogicalOrigin", (PyCFunction) _wrap_wxDC_GetLogicalOrigin, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetPPI", (PyCFunction) _wrap_wxDC_GetPPI, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetDepth", (PyCFunction) _wrap_wxDC_GetDepth, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_CanGetTextExtent", (PyCFunction) _wrap_wxDC_CanGetTextExtent, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_CanDrawBitmap", (PyCFunction) _wrap_wxDC_CanDrawBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxDC_DrawBitmap", (PyCFunction) _wrap_wxDC_DrawBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxDC_StartPage", (PyCFunction) _wrap_wxDC_StartPage, METH_VARARGS | METH_KEYWORDS }, { "wxDC_StartDoc", (PyCFunction) _wrap_wxDC_StartDoc, METH_VARARGS | METH_KEYWORDS }, @@ -7534,6 +7960,7 @@ static PyMethodDef gdicMethods[] = { { "wxDC_SetPen", (PyCFunction) _wrap_wxDC_SetPen, METH_VARARGS | METH_KEYWORDS }, { "wxDC_SetOptimization", (PyCFunction) _wrap_wxDC_SetOptimization, METH_VARARGS | METH_KEYWORDS }, { "wxDC_SetMapMode", (PyCFunction) _wrap_wxDC_SetMapMode, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_SetLogicalScale", (PyCFunction) _wrap_wxDC_SetLogicalScale, METH_VARARGS | METH_KEYWORDS }, { "wxDC_SetLogicalFunction", (PyCFunction) _wrap_wxDC_SetLogicalFunction, METH_VARARGS | METH_KEYWORDS }, { "wxDC_SetFont", (PyCFunction) _wrap_wxDC_SetFont, METH_VARARGS | METH_KEYWORDS }, { "wxDC_SetBrush", (PyCFunction) _wrap_wxDC_SetBrush, METH_VARARGS | METH_KEYWORDS }, @@ -7551,16 +7978,19 @@ static PyMethodDef gdicMethods[] = { { "wxDC_LogicalToDeviceY", (PyCFunction) _wrap_wxDC_LogicalToDeviceY, METH_VARARGS | METH_KEYWORDS }, { "wxDC_LogicalToDeviceXRel", (PyCFunction) _wrap_wxDC_LogicalToDeviceXRel, METH_VARARGS | METH_KEYWORDS }, { "wxDC_LogicalToDeviceX", (PyCFunction) _wrap_wxDC_LogicalToDeviceX, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetUserScale", (PyCFunction) _wrap_wxDC_GetUserScale, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetTextForeground", (PyCFunction) _wrap_wxDC_GetTextForeground, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetFullTextExtent", (PyCFunction) _wrap_wxDC_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetTextExtent", (PyCFunction) _wrap_wxDC_GetTextExtent, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetTextBackground", (PyCFunction) _wrap_wxDC_GetTextBackground, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetSizeMM", (PyCFunction) _wrap_wxDC_GetSizeMM, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetSize", (PyCFunction) _wrap_wxDC_GetSize, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetSizeTuple", (PyCFunction) _wrap_wxDC_GetSizeTuple, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetPixel", (PyCFunction) _wrap_wxDC_GetPixel, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetPen", (PyCFunction) _wrap_wxDC_GetPen, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetOptimization", (PyCFunction) _wrap_wxDC_GetOptimization, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetMapMode", (PyCFunction) _wrap_wxDC_GetMapMode, METH_VARARGS | METH_KEYWORDS }, + { "wxDC_GetLogicalScale", (PyCFunction) _wrap_wxDC_GetLogicalScale, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetLogicalFunction", (PyCFunction) _wrap_wxDC_GetLogicalFunction, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetFont", (PyCFunction) _wrap_wxDC_GetFont, METH_VARARGS | METH_KEYWORDS }, { "wxDC_GetClippingBox", (PyCFunction) _wrap_wxDC_GetClippingBox, METH_VARARGS | METH_KEYWORDS }, diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py index b2c401560c..ea97d9e79b 100644 --- a/utils/wxPython/src/msw/gdi.py +++ b/utils/wxPython/src/msw/gdi.py @@ -499,6 +499,9 @@ class wxDCPtr : def GetLogicalFunction(self, *_args, **_kwargs): val = apply(gdic.wxDC_GetLogicalFunction,(self,) + _args, _kwargs) return val + def GetLogicalScale(self, *_args, **_kwargs): + val = apply(gdic.wxDC_GetLogicalScale,(self,) + _args, _kwargs) + return val def GetMapMode(self, *_args, **_kwargs): val = apply(gdic.wxDC_GetMapMode,(self,) + _args, _kwargs) return val @@ -520,6 +523,10 @@ class wxDCPtr : val = apply(gdic.wxDC_GetSize,(self,) + _args, _kwargs) if val: val = wxSizePtr(val) ; val.thisown = 1 return val + def GetSizeMM(self, *_args, **_kwargs): + val = apply(gdic.wxDC_GetSizeMM,(self,) + _args, _kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 + return val def GetTextBackground(self, *_args, **_kwargs): val = apply(gdic.wxDC_GetTextBackground,(self,) + _args, _kwargs) if val: val = wxColourPtr(val) @@ -534,6 +541,9 @@ class wxDCPtr : val = apply(gdic.wxDC_GetTextForeground,(self,) + _args, _kwargs) if val: val = wxColourPtr(val) return val + def GetUserScale(self, *_args, **_kwargs): + val = apply(gdic.wxDC_GetUserScale,(self,) + _args, _kwargs) + return val def LogicalToDeviceX(self, *_args, **_kwargs): val = apply(gdic.wxDC_LogicalToDeviceX,(self,) + _args, _kwargs) return val @@ -585,6 +595,9 @@ class wxDCPtr : def SetLogicalFunction(self, *_args, **_kwargs): val = apply(gdic.wxDC_SetLogicalFunction,(self,) + _args, _kwargs) return val + def SetLogicalScale(self, *_args, **_kwargs): + val = apply(gdic.wxDC_SetLogicalScale,(self,) + _args, _kwargs) + return val def SetMapMode(self, *_args, **_kwargs): val = apply(gdic.wxDC_SetMapMode,(self,) + _args, _kwargs) return val @@ -612,6 +625,31 @@ class wxDCPtr : def DrawBitmap(self, *_args, **_kwargs): val = apply(gdic.wxDC_DrawBitmap,(self,) + _args, _kwargs) return val + def CanDrawBitmap(self, *_args, **_kwargs): + val = apply(gdic.wxDC_CanDrawBitmap,(self,) + _args, _kwargs) + return val + def CanGetTextExtent(self, *_args, **_kwargs): + val = apply(gdic.wxDC_CanGetTextExtent,(self,) + _args, _kwargs) + return val + def GetDepth(self, *_args, **_kwargs): + val = apply(gdic.wxDC_GetDepth,(self,) + _args, _kwargs) + return val + def GetPPI(self, *_args, **_kwargs): + val = apply(gdic.wxDC_GetPPI,(self,) + _args, _kwargs) + if val: val = wxSizePtr(val) ; val.thisown = 1 + return val + def GetLogicalOrigin(self, *_args, **_kwargs): + val = apply(gdic.wxDC_GetLogicalOrigin,(self,) + _args, _kwargs) + return val + def SetLogicalOrigin(self, *_args, **_kwargs): + val = apply(gdic.wxDC_SetLogicalOrigin,(self,) + _args, _kwargs) + return val + def GetDeviceOrigin(self, *_args, **_kwargs): + val = apply(gdic.wxDC_GetDeviceOrigin,(self,) + _args, _kwargs) + return val + def SetAxisOrientation(self, *_args, **_kwargs): + val = apply(gdic.wxDC_SetAxisOrientation,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxDC(wxDCPtr): diff --git a/utils/wxPython/src/msw/image.cpp b/utils/wxPython/src/msw/image.cpp index bef0b178fc..f2e97ed8c0 100644 --- a/utils/wxPython/src/msw/image.cpp +++ b/utils/wxPython/src/msw/image.cpp @@ -327,7 +327,7 @@ static PyObject *_wrap_wxImageHandler_GetName(PyObject *self, PyObject *args, Py wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -359,7 +359,7 @@ static PyObject *_wrap_wxImageHandler_GetExtension(PyObject *self, PyObject *arg wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -418,7 +418,7 @@ static PyObject *_wrap_wxImageHandler_GetMimeType(PyObject *self, PyObject *args wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; diff --git a/utils/wxPython/src/msw/misc.cpp b/utils/wxPython/src/msw/misc.cpp index 302550837e..5f1b70a733 100644 --- a/utils/wxPython/src/msw/misc.cpp +++ b/utils/wxPython/src/msw/misc.cpp @@ -448,7 +448,7 @@ static PyObject *_wrap_wxNow(PyObject *self, PyObject *args, PyObject *kwargs) { wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -656,7 +656,7 @@ static PyObject *_wrap_wxStripMenuCodes(PyObject *self, PyObject *args, PyObject wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { if (_obj0) @@ -4265,7 +4265,7 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args, Py int _arg0; wxAcceleratorEntry * _arg1; PyObject * _obj1 = 0; - char *_kwnames[] = { "LIST", NULL }; + char *_kwnames[] = { "choices", NULL }; char _ptemp[128]; self = self; diff --git a/utils/wxPython/src/msw/misc2.cpp b/utils/wxPython/src/msw/misc2.cpp index 432197a8ed..813d3fec65 100644 --- a/utils/wxPython/src/msw/misc2.cpp +++ b/utils/wxPython/src/msw/misc2.cpp @@ -185,7 +185,7 @@ static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args, PyObject * wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -250,7 +250,7 @@ static PyObject *_wrap_wxGetTextFromUser(PyObject *self, PyObject *args, PyObjec wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { if (_obj0) @@ -288,7 +288,7 @@ static PyObject *_wrap_wxGetSingleChoice(PyObject *self, PyObject *args, PyObjec PyObject * _obj3 = 0; PyObject * _argo4 = 0; int tempbool7 = (int) TRUE; - char *_kwnames[] = { "message","caption","LIST","parent","x","y","centre","width","height", NULL }; + char *_kwnames[] = { "message","caption","choices","parent","x","y","centre","width","height", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|Oiiiii:wxGetSingleChoice",_kwnames,&_obj0,&_obj1,&_obj3,&_argo4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) @@ -336,7 +336,7 @@ static PyObject *_wrap_wxGetSingleChoice(PyObject *self, PyObject *args, PyObjec wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { if (_obj0) @@ -373,7 +373,7 @@ static PyObject *_wrap_wxGetSingleChoiceIndex(PyObject *self, PyObject *args, Py PyObject * _obj3 = 0; PyObject * _argo4 = 0; int tempbool7 = (int) TRUE; - char *_kwnames[] = { "message","caption","LIST","parent","x","y","centre","width","height", NULL }; + char *_kwnames[] = { "message","caption","choices","parent","x","y","centre","width","height", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|Oiiiii:wxGetSingleChoiceIndex",_kwnames,&_obj0,&_obj1,&_obj3,&_argo4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) @@ -1255,7 +1255,7 @@ static PyObject *_wrap_wxToolTip_GetTip(PyObject *self, PyObject *args, PyObject wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -1789,60 +1789,6 @@ static PyObject *_wrap_wxCaret_Hide(PyObject *self, PyObject *args, PyObject *kw return _resultobj; } -#define wxCaret_OnSetFocus(_swigobj) (_swigobj->OnSetFocus()) -static PyObject *_wrap_wxCaret_OnSetFocus(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxCaret * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCaret_OnSetFocus",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCaret_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCaret_OnSetFocus. Expected _wxCaret_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - wxCaret_OnSetFocus(_arg0); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - -#define wxCaret_OnKillFocus(_swigobj) (_swigobj->OnKillFocus()) -static PyObject *_wrap_wxCaret_OnKillFocus(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxCaret * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCaret_OnKillFocus",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxCaret_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCaret_OnKillFocus. Expected _wxCaret_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - wxCaret_OnKillFocus(_arg0); - - wxPy_END_ALLOW_THREADS; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - #define new_wxFontEnumerator() (new wxPyFontEnumerator()) static PyObject *_wrap_new_wxFontEnumerator(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2127,8 +2073,6 @@ static PyMethodDef misc2cMethods[] = { { "wxFontEnumerator__setSelf", (PyCFunction) _wrap_wxFontEnumerator__setSelf, METH_VARARGS | METH_KEYWORDS }, { "delete_wxFontEnumerator", (PyCFunction) _wrap_delete_wxFontEnumerator, METH_VARARGS | METH_KEYWORDS }, { "new_wxFontEnumerator", (PyCFunction) _wrap_new_wxFontEnumerator, METH_VARARGS | METH_KEYWORDS }, - { "wxCaret_OnKillFocus", (PyCFunction) _wrap_wxCaret_OnKillFocus, METH_VARARGS | METH_KEYWORDS }, - { "wxCaret_OnSetFocus", (PyCFunction) _wrap_wxCaret_OnSetFocus, METH_VARARGS | METH_KEYWORDS }, { "wxCaret_Hide", (PyCFunction) _wrap_wxCaret_Hide, METH_VARARGS | METH_KEYWORDS }, { "wxCaret_Show", (PyCFunction) _wrap_wxCaret_Show, METH_VARARGS | METH_KEYWORDS }, { "wxCaret_SetSize", (PyCFunction) _wrap_wxCaret_SetSize, METH_VARARGS | METH_KEYWORDS }, diff --git a/utils/wxPython/src/msw/misc2.py b/utils/wxPython/src/msw/misc2.py index b91f79aab2..a052bbd796 100644 --- a/utils/wxPython/src/msw/misc2.py +++ b/utils/wxPython/src/msw/misc2.py @@ -83,12 +83,6 @@ class wxCaretPtr : def Hide(self, *_args, **_kwargs): val = apply(misc2c.wxCaret_Hide,(self,) + _args, _kwargs) return val - def OnSetFocus(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_OnSetFocus,(self,) + _args, _kwargs) - return val - def OnKillFocus(self, *_args, **_kwargs): - val = apply(misc2c.wxCaret_OnKillFocus,(self,) + _args, _kwargs) - return val def __repr__(self): return "" % (self.this,) class wxCaret(wxCaretPtr): diff --git a/utils/wxPython/src/msw/printfw.cpp b/utils/wxPython/src/msw/printfw.cpp index e4a9868116..ddfbd057a7 100644 --- a/utils/wxPython/src/msw/printfw.cpp +++ b/utils/wxPython/src/msw/printfw.cpp @@ -326,7 +326,7 @@ static PyObject *_wrap_wxPrintData_GetPrinterName(PyObject *self, PyObject *args wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } return _resultobj; } diff --git a/utils/wxPython/src/msw/stattool.cpp b/utils/wxPython/src/msw/stattool.cpp index fc7b1365ff..2273936879 100644 --- a/utils/wxPython/src/msw/stattool.cpp +++ b/utils/wxPython/src/msw/stattool.cpp @@ -270,7 +270,7 @@ static PyObject *_wrap_wxStatusBar_GetStatusText(PyObject *self, PyObject *args, wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -456,7 +456,7 @@ static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *arg int * _arg2; PyObject * _argo0 = 0; PyObject * _obj2 = 0; - char *_kwnames[] = { "self","LIST", NULL }; + char *_kwnames[] = { "self","choices", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStatusBar_SetStatusWidths",_kwnames,&_argo0,&_obj2)) @@ -936,7 +936,7 @@ static PyObject *_wrap_wxToolBarToolBase_GetShortHelp(PyObject *self, PyObject * wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -968,7 +968,7 @@ static PyObject *_wrap_wxToolBarToolBase_GetLongHelp(PyObject *self, PyObject *a wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -2309,7 +2309,7 @@ static PyObject *_wrap_wxToolBarBase_GetToolShortHelp(PyObject *self, PyObject * wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -2383,7 +2383,7 @@ static PyObject *_wrap_wxToolBarBase_GetToolLongHelp(PyObject *self, PyObject *a wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; diff --git a/utils/wxPython/src/msw/windows.cpp b/utils/wxPython/src/msw/windows.cpp index 4c8f6108dc..1b3c40d06c 100644 --- a/utils/wxPython/src/msw/windows.cpp +++ b/utils/wxPython/src/msw/windows.cpp @@ -1842,7 +1842,7 @@ static PyObject *_wrap_wxWindow_GetLabel(PyObject *self, PyObject *args, PyObjec wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -1914,7 +1914,7 @@ static PyObject *_wrap_wxWindow_GetName(PyObject *self, PyObject *args, PyObject wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -2394,7 +2394,7 @@ static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args, PyObjec wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -5160,7 +5160,7 @@ static PyObject *_wrap_wxDialog_GetTitle(PyObject *self, PyObject *args, PyObjec wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -6512,7 +6512,7 @@ static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args, PyObject wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -6585,7 +6585,7 @@ static PyObject *_wrap_wxMenu_GetLabel(PyObject *self, PyObject *args, PyObject wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -6659,7 +6659,7 @@ static PyObject *_wrap_wxMenu_GetHelpString(PyObject *self, PyObject *args, PyOb wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -7728,7 +7728,7 @@ static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *self, PyObject *args, PyO wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -8008,7 +8008,7 @@ static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *self, PyObject *args, PyObje wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -8082,7 +8082,7 @@ static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *self, PyObject *args, P wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -8345,7 +8345,7 @@ static PyObject *_wrap_wxMenuItem_GetLabel(PyObject *self, PyObject *args, PyObj wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -8378,7 +8378,7 @@ static PyObject *_wrap_wxMenuItem_GetText(PyObject *self, PyObject *args, PyObje wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } return _resultobj; } @@ -8743,7 +8743,7 @@ static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *self, PyObject *args, PyObje wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } return _resultobj; } diff --git a/utils/wxPython/src/msw/windows2.cpp b/utils/wxPython/src/msw/windows2.cpp index 8b7d607073..bd8e343b02 100644 --- a/utils/wxPython/src/msw/windows2.cpp +++ b/utils/wxPython/src/msw/windows2.cpp @@ -189,7 +189,7 @@ static PyObject *_wrap_wxGridCell_GetTextValue(PyObject *self, PyObject *args, P wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } return _resultobj; } @@ -1409,7 +1409,7 @@ static PyObject *_wrap_wxGrid_GetCellValue(PyObject *self, PyObject *args, PyObj wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } return _resultobj; } @@ -1801,7 +1801,7 @@ static PyObject *_wrap_wxGrid_GetLabelValue(PyObject *self, PyObject *args, PyOb wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } return _resultobj; } @@ -3823,7 +3823,7 @@ static PyObject *_wrap_wxNotebook_GetPageText(PyObject *self, PyObject *args, Py wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; diff --git a/utils/wxPython/src/msw/wx.cpp b/utils/wxPython/src/msw/wx.cpp index 9559317838..2ee0471c70 100644 --- a/utils/wxPython/src/msw/wx.cpp +++ b/utils/wxPython/src/msw/wx.cpp @@ -966,7 +966,7 @@ static PyObject *_wrap_wxPyApp_GetAppName(PyObject *self, PyObject *args, PyObje wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -1025,7 +1025,7 @@ static PyObject *_wrap_wxPyApp_GetClassName(PyObject *self, PyObject *args, PyOb wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; @@ -1145,7 +1145,7 @@ static PyObject *_wrap_wxPyApp_GetVendorName(PyObject *self, PyObject *args, PyO wxPy_END_ALLOW_THREADS; }{ - _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); } { delete _result; diff --git a/utils/wxPython/src/msw/wx.py b/utils/wxPython/src/msw/wx.py index 2fd1967338..439dce752c 100644 --- a/utils/wxPython/src/msw/wx.py +++ b/utils/wxPython/src/msw/wx.py @@ -851,12 +851,6 @@ def _checkForCallback(obj, name, event, theID=-1): except: pass else: obj.Connect(theID, -1, event, cb) -## def _checkClassCallback(obj, name): -## try: cb = getattr(obj, name) -## except: pass -## else: obj._addCallback(name, cb) - - def _StdWindowCallbacks(win): _checkForCallback(win, "OnChar", wxEVT_CHAR) _checkForCallback(win, "OnSize", wxEVT_SIZE) @@ -1555,15 +1549,18 @@ class wxPyOnDemandOutputWindow: self.frame = None self.title = title + def SetParent(self, parent): self.parent = parent + def OnCloseWindow(self, event): if self.frame != None: self.frame.Destroy() self.frame = None self.text = None + # this provides the file-like behaviour def write(self, str): if not self.frame: @@ -1575,7 +1572,10 @@ class wxPyOnDemandOutputWindow: EVT_CLOSE(self.frame, self.OnCloseWindow) self.text.AppendText(str) + def close(self): + if self.frame != None: + self.frame.Destroy() self.frame = None self.text = None @@ -1611,19 +1611,22 @@ class wxApp(wxPyApp): def SetTopWindow(self, frame): if self.stdioWin: self.stdioWin.SetParent(frame) - sys.stdout = self.stdioWin #sys.stderr = + sys.stderr = sys.stdout = self.stdioWin wxPyApp.SetTopWindow(self, frame) + def MainLoop(self): wxPyApp.MainLoop(self) self.RestoreStdio() + def RedirectStdio(self, filename): if filename: sys.stdout = sys.stderr = open(filename, 'a') else: self.stdioWin = self.outputWindowClass() # wxPyOnDemandOutputWindow + def RestoreStdio(self): sys.stdout, sys.stderr = self.saveStdio if self.stdioWin != None: diff --git a/utils/wxPython/src/my_typemaps.i b/utils/wxPython/src/my_typemaps.i index 96e637567a..7efbaa8b69 100644 --- a/utils/wxPython/src/my_typemaps.i +++ b/utils/wxPython/src/my_typemaps.i @@ -21,12 +21,12 @@ } //---------------------------------------------------------------------- -// LCOUNT and LIST go together. They allow a single Python list to be +// LCOUNT and choices go together. They allow a single Python list to be // converted to an integer count and an array count items long. %typemap(python,build) int LCOUNT { - if (_in_LIST) { - $target = PyList_Size(_in_LIST); + if (_in_choices) { + $target = PyList_Size(_in_choices); } else { $target = 0; @@ -35,112 +35,125 @@ -%typemap(python,in) byte* LIST { +%typemap(python,in) byte* choices { $target = byte_LIST_helper($source); if ($target == NULL) { return NULL; } } -%typemap(python,freearg) byte* LIST { +%typemap(python,freearg) byte* choices { delete [] $source; } -%typemap(python,in) int* LIST { +%typemap(python,in) int* choices { $target = int_LIST_helper($source); if ($target == NULL) { return NULL; } } -%typemap(python,freearg) int* LIST { +%typemap(python,freearg) int* choices { delete [] $source; } -%typemap(python,in) long* LIST { +%typemap(python,in) long* choices { $target = long_LIST_helper($source); if ($target == NULL) { return NULL; } } -%typemap(python,freearg) long* LIST { +%typemap(python,freearg) long* choices { delete [] $source; } -%typemap(python,in) unsigned long* LIST { +%typemap(python,in) unsigned long* choices { $target = (unsigned long*)long_LIST_helper($source); if ($target == NULL) { return NULL; } } -%typemap(python,freearg) unsigned long* LIST { +%typemap(python,freearg) unsigned long* choices { delete [] $source; } #ifdef __WXMSW__ -%typemap(python,in) wxDash* LIST = unsigned long* LIST; -%typemap(python,freearg) wxDash* LIST = unsigned long* LIST; +%typemap(python,in) wxDash* choices = unsigned long* choices; +%typemap(python,freearg) wxDash* choices = unsigned long* choices; #else -%typemap(python,in) wxDash* LIST = byte* LIST; -%typemap(python,freearg) wxDash* LIST = byte* LIST; +%typemap(python,in) wxDash* choices = byte* choices; +%typemap(python,freearg) wxDash* choices = byte* choices; #endif -%typemap(python,in) char** LIST { +%typemap(python,in) char** choices { $target = string_LIST_helper($source); if ($target == NULL) { return NULL; } } -%typemap(python,freearg) char** LIST { +%typemap(python,freearg) char** choices { delete [] $source; } - -%typemap(python,in) wxPoint* LIST { - $target = wxPoint_LIST_helper($source); +%typemap(python,in) wxBitmap** choices { + $target = wxBitmap_LIST_helper($source); if ($target == NULL) { return NULL; } } -%typemap(python,freearg) wxPoint* LIST { +%typemap(python,freearg) wxBitmap** choices { delete [] $source; } -%typemap(python,in) wxBitmap** LIST { - $target = wxBitmap_LIST_helper($source); +%typemap(python,in) wxString* choices { + $target = wxString_LIST_helper($source); if ($target == NULL) { return NULL; } } -%typemap(python,freearg) wxBitmap** LIST { +%typemap(python,freearg) wxString* choices { delete [] $source; } -%typemap(python,in) wxString* LIST { - $target = wxString_LIST_helper($source); +%typemap(python,in) wxAcceleratorEntry* choices { + $target = wxAcceleratorEntry_LIST_helper($source); if ($target == NULL) { return NULL; } } -%typemap(python,freearg) wxString* LIST { +%typemap(python,freearg) wxAcceleratorEntry* choices { delete [] $source; } -%typemap(python,in) wxAcceleratorEntry* LIST { - $target = wxAcceleratorEntry_LIST_helper($source); + + + + +%typemap(python,build) int PCOUNT { + if (_in_points) { + $target = PyList_Size(_in_points); + } + else { + $target = 0; + } +} + +%typemap(python,in) wxPoint* points { + $target = wxPoint_LIST_helper($source); if ($target == NULL) { return NULL; } } -%typemap(python,freearg) wxAcceleratorEntry* LIST { +%typemap(python,freearg) wxPoint* points { delete [] $source; } + //--------------------------------------------------------------------------- %{ @@ -162,7 +175,7 @@ static char* wxStringErrorMsg = "string type is required for parameter"; %typemap(python, out) wxString { - $target = PyString_FromString(WXSTRINGCAST *($source)); + $target = PyString_FromStringAndSize($source->c_str(), $source->Len()); } %typemap(python, ret) wxString { delete $source; @@ -170,7 +183,7 @@ static char* wxStringErrorMsg = "string type is required for parameter"; %typemap(python, out) wxString* { - $target = PyString_FromString(WXSTRINGCAST (*$source)); + $target = PyString_FromStringAndSize($source->c_str(), $source->Len()); } diff --git a/utils/wxPython/src/stattool.i b/utils/wxPython/src/stattool.i index 6f201f6a0f..c20a042361 100644 --- a/utils/wxPython/src/stattool.i +++ b/utils/wxPython/src/stattool.i @@ -59,7 +59,7 @@ public: void SetFieldsCount(int number = 1); void SetStatusText(const wxString& text, int i = 0); - void SetStatusWidths(int LCOUNT, int* LIST); + void SetStatusWidths(int LCOUNT, int* choices); }; diff --git a/utils/wxPython/tests/.cvsignore b/utils/wxPython/tests/.cvsignore index 1bb17a3e3a..257bb953d0 100644 --- a/utils/wxPython/tests/.cvsignore +++ b/utils/wxPython/tests/.cvsignore @@ -1,6 +1,7 @@ hh_test.py listGetItem.pyc setup.bat +ste.pyc test.out test1.pyc test4.pyc @@ -8,3 +9,4 @@ test6.pyc test8.pyc testDlg.pyc th_test.py +val.pyc -- 2.45.2