Some cleanup

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

diff --git a/wxPython/demo/ActiveXWrapper_IE.py b/wxPython/demo/ActiveXWrapper_IE.py
index b103d15cf350d59c3a9eecd9e64fbbd4289a3612..216825dd29c6538f7ae4eb4ddd54dd034863969e 100644 (file)
--- a/wxPython/demo/ActiveXWrapper_IE.py
+++ b/wxPython/demo/ActiveXWrapper_IE.py
@@ -78,7 +78,7 @@ class TestPanel(wxWindow):
         self.location = wxComboBox(self, wxNewId(), "", style=wxCB_DROPDOWN)
         EVT_COMBOBOX(self, self.location.GetId(), self.OnLocationSelect)
         EVT_KEY_UP(self.location, self.OnLocationKey)
         self.location = wxComboBox(self, wxNewId(), "", style=wxCB_DROPDOWN)
         EVT_COMBOBOX(self, self.location.GetId(), self.OnLocationSelect)
         EVT_KEY_UP(self.location, self.OnLocationKey)

-        #EVT_CHAR(self.location, self.IgnoreReturn)
+        EVT_CHAR(self.location, self.IgnoreReturn)

         btnSizer.Add(self.location, 1, wxEXPAND|wxALL, 5)
 
         sizer.Add(btnSizer, 0, wxEXPAND)
         btnSizer.Add(self.location, 1, wxEXPAND|wxALL, 5)
 
         sizer.Add(btnSizer, 0, wxEXPAND)

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 4f4a52a1ec6c12f058466e453ce81e9f6900f099..b53d83aacec79e8facfbbe80e6e42859499b80da 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -245,8 +245,11 @@ class wxPythonDemo(wxFrame):
         # Set up a log on the View Log Notebook page
         self.log = wxTextCtrl(splitter2, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
         # Set up a log on the View Log Notebook page
         self.log = wxTextCtrl(splitter2, -1,
                               style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)

+

         # Set the wxWindows log target to be this textctrl
         #wxLog_SetActiveTarget(wxLogTextCtrl(self.log))
         # Set the wxWindows log target to be this textctrl
         #wxLog_SetActiveTarget(wxLogTextCtrl(self.log))

+
+        # But instead of the above we want to show how to use our own wxLog class

         wxLog_SetActiveTarget(MyLog(self.log))
 
 
         wxLog_SetActiveTarget(MyLog(self.log))