Added XML simplification scripts for generating the wxPython metadata xml.

[wxWidgets.git] / wxPython / demo / wxProcess.py

diff --git a/wxPython/demo/wxProcess.py b/wxPython/demo/wxProcess.py
index 4e25bd6e6d3817d70fe77fa95558aebbf29379e3..42c46c2cd6492874ab238b7011839c328a26b4b6 100644 (file)
--- a/wxPython/demo/wxProcess.py
+++ b/wxPython/demo/wxProcess.py
@@ -1,61 +1,65 @@
+# 11/20/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 

 
 

-from wxPython.wx import *
+import  wx

 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 

-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):

     def __init__(self, parent, ID, log):
     def __init__(self, parent, ID, log):

-        wxPanel.__init__(self, parent, ID)
+        wx.Panel.__init__(self, parent, ID)

         self.log = log
 
         self.process = None
         self.log = log
 
         self.process = None

-        EVT_IDLE(self, self.OnIdle)
+        self.Bind(wx.EVT_IDLE, self.OnIdle)

 
         # We can either derive from wxProcess and override OnTerminate
         # or we can let wxProcess send this window an event that is
         # caught in the normal way...
 
         # We can either derive from wxProcess and override OnTerminate
         # or we can let wxProcess send this window an event that is
         # caught in the normal way...

-        EVT_END_PROCESS(self, -1, self.OnProcessEnded)
+        self.Bind(wx.EVT_END_PROCESS, self.OnProcessEnded)

 
 
         # Make the controls
 
 
         # Make the controls

-        prompt = wxStaticText(self, -1, 'Command line:')
-        self.cmd = wxTextCtrl(self, -1, 'python data/echo.py')
-        self.exBtn = wxButton(self, -1, 'Execute')
+        prompt = wx.StaticText(self, -1, 'Command line:')
+        self.cmd = wx.TextCtrl(self, -1, 'python -u data/echo.py')
+        self.exBtn = wx.Button(self, -1, 'Execute')

 
 

-        self.out = wxTextCtrl(self, -1, '', style=wxTE_MULTILINE|wxTE_READONLY)
+        self.out = wx.TextCtrl(self, -1, '', style=wx.TE_MULTILINE|wx.TE_READONLY)

 
 

-        self.inp = wxTextCtrl(self, -1, '', style=wxTE_PROCESS_ENTER)
-        self.sndBtn = wxButton(self, -1, 'Send')
-        self.termBtn = wxButton(self, -1, 'Close Stream')
-        self.inp.Enable(false)
-        self.sndBtn.Enable(false)
-        self.termBtn.Enable(false)
+        self.inp = wx.TextCtrl(self, -1, '', style=wx.TE_PROCESS_ENTER)
+        self.sndBtn = wx.Button(self, -1, 'Send')
+        self.termBtn = wx.Button(self, -1, 'Close Stream')
+        self.inp.Enable(False)
+        self.sndBtn.Enable(False)
+        self.termBtn.Enable(False)

 
         # Hook up the events
 
         # Hook up the events

-        EVT_BUTTON(self, self.exBtn.GetId(), self.OnExecuteBtn)
-        EVT_BUTTON(self, self.sndBtn.GetId(), self.OnSendText)
-        EVT_BUTTON(self, self.termBtn.GetId(), self.OnCloseStream)
-        EVT_TEXT_ENTER(self, self.inp.GetId(), self.OnSendText)
+        self.Bind(wx.EVT_BUTTON, self.OnExecuteBtn, self.exBtn)
+        self.Bind(wx.EVT_BUTTON, self.OnSendText, self.sndBtn)
+        self.Bind(wx.EVT_BUTTON, self.OnCloseStream, self.termBtn)
+        self.Bind(wx.EVT_TEXT_ENTER, self.OnSendText, self.inp)

 
 
         # Do the layout
 
 
         # Do the layout

-        box1 = wxBoxSizer(wxHORIZONTAL)
-        box1.Add(prompt, 0, wxALIGN_CENTER)
-        box1.Add(self.cmd, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5)
+        box1 = wx.BoxSizer(wx.HORIZONTAL)
+        box1.Add(prompt, 0, wx.ALIGN_CENTER)
+        box1.Add(self.cmd, 1, wx.ALIGN_CENTER|wx.LEFT|wx.RIGHT, 5)

         box1.Add(self.exBtn, 0)
 
         box1.Add(self.exBtn, 0)
 

-        box2 = wxBoxSizer(wxHORIZONTAL)
-        box2.Add(self.inp, 1, wxALIGN_CENTER)
-        box2.Add(self.sndBtn, 0, wxLEFT, 5)
-        box2.Add(self.termBtn, 0, wxLEFT, 5)
+        box2 = wx.BoxSizer(wx.HORIZONTAL)
+        box2.Add(self.inp, 1, wx.ALIGN_CENTER)
+        box2.Add(self.sndBtn, 0, wx.LEFT, 5)
+        box2.Add(self.termBtn, 0, wx.LEFT, 5)

 
 

-        sizer = wxBoxSizer(wxVERTICAL)
-        sizer.Add(box1, 0, wxEXPAND|wxALL, 10)
-        sizer.Add(self.out, 1, wxEXPAND|wxALL, 10)
-        sizer.Add(box2, 0, wxEXPAND|wxALL, 10)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(box1, 0, wx.EXPAND|wx.ALL, 10)
+        sizer.Add(self.out, 1, wx.EXPAND|wx.ALL, 10)
+        sizer.Add(box2, 0, wx.EXPAND|wx.ALL, 10)

 
         self.SetSizer(sizer)
 
         self.SetSizer(sizer)

-        self.SetAutoLayout(true)
+        self.SetAutoLayout(True)

 
 
     def __del__(self):
 
 
     def __del__(self):


@@ -68,16 +72,16 @@ class TestPanel(wxPanel):
     def OnExecuteBtn(self, evt):
         cmd = self.cmd.GetValue()
 
     def OnExecuteBtn(self, evt):
         cmd = self.cmd.GetValue()
 

-        self.process = wxProcess(self)
+        self.process = wx.Process(self)

         self.process.Redirect();
         self.process.Redirect();

-        pid = wxExecute(cmd, false, self.process)
+        pid = wx.Execute(cmd, wx.EXEC_ASYNC, self.process)

         self.log.write('OnExecuteBtn: "%s" pid: %s\n' % (cmd, pid))
 
         self.log.write('OnExecuteBtn: "%s" pid: %s\n' % (cmd, pid))
 

-        self.inp.Enable(true)
-        self.sndBtn.Enable(true)
-        self.termBtn.Enable(true)
-        self.cmd.Enable(false)
-        self.exBtn.Enable(false)
+        self.inp.Enable(True)
+        self.sndBtn.Enable(True)
+        self.termBtn.Enable(True)
+        self.cmd.Enable(False)
+        self.exBtn.Enable(False)

         self.inp.SetFocus()
 
 
         self.inp.SetFocus()
 
 


@@ -91,18 +95,15 @@ class TestPanel(wxPanel):
 
     def OnCloseStream(self, evt):
         self.log.write('OnCloseStream\n')
 
     def OnCloseStream(self, evt):
         self.log.write('OnCloseStream\n')

+        #print "b4 CloseOutput"

         self.process.CloseOutput()
         self.process.CloseOutput()

-
+        #print "after CloseOutput"

 
     def OnIdle(self, evt):
         if self.process is not None:
             stream = self.process.GetInputStream()
 
 
     def OnIdle(self, evt):
         if self.process is not None:
             stream = self.process.GetInputStream()
 

-            # Yes, this is weird.  For this particular stream, EOF
-            # simply means that there is no data available to be read,
-            # not truly the end of file.  Also, read() just reads all
-            # the currently available data, not until the real EOF...
-            if not stream.eof():
+            if stream.CanRead():

                 text = stream.read()
                 self.out.AppendText(text)
 
                 text = stream.read()
                 self.out.AppendText(text)
 


@@ -112,17 +113,18 @@ class TestPanel(wxPanel):
                        (evt.GetPid(), evt.GetExitCode()))
 
         stream = self.process.GetInputStream()
                        (evt.GetPid(), evt.GetExitCode()))
 
         stream = self.process.GetInputStream()

-        if not stream.eof():
+
+        if stream.CanRead():

             text = stream.read()
             self.out.AppendText(text)
 
         self.process.Destroy()
         self.process = None
             text = stream.read()
             self.out.AppendText(text)
 
         self.process.Destroy()
         self.process = None

-        self.inp.Enable(false)
-        self.sndBtn.Enable(false)
-        self.termBtn.Enable(false)
-        self.cmd.Enable(true)
-        self.exBtn.Enable(true)
+        self.inp.Enable(False)
+        self.sndBtn.Enable(False)
+        self.termBtn.Enable(False)
+        self.cmd.Enable(True)
+        self.exBtn.Enable(True)

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -155,3 +157,9 @@ child process to exit its main loop.
 
 </body><html>
 """
 
 </body><html>
 """

+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])