commit be00ee9935fa082bfa42f4e4d44a4d73c40aaa8d
author Chris Liechti <cliechti@gmx.net> Sat Sep 12 02:02:04 2015 +0200
committer Chris Liechti <cliechti@gmx.net> Sat Sep 12 03:24:54 2015 +0200
tree a97a233c880e415aada577bc232bca35d4013eb7
parent b43ef0588bdbca5821a64d398843c667ffaa4e4b

cleanup,improve wxSerialConfigDialog and wxTerminal

examples/wxTerminal.wxg

diff --git a/examples/wxTerminal.wxg b/examples/wxTerminal.wxg
index 183f876..b74bb31 100644
--- a/examples/wxTerminal.wxg
+++ b/examples/wxTerminal.wxg
@@ -1,33 +1,24 @@
 <?xml version="1.0"?>
-<!-- generated by wxGlade 0.3.1 on Sat Oct 04 02:41:48 2003 -->
+<!-- generated by wxGlade 0.6.5 on Sat Sep 12 02:36:17 2015 -->
 
-<application path="D:\prog\python\pyserial_sf\pyserial\examples\wxTerminal.py" name="app" class="MyApp" option="0" language="python" top_window="frame_terminal" encoding="ISO-8859-1" use_gettext="0" overwrite="0">
+<application path="wxTerminal.py" name="app" class="MyApp" option="0" language="python" top_window="frame_terminal" encoding="ISO-8859-1" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.8" is_template="0" indent_amount="4" indent_symbol="space" source_extension=".cpp" header_extension=".h">
     <object class="TerminalFrame" name="frame_terminal" base="EditFrame">
         <style>wxDEFAULT_FRAME_STYLE</style>
         <title>Serial Terminal</title>
         <menubar>1</menubar>
         <size>546, 383</size>
-        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
-            <orient>wxVERTICAL</orient>
-            <object class="sizeritem">
-                <flag>wxEXPAND</flag>
-                <border>0</border>
-                <option>1</option>
-                <object class="wxTextCtrl" name="text_ctrl_output" base="EditTextCtrl">
-                    <style>wxTE_MULTILINE|wxTE_READONLY</style>
-                </object>
-            </object>
-        </object>
         <object class="wxMenuBar" name="frame_terminal_menubar" base="EditMenuBar">
             <menus>
                 <menu name="" label="&amp;File">
                     <item>
                         <label>&amp;Clear</label>
                         <id>ID_CLEAR</id>
+                        <handler>OnClear</handler>
                     </item>
                     <item>
                         <label>&amp;Save Text As...</label>
                         <id>ID_SAVEAS</id>
+                        <handler>OnSaveAs</handler>
                     </item>
                     <item>
                         <label>---</label>
@@ -35,12 +26,9 @@
                         <name>---</name>
                     </item>
                     <item>
-                        <label>&amp;Port Settings...</label>
-                        <id>ID_SETTINGS</id>
-                    </item>
-                    <item>
                         <label>&amp;Terminal Settings...</label>
                         <id>ID_TERM</id>
+                        <handler>OnTermSettings</handler>
                     </item>
                     <item>
                         <label>---</label>
@@ -49,10 +37,49 @@
                     <item>
                         <label>&amp;Exit</label>
                         <id>ID_EXIT</id>
+                        <handler>OnExit</handler>
+                    </item>
+                </menu>
+                <menu name="" label="Serial Port">
+                    <item>
+                        <label>RTS</label>
+                        <id>ID_RTS</id>
+                        <checkable>1</checkable>
+                        <handler>OnRTS</handler>
+                    </item>
+                    <item>
+                        <label>&amp;DTR</label>
+                        <id>ID_DTR</id>
+                        <checkable>1</checkable>
+                        <handler>OnDTR</handler>
+                    </item>
+                    <item>
+                        <label>&amp;Port Settings...</label>
+                        <id>ID_SETTINGS</id>
+                        <handler>OnPortSettings</handler>
                     </item>
                 </menu>
             </menus>
         </object>
+        <object class="wxBoxSizer" name="sizer_1" base="EditBoxSizer">
+            <orient>wxVERTICAL</orient>
+            <object class="sizeritem">
+                <flag>wxEXPAND</flag>
+                <border>0</border>
+                <option>1</option>
+                <object class="wxTextCtrl" name="text_ctrl_output" base="EditTextCtrl">
+                    <style>wxTE_MULTILINE|wxTE_READONLY</style>
+                    <font>
+                        <size>9</size>
+                        <family>modern</family>
+                        <style>normal</style>
+                        <weight>normal</weight>
+                        <underlined>0</underlined>
+                        <face></face>
+                    </font>
+                </object>
+            </object>
+        </object>
     </object>
     <object class="TerminalSettingsDialog" name="dialog_terminal_Settings" base="EditDialog">
         <style>wxDEFAULT_DIALOG_STYLE</style>