diff --git a/wxPython/CHANGES.txt b/wxPython/CHANGES.txt index f76b5bcee3..c1279adaad 100644 --- a/wxPython/CHANGES.txt +++ b/wxPython/CHANGES.txt @@ -2,6 +2,15 @@ CHANGES.txt for wxPython ---------------------------------------------------------------------- +New in 2.2.0 +------------ + +Added wxLog and friends. + + + + + New in 2.1.16 ------------- diff --git a/wxPython/demo/ActiveXWrapper_Acrobat.py b/wxPython/demo/ActiveXWrapper_Acrobat.py index 5eedf1d55b..349429acc3 100644 --- a/wxPython/demo/ActiveXWrapper_Acrobat.py +++ b/wxPython/demo/ActiveXWrapper_Acrobat.py @@ -29,9 +29,8 @@ if wxPlatform == '__WXMSW__': #---------------------------------------------------------------------- class TestPanel(wxPanel): - def __init__(self, parent, log): + def __init__(self, parent): wxPanel.__init__(self, parent, -1) - self.log = log self.pdf = None sizer = wxBoxSizer(wxVERTICAL) @@ -95,7 +94,7 @@ class TestPanel(wxPanel): def runTest(frame, nb, log): if wxPlatform == '__WXMSW__': - win = TestPanel(nb, log) + win = TestPanel(nb) return win else: dlg = wxMessageDialog(frame, 'This demo only works on MSW.', diff --git a/wxPython/demo/GridEnterHandler.py b/wxPython/demo/GridEnterHandler.py index c5995da1f0..719c622ef0 100644 --- a/wxPython/demo/GridEnterHandler.py +++ b/wxPython/demo/GridEnterHandler.py @@ -27,6 +27,7 @@ class NewEnterHandlingGrid(wxGrid): evt.Skip() return + self.DisableCellEditControl() success = self.MoveCursorRight(evt.ShiftDown()) if not success: newRow = self.GetGridCursorRow() + 1 diff --git a/wxPython/demo/GridStdEdRend.py b/wxPython/demo/GridStdEdRend.py index f7c73b4055..5835a8227e 100644 --- a/wxPython/demo/GridStdEdRend.py +++ b/wxPython/demo/GridStdEdRend.py @@ -39,7 +39,7 @@ class MyCustomRenderer(wxPyGridCellRenderer): def Clone(self): - return MyCustomRenderer + return MyCustomRenderer() #--------------------------------------------------------------------------- diff --git a/wxPython/demo/MDIDemo.py b/wxPython/demo/MDIDemo.py index 007102cbc8..0e3b0ecad5 100644 --- a/wxPython/demo/MDIDemo.py +++ b/wxPython/demo/MDIDemo.py @@ -32,8 +32,7 @@ class MyParentFrame(wxMDIParentFrame): def OnNewWindow(self, evt): self.winCount = self.winCount + 1 win = wxMDIChildFrame(self, -1, "Child Window: %d" % self.winCount) - cs = win.GetClientSize() - canvas = MyCanvas(win, size=cs) + canvas = MyCanvas(win) win.Show(true) diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index 9a14510b02..989d7e448f 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -18,8 +18,6 @@ from wxPython.html import wxHtmlWindow #--------------------------------------------------------------------------- -_useSplitter = true -_useNestedSplitter = true _treeList = [ ('New since last release', ['wxDragImage', 'wxCalendarCtrl', 'wxSpinCtrl', @@ -84,22 +82,8 @@ class wxPythonDemo(wxFrame): self.Centre(wxBOTH) self.CreateStatusBar(1, wxST_SIZEGRIP) - if _useSplitter: - splitter = wxSplitterWindow(self, -1, style=wxNO_3D|wxSP_3D) - if _useNestedSplitter: - splitter2 = wxSplitterWindow(splitter, -1, style=wxNO_3D|wxSP_3D) - logParent = nbParent = splitter2 - else: - nbParent = splitter - logParent = wxFrame(self, -1, "wxPython Demo: log window", - (0,0), (500, 150)) - logParent.Show(true) - else: - nbParent = self - logParent = wxFrame(self, -1, "wxPython Demo: log window", - (0,0), (500, 150)) - logParent.Show(true) - + splitter = wxSplitterWindow(self, -1, style=wxNO_3D|wxSP_3D) + splitter2 = wxSplitterWindow(splitter, -1, style=wxNO_3D|wxSP_3D) # Prevent TreeCtrl from displaying all items after destruction @@ -140,33 +124,32 @@ class wxPythonDemo(wxFrame): # Create a TreeCtrl - if _useSplitter: - tID = wxNewId() - self.treeMap = {} - self.tree = wxTreeCtrl(splitter, tID, - style=wxTR_HAS_BUTTONS | - wxTR_EDIT_LABELS | - wxTR_HAS_VARIABLE_ROW_HEIGHT | - wxSUNKEN_BORDER) - #self.tree.SetBackgroundColour(wxNamedColour("Pink")) - root = self.tree.AddRoot("Overview") - firstChild = None - for item in _treeList: - child = self.tree.AppendItem(root, item[0]) - if not firstChild: firstChild = child - for childItem in item[1]: - theDemo = self.tree.AppendItem(child, childItem) - self.treeMap[childItem] = theDemo + tID = wxNewId() + self.treeMap = {} + self.tree = wxTreeCtrl(splitter, tID, + style=wxTR_HAS_BUTTONS | + wxTR_EDIT_LABELS | + wxTR_HAS_VARIABLE_ROW_HEIGHT | + wxSUNKEN_BORDER) + #self.tree.SetBackgroundColour(wxNamedColour("Pink")) + root = self.tree.AddRoot("Overview") + firstChild = None + for item in _treeList: + child = self.tree.AppendItem(root, item[0]) + if not firstChild: firstChild = child + for childItem in item[1]: + theDemo = self.tree.AppendItem(child, childItem) + self.treeMap[childItem] = theDemo - self.tree.Expand(root) - self.tree.Expand(firstChild) - EVT_TREE_ITEM_EXPANDED (self.tree, tID, self.OnItemExpanded) - EVT_TREE_ITEM_COLLAPSED (self.tree, tID, self.OnItemCollapsed) - EVT_TREE_SEL_CHANGED (self.tree, tID, self.OnSelChanged) - EVT_LEFT_DOWN (self.tree, self.OnTreeLeftDown) + self.tree.Expand(root) + self.tree.Expand(firstChild) + EVT_TREE_ITEM_EXPANDED (self.tree, tID, self.OnItemExpanded) + EVT_TREE_ITEM_COLLAPSED (self.tree, tID, self.OnItemCollapsed) + EVT_TREE_SEL_CHANGED (self.tree, tID, self.OnSelChanged) + EVT_LEFT_DOWN (self.tree, self.OnTreeLeftDown) # Create a Notebook - self.nb = wxNotebook(nbParent, -1) + self.nb = wxNotebook(splitter2, -1) # Set up a TextCtrl on the Overview Notebook page self.ovr = wxHtmlWindow(self.nb, -1) @@ -181,59 +164,48 @@ class wxPythonDemo(wxFrame): # Set up a log on the View Log Notebook page - self.log = wxTextCtrl(logParent, -1, + self.log = wxTextCtrl(splitter2, -1, style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL) - (w, self.charHeight) = self.log.GetTextExtent('X') - self.WriteText('wxPython Demo Log:\n') + # Set the wxWindows log target to be this textctrl + wxLog_SetActiveTarget(wxLogTextCtrl(self.log)) + + self.Show(true) # add the windows to the splitter and split it. - if _useSplitter: - if _useNestedSplitter: - splitter2.SplitHorizontally(self.nb, self.log) - splitter2.SetSashPosition(450, true) - splitter2.SetMinimumPaneSize(20) + splitter2.SplitHorizontally(self.nb, self.log) + splitter2.SetSashPosition(450, true) + splitter2.SetMinimumPaneSize(20) - splitter.SplitVertically(self.tree, splitter2) - else: - splitter.SplitVertically(self.tree, self.nb) + splitter.SplitVertically(self.tree, splitter2) + splitter.SetSashPosition(180, true) + splitter.SetMinimumPaneSize(20) - splitter.SetSashPosition(180, true) - splitter.SetMinimumPaneSize(20) - - - # make our log window be stdout - #sys.stdout = self # select initial items self.nb.SetSelection(0) - if _useSplitter: - self.tree.SelectItem(root) + self.tree.SelectItem(root) if len(sys.argv) == 2: try: selectedDemo = self.treeMap[sys.argv[1]] except: selectedDemo = None - if selectedDemo and _useSplitter: + if selectedDemo: self.tree.SelectItem(selectedDemo) self.tree.EnsureVisible(selectedDemo) - self.WriteText('window handle: %s\n' % self.GetHandle()) + wxLogMessage('window handle: %s' % self.GetHandle()) #--------------------------------------------- def WriteText(self, text): - self.log.WriteText(text) - w, h = self.log.GetClientSizeTuple() - numLines = h/self.charHeight - x, y = self.log.PositionToXY(self.log.GetLastPosition()) - if y > numLines: - self.log.ShowPosition(self.log.XYToPosition(x, y-numLines)) - ##self.log.ShowPosition(self.log.GetLastPosition()) - self.log.SetInsertionPointEnd() + if text[-1:] == '\n': + text = text[:-1] + wxLogMessage(text) + def write(self, txt): self.WriteText(txt) @@ -241,12 +213,12 @@ class wxPythonDemo(wxFrame): #--------------------------------------------- def OnItemExpanded(self, event): item = event.GetItem() - self.log.WriteText("OnItemExpanded: %s\n" % self.tree.GetItemText(item)) + wxLogMessage("OnItemExpanded: %s" % self.tree.GetItemText(item)) #--------------------------------------------- def OnItemCollapsed(self, event): item = event.GetItem() - self.log.WriteText("OnItemCollapsed: %s\n" % self.tree.GetItemText(item)) + wxLogMessage("OnItemCollapsed: %s" % self.tree.GetItemText(item)) #--------------------------------------------- @@ -285,6 +257,7 @@ class wxPythonDemo(wxFrame): else: if os.path.exists(itemText + '.py'): wxBeginBusyCursor() + wxLogMessage("Running demo %s.py..." % itemText) try: self.GetDemoFile(itemText + '.py') module = __import__(itemText, globals()) @@ -296,7 +269,7 @@ class wxPythonDemo(wxFrame): self.nb.Refresh(); wxYield() - self.window = module.runTest(self, self.nb, self) + self.window = module.runTest(self, self.nb, self) ### if self.window: self.nb.AddPage(self.window, 'Demo') wxYield() @@ -313,14 +286,11 @@ class wxPythonDemo(wxFrame): # Get the Demo files def GetDemoFile(self, filename): self.txt.Clear() - #if not self.txt.LoadFile(filename): - # self.txt.WriteText("Cannot open %s file." % filename) try: self.txt.SetValue(open(filename).read()) except IOError: self.txt.WriteText("Cannot open %s file." % filename) - self.txt.SetInsertionPoint(0) self.txt.ShowPosition(0) @@ -328,7 +298,7 @@ class wxPythonDemo(wxFrame): def SetOverview(self, name, text): self.curOverview = text lead = text[:6] - if lead != '' and lead != '') #text = '
' + text + '
' self.ovr.SetPage(text) @@ -341,13 +311,6 @@ class wxPythonDemo(wxFrame): def OnHelpAbout(self, event): - #about = wxMessageDialog(self, - # "wxPython is a Python extension module that\n" - # "encapsulates the wxWindows GUI classes.\n\n" - # "This demo shows off some of the capabilities\n" - # "of wxPython.\n\n" - # " Developed by Robin Dunn", - # "About wxPython", wxOK) from About import MyAboutBox about = MyAboutBox(self) about.ShowModal() @@ -370,25 +333,20 @@ class wxPythonDemo(wxFrame): #--------------------------------------------- def OnDemoMenu(self, event): - if _useSplitter: - try: - selectedDemo = self.treeMap[self.mainmenu.GetLabel(event.GetId())] - except: - selectedDemo = None - if selectedDemo: - self.tree.SelectItem(selectedDemo) - self.tree.EnsureVisible(selectedDemo) - else: - self.RunDemo(self.mainmenu.GetLabel(event.GetId())) + try: + selectedDemo = self.treeMap[self.mainmenu.GetLabel(event.GetId())] + except: + selectedDemo = None + if selectedDemo: + self.tree.SelectItem(selectedDemo) + self.tree.EnsureVisible(selectedDemo) #--------------------------------------------------------------------------- #--------------------------------------------------------------------------- class MyApp(wxApp): def OnInit(self): - wxImage_AddHandler(wxJPEGHandler()) - wxImage_AddHandler(wxPNGHandler()) - wxImage_AddHandler(wxGIFHandler()) + wxInitAllImageHandlers() self.splash = SplashScreen(None, bitmapfile='bitmaps/splash.gif', duration=4000, callback=self.AfterSplash) diff --git a/wxPython/demo/wxGrid.py b/wxPython/demo/wxGrid.py index 398ace2e2a..1e3b81606d 100644 --- a/wxPython/demo/wxGrid.py +++ b/wxPython/demo/wxGrid.py @@ -59,29 +59,42 @@ overview = """\

wxGrid

-This demo shows various ways of using the new and improved wxGrid class. -Unfortunatly it has not been documented yet, and while it is somewhat backwards compatible, -if you try to go by the current wxGrid documentation you will probably just confuse yourself. +This demo shows various ways of using the new and +improved wxGrid class. Unfortunatly it has not been +documented yet, and while it is somewhat backwards compatible, if you +try to go by the current wxGrid documentation you will probably just +confuse yourself.

-You can look at the sources for these samples to learn a lot about how the new classes work. +You can look at the sources for these samples to learn a lot about how +the new classes work.

    -
  1. GridSimple.py A simple grid that shows how to catch all the -various events. +
  2. GridSimple.py A simple grid that shows +how to catch all the various events. +

    -

  3. GridStdEdRend.py A grid that uses non-default Cell Editors -and Cell Renderers. +
  4. GridStdEdRend.py A grid that +uses non-default Cell Editors and Cell Renderers. +

    -

  5. GridHugeTable.py A grid that uses a non-default Grid Table. -This table is read-only and simply generates on the fly a unique string for each cell. +
  6. GridHugeTable.py A grid that +uses a non-default Grid Table. This table is read-only and simply +generates on the fly a unique string for each cell. +

    -

  7. GridCustTable.py This grid shows how to deal with tables -that have non-string data, and how Cell Editors and Cell Renderers are automatically chosen -based on the data type. +
  8. GridCustTable.py This grid +shows how to deal with tables that have non-string data, and how Cell +Editors and Cell Renderers are automatically chosen based on the data +type. +

    +

  9. GridEnterHandler.pyThis one +changes how the ENTER key works, moving the current cell left to right +and wrapping around to the next row when needed.

-You can also look at the SWIG interface file used to generate -the grid module for a lot more clues as to how things work. +You can also look at the SWIG interface +file used to generate the grid module for a lot more clues as to +how things work. """ diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/wxStyledTextCtrl_2.py index 6aca4f25a9..8d1fbd21f7 100644 --- a/wxPython/demo/wxStyledTextCtrl_2.py +++ b/wxPython/demo/wxStyledTextCtrl_2.py @@ -53,8 +53,6 @@ class PythonSTC(wxStyledTextCtrl): self.SetEdgeMode(wxSTC_EDGE_BACKGROUND) self.SetEdgeColumn(78) - self.SetCaretForeground("red") - # Setup a margin to hold fold markers #self.SetFoldFlags(16) ### WHAT IS THIS VALUE? WHAT ARE THE OTHER FLAGS? DOES IT MATTER? self.SetMarginType(2, wxSTC_MARGIN_SYMBOL) diff --git a/wxPython/distrib/README.dbg.txt b/wxPython/distrib/README.dbg.txt new file mode 100644 index 0000000000..b2289512b3 --- /dev/null +++ b/wxPython/distrib/README.dbg.txt @@ -0,0 +1,20 @@ +This zip file contains versions of the wxWindows and wxPython binaries +that have been compiled with __WXDEBUG__ defined. This adds code to +wxWindows that is a bit more agressive about checking parameter +values, return values, and etc. When the debugging library senses +something is wrong it will popup a message dialog telling you so. +Unfortunately the message is specific to the C++ code but it might +give you a hint about what went wrong and how to fix it. + +Another debugging feature is when the wxPython program exits, it will +print to stdout information about any wxWindows C++ objects that +havn't been properly cleaned up. + +This archive contains a new wxWindows DLL named wx[version]d.dll that +should be copied to the windows system directory or some other +directory on the PATH.You will also find replacements for all of +wxPython's *.pyd files that are linked to use this DLL. Until I put +together a new installer, you'll need to copy things manually. + + +Robin diff --git a/wxPython/distrib/makedbg.bat b/wxPython/distrib/makedbg.bat index b359e9ce0e..f4618328df 100755 --- a/wxPython/distrib/makedbg.bat +++ b/wxPython/distrib/makedbg.bat @@ -3,11 +3,12 @@ rem Builds a zip containing debugging versions of wxWindows and wxPython rem that could be unziped over a wxPython installation. -mkdir wxPython -copy %WXWIN%\lib\wx*_d.dll wxPython -copy %WXWIN%\utils\wxPython\*.pyd wxPython +mkdir wxPython-dbg +copy README.dbg.txt wxPython-dbg +copy %WXWIN%\lib\wx*d.dll wxPython-dbg +copy %WXWIN%\wxPython\wxPython\*.pyd wxPython-dbg -zip -r wxPython-dbg-%1.zip wxPython +zip -r wxPython-dbg-%1.zip wxPython-dbg -del /sx wxPython +del /sx wxPython-dbg diff --git a/wxPython/distrib/wxPython.WSM b/wxPython/distrib/wxPython.WSM index c9d520a20f..26e9687fea 100644 Binary files a/wxPython/distrib/wxPython.WSM and b/wxPython/distrib/wxPython.WSM differ diff --git a/wxPython/src/events.i b/wxPython/src/events.i index bc28ba4882..6ca6f66c18 100644 --- a/wxPython/src/events.i +++ b/wxPython/src/events.i @@ -169,6 +169,9 @@ public: bool ShiftDown(); long KeyCode(); + long GetKeyCode(); + bool HasModifiers(); + long GetX(); long GetY(); wxPoint GetPosition(); diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i index 346d710d4c..319d1000de 100644 --- a/wxPython/src/gdi.i +++ b/wxPython/src/gdi.i @@ -713,6 +713,7 @@ public: int GetImageCount(); bool Remove(int index); bool RemoveAll(); + void GetSize(int index, int& OUTPUT, int& OUTPUT); }; diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i index 3ca5b04492..957de4beb5 100644 --- a/wxPython/src/grid.i +++ b/wxPython/src/grid.i @@ -451,6 +451,8 @@ class wxGridCellRenderer { public: void SetParameters(const wxString& params); + void IncRef(); + void DecRef(); virtual void Draw(wxGrid& grid, wxGridCellAttr& attr, @@ -600,6 +602,8 @@ public: void SetControl(wxControl* control); void SetParameters(const wxString& params); + void IncRef(); + void DecRef(); virtual void Create(wxWindow* parent, wxWindowID id, @@ -612,6 +616,7 @@ public: virtual void SetSize(const wxRect& rect); virtual void Show(bool show, wxGridCellAttr *attr = NULL); virtual void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr); + virtual bool IsAcceptedKey(wxKeyEvent& event); virtual void StartingKey(wxKeyEvent& event); virtual void StartingClick(); virtual void HandleReturn(wxKeyEvent& event); @@ -715,6 +720,7 @@ public: DEC_PYCALLBACK___pure(Reset); DEC_PYCALLBACK__constany(SetSize, wxRect); + DEC_PYCALLBACK_bool_any(IsAcceptedKey, wxKeyEvent); DEC_PYCALLBACK__any(StartingKey, wxKeyEvent); DEC_PYCALLBACK__any(HandleReturn, wxKeyEvent); DEC_PYCALLBACK__(StartingClick); @@ -728,6 +734,7 @@ public: IMP_PYCALLBACK__STRING( wxPyGridCellEditor, wxGridCellEditor, SetParameters); IMP_PYCALLBACK___pure(wxPyGridCellEditor, wxGridCellEditor, Reset); IMP_PYCALLBACK__constany(wxPyGridCellEditor, wxGridCellEditor, SetSize, wxRect); +IMP_PYCALLBACK_bool_any(wxPyGridCellEditor, wxGridCellEditor, IsAcceptedKey, wxKeyEvent); IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, StartingKey, wxKeyEvent); IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, HandleReturn, wxKeyEvent); IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, StartingClick); diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h index 9a926f50bf..38dd0cddc6 100644 --- a/wxPython/src/helpers.h +++ b/wxPython/src/helpers.h @@ -1016,6 +1016,29 @@ public: //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_bool_any(CBNAME, Type) \ + bool CBNAME(Type& a); \ + bool base_##CBNAME(Type& a); + + +#define IMP_PYCALLBACK_bool_any(CLASS, PCLASS, CBNAME, Type) \ + bool CLASS::CBNAME(Type& a) { \ + bool rv; \ + bool doSave = wxPyRestoreThread(); \ + if (m_myInst.findCallback(#CBNAME)) \ + rv = m_myInst.callCallback(Py_BuildValue("(O)", \ + wxPyConstructObject(&a, #Type))); \ + else \ + rv = PCLASS::CBNAME(a); \ + wxPySaveThread(doSave); \ + return rv; \ + } \ + bool CLASS::base_##CBNAME(Type& a) { \ + return PCLASS::CBNAME(a); \ + } + +//--------------------------------------------------------------------------- + #endif diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i index e0cd6fedf1..7a7f49ad58 100644 --- a/wxPython/src/misc2.i +++ b/wxPython/src/misc2.i @@ -490,3 +490,113 @@ public: //---------------------------------------------------------------------- //---------------------------------------------------------------------- + +enum +{ + wxLOG_FatalError, // program can't continue, abort immediately + wxLOG_Error, // a serious error, user must be informed about it + wxLOG_Warning, // user is normally informed about it but may be ignored + wxLOG_Message, // normal message (i.e. normal output of a non GUI app) + wxLOG_Info, // informational message (a.k.a. 'Verbose') + wxLOG_Status, // informational: might go to the status line of GUI app + wxLOG_Debug, // never shown to the user, disabled in release mode + wxLOG_Trace, // trace messages are also only enabled in debug mode + wxLOG_Progress, // used for progress indicator (not yet) + wxLOG_User = 100 // user defined levels start here +}; + + +class wxLog +{ +public: + wxLog(); + + static bool IsEnabled(); + static bool EnableLogging(bool doIt = TRUE); + static void OnLog(wxLogLevel level, const char *szString, int t=0); + + virtual void Flush(); + bool HasPendingMessages() const; + + static void FlushActive(); + static wxLog *GetActiveTarget(); + static wxLog *SetActiveTarget(wxLog *pLogger); + + static void Suspend(); + static void Resume(); + + void SetVerbose(bool bVerbose = TRUE); + + static void DontCreateOnDemand(); + static void SetTraceMask(wxTraceMask ulMask); + static void AddTraceMask(const wxString& str); + static void RemoveTraceMask(const wxString& str); + + bool GetVerbose() const { return m_bVerbose; } + + static wxTraceMask GetTraceMask(); + static bool IsAllowedTraceMask(const char *mask); + +}; + + +class wxLogStderr : public wxLog +{ +public: + wxLogStderr(/* TODO: FILE *fp = (FILE *) NULL*/); +}; + + +class wxLogTextCtrl : public wxLog +{ +public: + wxLogTextCtrl(wxTextCtrl *pTextCtrl); +}; + + +class wxLogGui : public wxLog +{ +public: + wxLogGui(); +}; + +class wxLogWindow : public wxLog +{ +public: + wxLogWindow(wxFrame *pParent, // the parent frame (can be NULL) + const char *szTitle, // the title of the frame + bool bShow = TRUE, // show window immediately? + bool bPassToOld = TRUE); // pass log messages to the old target? + + void Show(bool bShow = TRUE); + wxFrame *GetFrame() const; + wxLog *GetOldLog() const; + bool IsPassingMessages() const; + void PassMessages(bool bDoPass) { m_bPassMessages = bDoPass; } +}; + + +class wxLogNull +{ +public: + wxLogNull(); + ~wxLogNull(); +}; + + +unsigned long wxSysErrorCode(); +const char* wxSysErrorMsg(unsigned long nErrCode = 0); +void wxLogFatalError(const char *szFormat); +void wxLogError(const char *szFormat); +void wxLogWarning(const char *szFormat); +void wxLogMessage(const char *szFormat); +void wxLogInfo(const char *szFormat); +void wxLogVerbose(const char *szFormat); +void wxLogStatus(const char *szFormat); +%name(wxLogStatusFrame)void wxLogStatus(wxFrame *pFrame, const char *szFormat); +void wxLogSysError(const char *szFormat); + + +//---------------------------------------------------------------------- +//---------------------------------------------------------------------- + diff --git a/wxPython/src/msw/events.cpp b/wxPython/src/msw/events.cpp index 586093b6d6..55ff3f82d4 100644 --- a/wxPython/src/msw/events.cpp +++ b/wxPython/src/msw/events.cpp @@ -2345,6 +2345,60 @@ static PyObject *_wrap_wxKeyEvent_KeyCode(PyObject *self, PyObject *args, PyObje return _resultobj; } +#define wxKeyEvent_GetKeyCode(_swigobj) (_swigobj->GetKeyCode()) +static PyObject *_wrap_wxKeyEvent_GetKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + long _result; + wxKeyEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxKeyEvent_GetKeyCode",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxKeyEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_GetKeyCode. Expected _wxKeyEvent_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (long )wxKeyEvent_GetKeyCode(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxKeyEvent_HasModifiers(_swigobj) (_swigobj->HasModifiers()) +static PyObject *_wrap_wxKeyEvent_HasModifiers(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxKeyEvent * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxKeyEvent_HasModifiers",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxKeyEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_HasModifiers. Expected _wxKeyEvent_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxKeyEvent_HasModifiers(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxKeyEvent_GetX(_swigobj) (_swigobj->GetX()) static PyObject *_wrap_wxKeyEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -5105,6 +5159,8 @@ static PyMethodDef eventscMethods[] = { { "wxKeyEvent_GetPosition", (PyCFunction) _wrap_wxKeyEvent_GetPosition, METH_VARARGS | METH_KEYWORDS }, { "wxKeyEvent_GetY", (PyCFunction) _wrap_wxKeyEvent_GetY, METH_VARARGS | METH_KEYWORDS }, { "wxKeyEvent_GetX", (PyCFunction) _wrap_wxKeyEvent_GetX, METH_VARARGS | METH_KEYWORDS }, + { "wxKeyEvent_HasModifiers", (PyCFunction) _wrap_wxKeyEvent_HasModifiers, METH_VARARGS | METH_KEYWORDS }, + { "wxKeyEvent_GetKeyCode", (PyCFunction) _wrap_wxKeyEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS }, { "wxKeyEvent_KeyCode", (PyCFunction) _wrap_wxKeyEvent_KeyCode, METH_VARARGS | METH_KEYWORDS }, { "wxKeyEvent_ShiftDown", (PyCFunction) _wrap_wxKeyEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS }, { "wxKeyEvent_AltDown", (PyCFunction) _wrap_wxKeyEvent_AltDown, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/events.py b/wxPython/src/msw/events.py index 26fc37001f..e5ca31ceb0 100644 --- a/wxPython/src/msw/events.py +++ b/wxPython/src/msw/events.py @@ -324,6 +324,12 @@ class wxKeyEventPtr(wxEventPtr): def KeyCode(self, *_args, **_kwargs): val = apply(eventsc.wxKeyEvent_KeyCode,(self,) + _args, _kwargs) return val + def GetKeyCode(self, *_args, **_kwargs): + val = apply(eventsc.wxKeyEvent_GetKeyCode,(self,) + _args, _kwargs) + return val + def HasModifiers(self, *_args, **_kwargs): + val = apply(eventsc.wxKeyEvent_HasModifiers,(self,) + _args, _kwargs) + return val def GetX(self, *_args, **_kwargs): val = apply(eventsc.wxKeyEvent_GetX,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/msw/gdi.cpp b/wxPython/src/msw/gdi.cpp index 48708ba9ad..4b1c936e7d 100644 --- a/wxPython/src/msw/gdi.cpp +++ b/wxPython/src/msw/gdi.cpp @@ -8090,7 +8090,56 @@ static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args, PyO return _resultobj; } +#define wxImageList_GetSize(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->GetSize(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxImageList_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxImageList * _arg0; + int _arg1; + int * _arg2; + int temp; + int * _arg3; + int temp0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","index", NULL }; + + self = self; +{ + _arg2 = &temp; +} +{ + _arg3 = &temp0; +} + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxImageList_GetSize",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_GetSize. Expected _wxImageList_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxImageList_GetSize(_arg0,_arg1,*_arg2,*_arg3); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg3)); + _resultobj = t_output_helper(_resultobj, o); +} + return _resultobj; +} + static PyMethodDef gdicMethods[] = { + { "wxImageList_GetSize", (PyCFunction) _wrap_wxImageList_GetSize, METH_VARARGS | METH_KEYWORDS }, { "wxImageList_RemoveAll", (PyCFunction) _wrap_wxImageList_RemoveAll, METH_VARARGS | METH_KEYWORDS }, { "wxImageList_Remove", (PyCFunction) _wrap_wxImageList_Remove, METH_VARARGS | METH_KEYWORDS }, { "wxImageList_GetImageCount", (PyCFunction) _wrap_wxImageList_GetImageCount, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py index f0697ae57c..5f8cf2c835 100644 --- a/wxPython/src/msw/gdi.py +++ b/wxPython/src/msw/gdi.py @@ -867,6 +867,9 @@ class wxImageListPtr : def RemoveAll(self, *_args, **_kwargs): val = apply(gdic.wxImageList_RemoveAll,(self,) + _args, _kwargs) return val + def GetSize(self, *_args, **_kwargs): + val = apply(gdic.wxImageList_GetSize,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxImageList(wxImageListPtr): diff --git a/wxPython/src/msw/grid.cpp b/wxPython/src/msw/grid.cpp index 2b72368545..1e6b206c65 100644 --- a/wxPython/src/msw/grid.cpp +++ b/wxPython/src/msw/grid.cpp @@ -646,6 +646,7 @@ public: DEC_PYCALLBACK___pure(Reset); DEC_PYCALLBACK__constany(SetSize, wxRect); + DEC_PYCALLBACK_bool_any(IsAcceptedKey, wxKeyEvent); DEC_PYCALLBACK__any(StartingKey, wxKeyEvent); DEC_PYCALLBACK__any(HandleReturn, wxKeyEvent); DEC_PYCALLBACK__(StartingClick); @@ -659,6 +660,7 @@ public: IMP_PYCALLBACK__STRING( wxPyGridCellEditor, wxGridCellEditor, SetParameters); IMP_PYCALLBACK___pure(wxPyGridCellEditor, wxGridCellEditor, Reset); IMP_PYCALLBACK__constany(wxPyGridCellEditor, wxGridCellEditor, SetSize, wxRect); +IMP_PYCALLBACK_bool_any(wxPyGridCellEditor, wxGridCellEditor, IsAcceptedKey, wxKeyEvent); IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, StartingKey, wxKeyEvent); IMP_PYCALLBACK__any(wxPyGridCellEditor, wxGridCellEditor, HandleReturn, wxKeyEvent); IMP_PYCALLBACK__(wxPyGridCellEditor, wxGridCellEditor, StartingClick); @@ -898,6 +900,60 @@ static PyObject *_wrap_wxGridCellRenderer_SetParameters(PyObject *self, PyObject return _resultobj; } +#define wxGridCellRenderer_IncRef(_swigobj) (_swigobj->IncRef()) +static PyObject *_wrap_wxGridCellRenderer_IncRef(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGridCellRenderer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCellRenderer_IncRef",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCellRenderer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCellRenderer_IncRef. Expected _wxGridCellRenderer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxGridCellRenderer_IncRef(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGridCellRenderer_DecRef(_swigobj) (_swigobj->DecRef()) +static PyObject *_wrap_wxGridCellRenderer_DecRef(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGridCellRenderer * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCellRenderer_DecRef",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCellRenderer_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCellRenderer_DecRef. Expected _wxGridCellRenderer_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxGridCellRenderer_DecRef(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxGridCellRenderer_Draw(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (_swigobj->Draw(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6)) static PyObject *_wrap_wxGridCellRenderer_Draw(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1564,6 +1620,60 @@ static PyObject *_wrap_wxGridCellEditor_SetParameters(PyObject *self, PyObject * return _resultobj; } +#define wxGridCellEditor_IncRef(_swigobj) (_swigobj->IncRef()) +static PyObject *_wrap_wxGridCellEditor_IncRef(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGridCellEditor * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCellEditor_IncRef",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCellEditor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCellEditor_IncRef. Expected _wxGridCellEditor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxGridCellEditor_IncRef(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxGridCellEditor_DecRef(_swigobj) (_swigobj->DecRef()) +static PyObject *_wrap_wxGridCellEditor_DecRef(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxGridCellEditor * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCellEditor_DecRef",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCellEditor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCellEditor_DecRef. Expected _wxGridCellEditor_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxGridCellEditor_DecRef(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxGridCellEditor_Create(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->Create(_swigarg0,_swigarg1,_swigarg2)) static PyObject *_wrap_wxGridCellEditor_Create(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1865,6 +1975,42 @@ static PyObject *_wrap_wxGridCellEditor_PaintBackground(PyObject *self, PyObject return _resultobj; } +#define wxGridCellEditor_IsAcceptedKey(_swigobj,_swigarg0) (_swigobj->IsAcceptedKey(_swigarg0)) +static PyObject *_wrap_wxGridCellEditor_IsAcceptedKey(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxGridCellEditor * _arg0; + wxKeyEvent * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","event", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGridCellEditor_IsAcceptedKey",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCellEditor_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCellEditor_IsAcceptedKey. Expected _wxGridCellEditor_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxKeyEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridCellEditor_IsAcceptedKey. Expected _wxKeyEvent_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxGridCellEditor_IsAcceptedKey(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxGridCellEditor_StartingKey(_swigobj,_swigarg0) (_swigobj->StartingKey(_swigarg0)) static PyObject *_wrap_wxGridCellEditor_StartingKey(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -12603,6 +12749,7 @@ static PyMethodDef gridcMethods[] = { { "wxGridCellEditor_HandleReturn", (PyCFunction) _wrap_wxGridCellEditor_HandleReturn, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellEditor_StartingClick", (PyCFunction) _wrap_wxGridCellEditor_StartingClick, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellEditor_StartingKey", (PyCFunction) _wrap_wxGridCellEditor_StartingKey, METH_VARARGS | METH_KEYWORDS }, + { "wxGridCellEditor_IsAcceptedKey", (PyCFunction) _wrap_wxGridCellEditor_IsAcceptedKey, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellEditor_PaintBackground", (PyCFunction) _wrap_wxGridCellEditor_PaintBackground, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellEditor_Show", (PyCFunction) _wrap_wxGridCellEditor_Show, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellEditor_SetSize", (PyCFunction) _wrap_wxGridCellEditor_SetSize, METH_VARARGS | METH_KEYWORDS }, @@ -12611,6 +12758,8 @@ static PyMethodDef gridcMethods[] = { { "wxGridCellEditor_EndEdit", (PyCFunction) _wrap_wxGridCellEditor_EndEdit, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellEditor_BeginEdit", (PyCFunction) _wrap_wxGridCellEditor_BeginEdit, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellEditor_Create", (PyCFunction) _wrap_wxGridCellEditor_Create, METH_VARARGS | METH_KEYWORDS }, + { "wxGridCellEditor_DecRef", (PyCFunction) _wrap_wxGridCellEditor_DecRef, METH_VARARGS | METH_KEYWORDS }, + { "wxGridCellEditor_IncRef", (PyCFunction) _wrap_wxGridCellEditor_IncRef, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellEditor_SetParameters", (PyCFunction) _wrap_wxGridCellEditor_SetParameters, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellEditor_SetControl", (PyCFunction) _wrap_wxGridCellEditor_SetControl, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellEditor_GetControl", (PyCFunction) _wrap_wxGridCellEditor_GetControl, METH_VARARGS | METH_KEYWORDS }, @@ -12629,6 +12778,8 @@ static PyMethodDef gridcMethods[] = { { "wxGridCellRenderer_Clone", (PyCFunction) _wrap_wxGridCellRenderer_Clone, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellRenderer_GetBestSize", (PyCFunction) _wrap_wxGridCellRenderer_GetBestSize, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellRenderer_Draw", (PyCFunction) _wrap_wxGridCellRenderer_Draw, METH_VARARGS | METH_KEYWORDS }, + { "wxGridCellRenderer_DecRef", (PyCFunction) _wrap_wxGridCellRenderer_DecRef, METH_VARARGS | METH_KEYWORDS }, + { "wxGridCellRenderer_IncRef", (PyCFunction) _wrap_wxGridCellRenderer_IncRef, METH_VARARGS | METH_KEYWORDS }, { "wxGridCellRenderer_SetParameters", (PyCFunction) _wrap_wxGridCellRenderer_SetParameters, METH_VARARGS | METH_KEYWORDS }, { NULL, NULL } }; diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py index f4067138f1..d45de410e5 100644 --- a/wxPython/src/msw/grid.py +++ b/wxPython/src/msw/grid.py @@ -67,6 +67,12 @@ class wxGridCellRendererPtr : def SetParameters(self, *_args, **_kwargs): val = apply(gridc.wxGridCellRenderer_SetParameters,(self,) + _args, _kwargs) return val + def IncRef(self, *_args, **_kwargs): + val = apply(gridc.wxGridCellRenderer_IncRef,(self,) + _args, _kwargs) + return val + def DecRef(self, *_args, **_kwargs): + val = apply(gridc.wxGridCellRenderer_DecRef,(self,) + _args, _kwargs) + return val def Draw(self, *_args, **_kwargs): val = apply(gridc.wxGridCellRenderer_Draw,(self,) + _args, _kwargs) return val @@ -193,6 +199,12 @@ class wxGridCellEditorPtr : def SetParameters(self, *_args, **_kwargs): val = apply(gridc.wxGridCellEditor_SetParameters,(self,) + _args, _kwargs) return val + def IncRef(self, *_args, **_kwargs): + val = apply(gridc.wxGridCellEditor_IncRef,(self,) + _args, _kwargs) + return val + def DecRef(self, *_args, **_kwargs): + val = apply(gridc.wxGridCellEditor_DecRef,(self,) + _args, _kwargs) + return val def Create(self, *_args, **_kwargs): val = apply(gridc.wxGridCellEditor_Create,(self,) + _args, _kwargs) return val @@ -218,6 +230,9 @@ class wxGridCellEditorPtr : def PaintBackground(self, *_args, **_kwargs): val = apply(gridc.wxGridCellEditor_PaintBackground,(self,) + _args, _kwargs) return val + def IsAcceptedKey(self, *_args, **_kwargs): + val = apply(gridc.wxGridCellEditor_IsAcceptedKey,(self,) + _args, _kwargs) + return val def StartingKey(self, *_args, **_kwargs): val = apply(gridc.wxGridCellEditor_StartingKey,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/msw/misc2.cpp b/wxPython/src/msw/misc2.cpp index 49a564acf3..d78be2fe56 100644 --- a/wxPython/src/msw/misc2.cpp +++ b/wxPython/src/msw/misc2.cpp @@ -1450,6 +1450,212 @@ static PyObject *_wrap_wxDragListItem(PyObject *self, PyObject *args, PyObject * return _resultobj; } +static PyObject *_wrap_wxSysErrorCode(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + unsigned long _result; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxSysErrorCode",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (unsigned long )wxSysErrorCode(); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +static PyObject *_wrap_wxSysErrorMsg(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char * _result; + unsigned long _arg0 = (unsigned long ) 0; + char *_kwnames[] = { "nErrCode", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|l:wxSysErrorMsg",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (char *)wxSysErrorMsg(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("s", _result); + return _resultobj; +} + +static PyObject *_wrap_wxLogFatalError(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char * _arg0; + char *_kwnames[] = { "szFormat", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxLogFatalError",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLogFatalError(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLogError(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char * _arg0; + char *_kwnames[] = { "szFormat", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxLogError",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLogError(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLogWarning(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char * _arg0; + char *_kwnames[] = { "szFormat", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxLogWarning",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLogWarning(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLogMessage(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char * _arg0; + char *_kwnames[] = { "szFormat", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxLogMessage",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLogMessage(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLogInfo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char * _arg0; + char *_kwnames[] = { "szFormat", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxLogInfo",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLogInfo(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLogVerbose(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char * _arg0; + char *_kwnames[] = { "szFormat", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxLogVerbose",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLogVerbose(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLogStatus(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char * _arg0; + char *_kwnames[] = { "szFormat", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxLogStatus",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLogStatus(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLogStatusFrame(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFrame * _arg0; + char * _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "pFrame","szFormat", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os:wxLogStatusFrame",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLogStatusFrame. Expected _wxFrame_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLogStatus(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLogSysError(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char * _arg0; + char *_kwnames[] = { "szFormat", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxLogSysError",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLogSysError(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define new_wxToolTip(_swigarg0) (new wxToolTip(_swigarg0)) static PyObject *_wrap_new_wxToolTip(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3106,7 +3312,850 @@ static PyObject *_wrap_wxPyTimer_Stop(PyObject *self, PyObject *args, PyObject * return _resultobj; } +#define new_wxLog() (new wxLog()) +static PyObject *_wrap_new_wxLog(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLog * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxLog",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxLog *)new_wxLog(); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxLog_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static PyObject *_wrap_wxLog_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxLog_IsEnabled",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxLog::IsEnabled(); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject *_wrap_wxLog_EnableLogging(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + bool _arg0 = (bool ) TRUE; + int tempbool0 = (int) TRUE; + char *_kwnames[] = { "doIt", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|i:wxLog_EnableLogging",_kwnames,&tempbool0)) + return NULL; + _arg0 = (bool ) tempbool0; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxLog::EnableLogging(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject *_wrap_wxLog_OnLog(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLogLevel * _arg0; + char * _arg1; + int _arg2 = (int ) 0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "level","szString","t", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|i:wxLog_OnLog",_kwnames,&_argo0,&_arg1,&_arg2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLogLevel_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLog_OnLog. Expected _wxLogLevel_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLog::OnLog(*_arg0,_arg1,_arg2); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxLog_Flush(_swigobj) (_swigobj->Flush()) +static PyObject *_wrap_wxLog_Flush(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLog * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLog_Flush",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLog_Flush. Expected _wxLog_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLog_Flush(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxLog_HasPendingMessages(_swigobj) (_swigobj->HasPendingMessages()) +static PyObject *_wrap_wxLog_HasPendingMessages(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxLog * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLog_HasPendingMessages",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLog_HasPendingMessages. Expected _wxLog_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxLog_HasPendingMessages(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject *_wrap_wxLog_FlushActive(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxLog_FlushActive",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLog::FlushActive(); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLog_GetActiveTarget(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLog * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxLog_GetActiveTarget",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxLog *)wxLog::GetActiveTarget(); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxLog_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static PyObject *_wrap_wxLog_SetActiveTarget(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLog * _result; + wxLog * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "pLogger", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLog_SetActiveTarget",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLog_SetActiveTarget. Expected _wxLog_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxLog *)wxLog::SetActiveTarget(_arg0); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxLog_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static PyObject *_wrap_wxLog_Suspend(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxLog_Suspend",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLog::Suspend(); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLog_Resume(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxLog_Resume",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLog::Resume(); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxLog_SetVerbose(_swigobj,_swigarg0) (_swigobj->SetVerbose(_swigarg0)) +static PyObject *_wrap_wxLog_SetVerbose(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLog * _arg0; + bool _arg1 = (bool ) TRUE; + PyObject * _argo0 = 0; + int tempbool1 = (int) TRUE; + char *_kwnames[] = { "self","bVerbose", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxLog_SetVerbose",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLog_SetVerbose. Expected _wxLog_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLog_SetVerbose(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLog_DontCreateOnDemand(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + char *_kwnames[] = { NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxLog_DontCreateOnDemand",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLog::DontCreateOnDemand(); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLog_SetTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTraceMask * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "ulMask", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLog_SetTraceMask",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTraceMask_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLog_SetTraceMask. Expected _wxTraceMask_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLog::SetTraceMask(*_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxLog_AddTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _arg0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "str", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLog_AddTraceMask",_kwnames,&_obj0)) + return NULL; +{ + if (!PyString_Check(_obj0)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0)); +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLog::AddTraceMask(*_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj0) + delete _arg0; +} + return _resultobj; +} + +static PyObject *_wrap_wxLog_RemoveTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _arg0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "str", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLog_RemoveTraceMask",_kwnames,&_obj0)) + return NULL; +{ + if (!PyString_Check(_obj0)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0)); +} +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLog::RemoveTraceMask(*_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj0) + delete _arg0; +} + return _resultobj; +} + +#define wxLog_GetVerbose(_swigobj) (_swigobj->GetVerbose()) +static PyObject *_wrap_wxLog_GetVerbose(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxLog * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLog_GetVerbose",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLog_GetVerbose. Expected _wxLog_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxLog_GetVerbose(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static PyObject *_wrap_wxLog_GetTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxTraceMask * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxLog_GetTraceMask",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = new wxTraceMask (wxLog::GetTraceMask()); + + wxPy_END_ALLOW_THREADS; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxTraceMask_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +static PyObject *_wrap_wxLog_IsAllowedTraceMask(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + char * _arg0; + char *_kwnames[] = { "mask", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxLog_IsAllowedTraceMask",_kwnames,&_arg0)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxLog::IsAllowedTraceMask(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +static void *SwigwxLogStderrTowxLog(void *ptr) { + wxLogStderr *src; + wxLog *dest; + src = (wxLogStderr *) ptr; + dest = (wxLog *) src; + return (void *) dest; +} + +#define new_wxLogStderr() (new wxLogStderr()) +static PyObject *_wrap_new_wxLogStderr(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLogStderr * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxLogStderr",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxLogStderr *)new_wxLogStderr(); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxLogStderr_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static void *SwigwxLogTextCtrlTowxLog(void *ptr) { + wxLogTextCtrl *src; + wxLog *dest; + src = (wxLogTextCtrl *) ptr; + dest = (wxLog *) src; + return (void *) dest; +} + +#define new_wxLogTextCtrl(_swigarg0) (new wxLogTextCtrl(_swigarg0)) +static PyObject *_wrap_new_wxLogTextCtrl(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLogTextCtrl * _result; + wxTextCtrl * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "pTextCtrl", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxLogTextCtrl",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxLogTextCtrl. Expected _wxTextCtrl_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxLogTextCtrl *)new_wxLogTextCtrl(_arg0); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxLogTextCtrl_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static void *SwigwxLogGuiTowxLog(void *ptr) { + wxLogGui *src; + wxLog *dest; + src = (wxLogGui *) ptr; + dest = (wxLog *) src; + return (void *) dest; +} + +#define new_wxLogGui() (new wxLogGui()) +static PyObject *_wrap_new_wxLogGui(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLogGui * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxLogGui",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxLogGui *)new_wxLogGui(); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxLogGui_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +static void *SwigwxLogWindowTowxLog(void *ptr) { + wxLogWindow *src; + wxLog *dest; + src = (wxLogWindow *) ptr; + dest = (wxLog *) src; + return (void *) dest; +} + +#define new_wxLogWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxLogWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_new_wxLogWindow(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLogWindow * _result; + wxFrame * _arg0; + char * _arg1; + bool _arg2 = (bool ) TRUE; + bool _arg3 = (bool ) TRUE; + PyObject * _argo0 = 0; + int tempbool2 = (int) TRUE; + int tempbool3 = (int) TRUE; + char *_kwnames[] = { "pParent","szTitle","bShow","bPassToOld", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|ii:new_wxLogWindow",_kwnames,&_argo0,&_arg1,&tempbool2,&tempbool3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxLogWindow. Expected _wxFrame_p."); + return NULL; + } + } + _arg2 = (bool ) tempbool2; + _arg3 = (bool ) tempbool3; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxLogWindow *)new_wxLogWindow(_arg0,_arg1,_arg2,_arg3); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxLogWindow_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxLogWindow_Show(_swigobj,_swigarg0) (_swigobj->Show(_swigarg0)) +static PyObject *_wrap_wxLogWindow_Show(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLogWindow * _arg0; + bool _arg1 = (bool ) TRUE; + PyObject * _argo0 = 0; + int tempbool1 = (int) TRUE; + char *_kwnames[] = { "self","bShow", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxLogWindow_Show",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLogWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLogWindow_Show. Expected _wxLogWindow_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLogWindow_Show(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxLogWindow_GetFrame(_swigobj) (_swigobj->GetFrame()) +static PyObject *_wrap_wxLogWindow_GetFrame(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxFrame * _result; + wxLogWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogWindow_GetFrame",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLogWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLogWindow_GetFrame. Expected _wxLogWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxFrame *)wxLogWindow_GetFrame(_arg0); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxFrame_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxLogWindow_GetOldLog(_swigobj) (_swigobj->GetOldLog()) +static PyObject *_wrap_wxLogWindow_GetOldLog(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLog * _result; + wxLogWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogWindow_GetOldLog",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLogWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLogWindow_GetOldLog. Expected _wxLogWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxLog *)wxLogWindow_GetOldLog(_arg0); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxLog_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxLogWindow_IsPassingMessages(_swigobj) (_swigobj->IsPassingMessages()) +static PyObject *_wrap_wxLogWindow_IsPassingMessages(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxLogWindow * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLogWindow_IsPassingMessages",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLogWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLogWindow_IsPassingMessages. Expected _wxLogWindow_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (bool )wxLogWindow_IsPassingMessages(_arg0); + + wxPy_END_ALLOW_THREADS; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxLogWindow_PassMessages(_swigobj,_swigarg0) (_swigobj->PassMessages(_swigarg0)) +static PyObject *_wrap_wxLogWindow_PassMessages(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLogWindow * _arg0; + bool _arg1; + PyObject * _argo0 = 0; + int tempbool1; + char *_kwnames[] = { "self","bDoPass", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxLogWindow_PassMessages",_kwnames,&_argo0,&tempbool1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLogWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxLogWindow_PassMessages. Expected _wxLogWindow_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; +{ + wxPy_BEGIN_ALLOW_THREADS; + wxLogWindow_PassMessages(_arg0,_arg1); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define new_wxLogNull() (new wxLogNull()) +static PyObject *_wrap_new_wxLogNull(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLogNull * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxLogNull",_kwnames)) + return NULL; +{ + wxPy_BEGIN_ALLOW_THREADS; + _result = (wxLogNull *)new_wxLogNull(); + + wxPy_END_ALLOW_THREADS; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxLogNull_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define delete_wxLogNull(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxLogNull(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxLogNull * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxLogNull",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxLogNull_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxLogNull. Expected _wxLogNull_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + delete_wxLogNull(_arg0); + + wxPy_END_ALLOW_THREADS; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static PyMethodDef misc2cMethods[] = { + { "delete_wxLogNull", (PyCFunction) _wrap_delete_wxLogNull, METH_VARARGS | METH_KEYWORDS }, + { "new_wxLogNull", (PyCFunction) _wrap_new_wxLogNull, METH_VARARGS | METH_KEYWORDS }, + { "wxLogWindow_PassMessages", (PyCFunction) _wrap_wxLogWindow_PassMessages, METH_VARARGS | METH_KEYWORDS }, + { "wxLogWindow_IsPassingMessages", (PyCFunction) _wrap_wxLogWindow_IsPassingMessages, METH_VARARGS | METH_KEYWORDS }, + { "wxLogWindow_GetOldLog", (PyCFunction) _wrap_wxLogWindow_GetOldLog, METH_VARARGS | METH_KEYWORDS }, + { "wxLogWindow_GetFrame", (PyCFunction) _wrap_wxLogWindow_GetFrame, METH_VARARGS | METH_KEYWORDS }, + { "wxLogWindow_Show", (PyCFunction) _wrap_wxLogWindow_Show, METH_VARARGS | METH_KEYWORDS }, + { "new_wxLogWindow", (PyCFunction) _wrap_new_wxLogWindow, METH_VARARGS | METH_KEYWORDS }, + { "new_wxLogGui", (PyCFunction) _wrap_new_wxLogGui, METH_VARARGS | METH_KEYWORDS }, + { "new_wxLogTextCtrl", (PyCFunction) _wrap_new_wxLogTextCtrl, METH_VARARGS | METH_KEYWORDS }, + { "new_wxLogStderr", (PyCFunction) _wrap_new_wxLogStderr, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_IsAllowedTraceMask", (PyCFunction) _wrap_wxLog_IsAllowedTraceMask, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_GetTraceMask", (PyCFunction) _wrap_wxLog_GetTraceMask, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_GetVerbose", (PyCFunction) _wrap_wxLog_GetVerbose, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_RemoveTraceMask", (PyCFunction) _wrap_wxLog_RemoveTraceMask, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_AddTraceMask", (PyCFunction) _wrap_wxLog_AddTraceMask, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_SetTraceMask", (PyCFunction) _wrap_wxLog_SetTraceMask, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_DontCreateOnDemand", (PyCFunction) _wrap_wxLog_DontCreateOnDemand, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_SetVerbose", (PyCFunction) _wrap_wxLog_SetVerbose, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_Resume", (PyCFunction) _wrap_wxLog_Resume, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_Suspend", (PyCFunction) _wrap_wxLog_Suspend, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_SetActiveTarget", (PyCFunction) _wrap_wxLog_SetActiveTarget, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_GetActiveTarget", (PyCFunction) _wrap_wxLog_GetActiveTarget, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_FlushActive", (PyCFunction) _wrap_wxLog_FlushActive, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_HasPendingMessages", (PyCFunction) _wrap_wxLog_HasPendingMessages, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_Flush", (PyCFunction) _wrap_wxLog_Flush, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_OnLog", (PyCFunction) _wrap_wxLog_OnLog, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_EnableLogging", (PyCFunction) _wrap_wxLog_EnableLogging, METH_VARARGS | METH_KEYWORDS }, + { "wxLog_IsEnabled", (PyCFunction) _wrap_wxLog_IsEnabled, METH_VARARGS | METH_KEYWORDS }, + { "new_wxLog", (PyCFunction) _wrap_new_wxLog, METH_VARARGS | METH_KEYWORDS }, { "wxPyTimer_Stop", (PyCFunction) _wrap_wxPyTimer_Stop, METH_VARARGS | METH_KEYWORDS }, { "wxPyTimer_Start", (PyCFunction) _wrap_wxPyTimer_Start, METH_VARARGS | METH_KEYWORDS }, { "wxPyTimer_SetOwner", (PyCFunction) _wrap_wxPyTimer_SetOwner, METH_VARARGS | METH_KEYWORDS }, @@ -3157,6 +4206,17 @@ static PyMethodDef misc2cMethods[] = { { "wxToolTip_GetTip", (PyCFunction) _wrap_wxToolTip_GetTip, METH_VARARGS | METH_KEYWORDS }, { "wxToolTip_SetTip", (PyCFunction) _wrap_wxToolTip_SetTip, METH_VARARGS | METH_KEYWORDS }, { "new_wxToolTip", (PyCFunction) _wrap_new_wxToolTip, METH_VARARGS | METH_KEYWORDS }, + { "wxLogSysError", (PyCFunction) _wrap_wxLogSysError, METH_VARARGS | METH_KEYWORDS }, + { "wxLogStatusFrame", (PyCFunction) _wrap_wxLogStatusFrame, METH_VARARGS | METH_KEYWORDS }, + { "wxLogStatus", (PyCFunction) _wrap_wxLogStatus, METH_VARARGS | METH_KEYWORDS }, + { "wxLogVerbose", (PyCFunction) _wrap_wxLogVerbose, METH_VARARGS | METH_KEYWORDS }, + { "wxLogInfo", (PyCFunction) _wrap_wxLogInfo, METH_VARARGS | METH_KEYWORDS }, + { "wxLogMessage", (PyCFunction) _wrap_wxLogMessage, METH_VARARGS | METH_KEYWORDS }, + { "wxLogWarning", (PyCFunction) _wrap_wxLogWarning, METH_VARARGS | METH_KEYWORDS }, + { "wxLogError", (PyCFunction) _wrap_wxLogError, METH_VARARGS | METH_KEYWORDS }, + { "wxLogFatalError", (PyCFunction) _wrap_wxLogFatalError, METH_VARARGS | METH_KEYWORDS }, + { "wxSysErrorMsg", (PyCFunction) _wrap_wxSysErrorMsg, METH_VARARGS | METH_KEYWORDS }, + { "wxSysErrorCode", (PyCFunction) _wrap_wxSysErrorCode, METH_VARARGS | METH_KEYWORDS }, { "wxDragListItem", (PyCFunction) _wrap_wxDragListItem, METH_VARARGS | METH_KEYWORDS }, { "wxDragTreeItem", (PyCFunction) _wrap_wxDragTreeItem, METH_VARARGS | METH_KEYWORDS }, { "wxDragString", (PyCFunction) _wrap_wxDragString, METH_VARARGS | METH_KEYWORDS }, @@ -3228,6 +4288,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, { "_wxCursor","_class_wxCursor",0}, { "_wxNotifyEvent","_class_wxNotifyEvent",0}, + { "_wxLog","_class_wxLogWindow",SwigwxLogWindowTowxLog}, + { "_wxLog","_wxLogWindow",SwigwxLogWindowTowxLog}, + { "_wxLog","_class_wxLogGui",SwigwxLogGuiTowxLog}, + { "_wxLog","_wxLogGui",SwigwxLogGuiTowxLog}, + { "_wxLog","_class_wxLogTextCtrl",SwigwxLogTextCtrlTowxLog}, + { "_wxLog","_wxLogTextCtrl",SwigwxLogTextCtrlTowxLog}, + { "_wxLog","_class_wxLogStderr",SwigwxLogStderrTowxLog}, + { "_wxLog","_wxLogStderr",SwigwxLogStderrTowxLog}, + { "_wxLog","_class_wxLog",0}, { "_wxMask","_class_wxMask",0}, { "_wxToolTip","_class_wxToolTip",0}, { "_wxPen","_class_wxPen",0}, @@ -3257,6 +4326,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0}, { "_wxPrinterDC","_class_wxPrinterDC",0}, { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0}, + { "_wxLogGui","_class_wxLogGui",0}, { "_class_wxMenuItem","_wxMenuItem",0}, { "_class_wxPaintEvent","_wxPaintEvent",0}, { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0}, @@ -3291,6 +4361,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxRect","_class_wxRect",0}, { "_wxCommandEvent","_class_wxCommandEvent",0}, { "_wxSizeEvent","_class_wxSizeEvent",0}, + { "_class_wxLogWindow","_wxLogWindow",0}, { "_wxPoint","_class_wxPoint",0}, { "_char","_wxChar",0}, { "_wxBitmap","_class_wxBitmap",0}, @@ -3324,6 +4395,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxGenericDragImage","_class_wxGenericDragImage",0}, { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0}, { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0}, + { "_wxLogTextCtrl","_class_wxLogTextCtrl",0}, { "_wxFocusEvent","_class_wxFocusEvent",0}, { "_wxMaximizeEvent","_class_wxMaximizeEvent",0}, { "_class_wxTimerEvent","_wxTimerEvent",0}, @@ -3353,6 +4425,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, { "_class_wxWindow","_wxWindow",0}, + { "_class_wxLogStderr","_wxLogStderr",0}, { "_class_wxFont","_wxFont",0}, { "_wxClipboard","_class_wxClipboard",0}, { "_class_wxPyValidator","_wxPyValidator",0}, @@ -3378,6 +4451,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxCursor","_wxCursor",0}, { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, { "_wxScrolledWindow","_class_wxScrolledWindow",0}, + { "_class_wxLog","_class_wxLogWindow",SwigwxLogWindowTowxLog}, + { "_class_wxLog","_wxLogWindow",SwigwxLogWindowTowxLog}, + { "_class_wxLog","_class_wxLogGui",SwigwxLogGuiTowxLog}, + { "_class_wxLog","_wxLogGui",SwigwxLogGuiTowxLog}, + { "_class_wxLog","_class_wxLogTextCtrl",SwigwxLogTextCtrlTowxLog}, + { "_class_wxLog","_wxLogTextCtrl",SwigwxLogTextCtrlTowxLog}, + { "_class_wxLog","_class_wxLogStderr",SwigwxLogStderrTowxLog}, + { "_class_wxLog","_wxLogStderr",SwigwxLogStderrTowxLog}, + { "_class_wxLog","_wxLog",0}, { "_unsigned_char","_byte",0}, { "_class_wxMetaFileDC","_wxMetaFileDC",0}, { "_class_wxMenu","_wxMenu",0}, @@ -3419,13 +4501,17 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_signed_int",0}, { "_class_wxMouseEvent","_wxMouseEvent",0}, { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, + { "_wxLogWindow","_class_wxLogWindow",0}, { "_class_wxSpinEvent","_wxSpinEvent",0}, { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0}, { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0}, + { "_wxLogNull","_class_wxLogNull",0}, { "_wxSize","_class_wxSize",0}, { "_wxRegionIterator","_class_wxRegionIterator",0}, { "_class_wxPrinterDC","_wxPrinterDC",0}, { "_class_wxPyTextDataObject","_wxPyTextDataObject",0}, + { "_class_wxLogTextCtrl","_wxLogTextCtrl",0}, + { "_class_wxLogGui","_wxLogGui",0}, { "_class_wxPaintDC","_wxPaintDC",0}, { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0}, { "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0}, @@ -3462,6 +4548,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxClientDC","_wxClientDC",0}, { "_class_wxSizeEvent","_wxSizeEvent",0}, { "_wxCustomDataObject","_class_wxCustomDataObject",0}, + { "_class_wxLogNull","_wxLogNull",0}, { "_class_wxSize","_wxSize",0}, { "_class_wxBitmap","_wxBitmap",0}, { "_class_wxMemoryDC","_wxMemoryDC",0}, @@ -3479,6 +4566,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, { "_wxWindow","_class_wxWindow",0}, { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0}, + { "_wxLogStderr","_class_wxLogStderr",0}, {0,0,0}}; static PyObject *SWIG_globals; @@ -3576,6 +4664,16 @@ SWIGEXPORT(void) initmisc2c() { PyDict_SetItemString(d,"wxSYS_PENWINDOWS_PRESENT", PyInt_FromLong((long) wxSYS_PENWINDOWS_PRESENT)); PyDict_SetItemString(d,"wxSYS_SHOW_SOUNDS", PyInt_FromLong((long) wxSYS_SHOW_SOUNDS)); PyDict_SetItemString(d,"wxSYS_SWAP_BUTTONS", PyInt_FromLong((long) wxSYS_SWAP_BUTTONS)); + PyDict_SetItemString(d,"wxLOG_FatalError", PyInt_FromLong((long) wxLOG_FatalError)); + PyDict_SetItemString(d,"wxLOG_Error", PyInt_FromLong((long) wxLOG_Error)); + PyDict_SetItemString(d,"wxLOG_Warning", PyInt_FromLong((long) wxLOG_Warning)); + PyDict_SetItemString(d,"wxLOG_Message", PyInt_FromLong((long) wxLOG_Message)); + PyDict_SetItemString(d,"wxLOG_Info", PyInt_FromLong((long) wxLOG_Info)); + PyDict_SetItemString(d,"wxLOG_Status", PyInt_FromLong((long) wxLOG_Status)); + PyDict_SetItemString(d,"wxLOG_Debug", PyInt_FromLong((long) wxLOG_Debug)); + PyDict_SetItemString(d,"wxLOG_Trace", PyInt_FromLong((long) wxLOG_Trace)); + PyDict_SetItemString(d,"wxLOG_Progress", PyInt_FromLong((long) wxLOG_Progress)); + PyDict_SetItemString(d,"wxLOG_User", PyInt_FromLong((long) wxLOG_User)); { int i; for (i = 0; _swig_mapping[i].n1; i++) diff --git a/wxPython/src/msw/misc2.py b/wxPython/src/msw/misc2.py index 8f95fa3168..60be26b567 100644 --- a/wxPython/src/msw/misc2.py +++ b/wxPython/src/msw/misc2.py @@ -256,6 +256,122 @@ class wxPyTimer(wxPyTimerPtr): +class wxLogPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def Flush(self, *_args, **_kwargs): + val = apply(misc2c.wxLog_Flush,(self,) + _args, _kwargs) + return val + def HasPendingMessages(self, *_args, **_kwargs): + val = apply(misc2c.wxLog_HasPendingMessages,(self,) + _args, _kwargs) + return val + def SetVerbose(self, *_args, **_kwargs): + val = apply(misc2c.wxLog_SetVerbose,(self,) + _args, _kwargs) + return val + def GetVerbose(self, *_args, **_kwargs): + val = apply(misc2c.wxLog_GetVerbose,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxLog(wxLogPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(misc2c.new_wxLog,_args,_kwargs) + self.thisown = 1 + + + + +class wxLogStderrPtr(wxLogPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "" % (self.this,) +class wxLogStderr(wxLogStderrPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(misc2c.new_wxLogStderr,_args,_kwargs) + self.thisown = 1 + + + + +class wxLogTextCtrlPtr(wxLogPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "" % (self.this,) +class wxLogTextCtrl(wxLogTextCtrlPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(misc2c.new_wxLogTextCtrl,_args,_kwargs) + self.thisown = 1 + + + + +class wxLogGuiPtr(wxLogPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "" % (self.this,) +class wxLogGui(wxLogGuiPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(misc2c.new_wxLogGui,_args,_kwargs) + self.thisown = 1 + + + + +class wxLogWindowPtr(wxLogPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def Show(self, *_args, **_kwargs): + val = apply(misc2c.wxLogWindow_Show,(self,) + _args, _kwargs) + return val + def GetFrame(self, *_args, **_kwargs): + val = apply(misc2c.wxLogWindow_GetFrame,(self,) + _args, _kwargs) + if val: val = wxFramePtr(val) + return val + def GetOldLog(self, *_args, **_kwargs): + val = apply(misc2c.wxLogWindow_GetOldLog,(self,) + _args, _kwargs) + if val: val = wxLogPtr(val) + return val + def IsPassingMessages(self, *_args, **_kwargs): + val = apply(misc2c.wxLogWindow_IsPassingMessages,(self,) + _args, _kwargs) + return val + def PassMessages(self, *_args, **_kwargs): + val = apply(misc2c.wxLogWindow_PassMessages,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxLogWindow(wxLogWindowPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(misc2c.new_wxLogWindow,_args,_kwargs) + self.thisown = 1 + + + + +class wxLogNullPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self,misc2c=misc2c): + if self.thisown == 1 : + misc2c.delete_wxLogNull(self) + def __repr__(self): + return "" % (self.this,) +class wxLogNull(wxLogNullPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(misc2c.new_wxLogNull,_args,_kwargs) + self.thisown = 1 + + + + #-------------- FUNCTION WRAPPERS ------------------ @@ -373,6 +489,62 @@ def wxDragListItem(*_args, **_kwargs): if val: val = wxDragImagePtr(val); val.thisown = 1 return val +wxSysErrorCode = misc2c.wxSysErrorCode + +wxSysErrorMsg = misc2c.wxSysErrorMsg + +wxLogFatalError = misc2c.wxLogFatalError + +wxLogError = misc2c.wxLogError + +wxLogWarning = misc2c.wxLogWarning + +wxLogMessage = misc2c.wxLogMessage + +wxLogInfo = misc2c.wxLogInfo + +wxLogVerbose = misc2c.wxLogVerbose + +wxLogStatus = misc2c.wxLogStatus + +wxLogStatusFrame = misc2c.wxLogStatusFrame + +wxLogSysError = misc2c.wxLogSysError + +wxLog_IsEnabled = misc2c.wxLog_IsEnabled + +wxLog_EnableLogging = misc2c.wxLog_EnableLogging + +wxLog_OnLog = misc2c.wxLog_OnLog + +wxLog_FlushActive = misc2c.wxLog_FlushActive + +def wxLog_GetActiveTarget(*_args, **_kwargs): + val = apply(misc2c.wxLog_GetActiveTarget,_args,_kwargs) + if val: val = wxLogPtr(val) + return val + +def wxLog_SetActiveTarget(*_args, **_kwargs): + val = apply(misc2c.wxLog_SetActiveTarget,_args,_kwargs) + if val: val = wxLogPtr(val) + return val + +wxLog_Suspend = misc2c.wxLog_Suspend + +wxLog_Resume = misc2c.wxLog_Resume + +wxLog_DontCreateOnDemand = misc2c.wxLog_DontCreateOnDemand + +wxLog_SetTraceMask = misc2c.wxLog_SetTraceMask + +wxLog_AddTraceMask = misc2c.wxLog_AddTraceMask + +wxLog_RemoveTraceMask = misc2c.wxLog_RemoveTraceMask + +wxLog_GetTraceMask = misc2c.wxLog_GetTraceMask + +wxLog_IsAllowedTraceMask = misc2c.wxLog_IsAllowedTraceMask + #-------------- VARIABLE WRAPPERS ------------------ @@ -463,3 +635,13 @@ wxSYS_NETWORK_PRESENT = misc2c.wxSYS_NETWORK_PRESENT wxSYS_PENWINDOWS_PRESENT = misc2c.wxSYS_PENWINDOWS_PRESENT wxSYS_SHOW_SOUNDS = misc2c.wxSYS_SHOW_SOUNDS wxSYS_SWAP_BUTTONS = misc2c.wxSYS_SWAP_BUTTONS +wxLOG_FatalError = misc2c.wxLOG_FatalError +wxLOG_Error = misc2c.wxLOG_Error +wxLOG_Warning = misc2c.wxLOG_Warning +wxLOG_Message = misc2c.wxLOG_Message +wxLOG_Info = misc2c.wxLOG_Info +wxLOG_Status = misc2c.wxLOG_Status +wxLOG_Debug = misc2c.wxLOG_Debug +wxLOG_Trace = misc2c.wxLOG_Trace +wxLOG_Progress = misc2c.wxLOG_Progress +wxLOG_User = misc2c.wxLOG_User