diff --git a/wxPython/src/_log.i b/wxPython/src/_log.i
index 4797f9fe7d..8084857b0a 100644
--- a/wxPython/src/_log.i
+++ b/wxPython/src/_log.i
@@ -202,6 +202,20 @@ public:
     wxLog *GetOldLog();
 };
 
+// log everything to a buffer
+class wxLogBuffer : public wxLog
+{
+public:
+    wxLogBuffer();
+
+    // get the string contents with all messages logged
+    const wxString& GetBuffer() const { return m_str; }
+
+    // show the buffer contents to the user in the best possible way (this uses
+    // wxMessageOutputMessageBox) and clear it
+    virtual void Flush();
+};
+
 
 //---------------------------------------------------------------------------