diff --git a/wxPython/config.py b/wxPython/config.py
index baa5c9dfa2..c3a5a8a93a 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -87,7 +87,7 @@ BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
# Internet Explorer wrapper (experimental)
BUILD_IEWIN = (os.name == 'nt')
-BUILD_ACTIVEX = (os.name == 'nt') # new version of IEWIN
+BUILD_ACTIVEX = (os.name == 'nt') # new version of IEWIN and more
CORE_ONLY = 0 # if true, don't build any of the above
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index e04c32b231..349a1a6712 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -20,8 +20,9 @@ import images
# For debugging
##wx.Trap();
+##print "wx.VERSION_STRING = ", wx.VERSION_STRING
##print os.getpid();
-##raw_input("Press a key...")
+##raw_input("Press Enter...")
#---------------------------------------------------------------------------
@@ -470,7 +471,7 @@ class wxPythonDemo(wx.Frame):
# Set up a log on the View Log Notebook page
self.log = wx.TextCtrl(splitter2, -1,
style = wx.TE_MULTILINE|wx.TE_READONLY|wx.HSCROLL)
-
+
# Set the wxWindows log target to be this textctrl
#wx.Log_SetActiveTarget(wx.LogTextCtrl(self.log))
@@ -634,7 +635,7 @@ class wxPythonDemo(wx.Frame):
self.tree.EnsureVisible(selectedDemo)
- wx.LogMessage('window handle: %s' % self.GetHandle())
+## wx.LogMessage('window handle: %s' % self.GetHandle())
#---------------------------------------------
diff --git a/wxPython/demo/data/resource_wdr.xrc b/wxPython/demo/data/resource_wdr.xrc
index 8460d82d4b..ce41cf9208 100644
--- a/wxPython/demo/data/resource_wdr.xrc
+++ b/wxPython/demo/data/resource_wdr.xrc
@@ -23,7 +23,7 @@
wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxGROW|wxALIGN_CENTRE_VERTICAL
5
@@ -38,7 +38,7 @@
wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP
5
@@ -49,7 +49,7 @@
wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP
5
@@ -102,7 +102,7 @@
wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP
5
@@ -117,7 +117,7 @@
wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP
5