merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/demo/redemo.py

@@ -0,0 +1,25 @@
+"""Basic regular expression demostration facility (Perl style syntax)."""
+
+from wxPython.wx import *
+import re
+
+#----------------------------------------------------------------------
+
+class ReDemoPanel(wxPanel):
+    def __init__(self, parent):
+        wxPanel.__init__(self, parent, -1)
+
+        rePrompt = wxStaticText(self, -1, "Enter a Perl-style regular expression")
+        reText = wxTextCtrl(self, 101, "")
+
+        options = self.AddOptions()
+
+        sPrompt = wxStaticText(self, -1, "Enter a string to search")
+        sText = wxTextCtrl(self, 102, "", style=wxTE_MULTILINE)
+
+        dispPrompt = wxStaticText(self, -1, "Groups:")
+        dispText = wxTextCtrl(self, 103, "", style=wxTE_MULTILINE|wxTE_READONLY)
+
+
+#----------------------------------------------------------------------
+#----------------------------------------------------------------------