minor tweaks

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

diff --git a/wxPython/config.py b/wxPython/config.py
index baa5c9dfa2a8f076b4b9bef337acf4976364b4cc..c3a5a8a93aebd94c939727f6686789008440c85e 100644 (file)
--- 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')
 
                    # 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
 
 
 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 e04c32b2315db1848cedc877dae141cbe580af5c..349a1a67122d4fe34b89f7e03cfc6c1f88f6c4cb 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -20,8 +20,9 @@ import images
 
 # For debugging
 ##wx.Trap();
 
 # For debugging
 ##wx.Trap();

+##print "wx.VERSION_STRING = ", wx.VERSION_STRING

 ##print os.getpid();
 ##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 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))
 
         # 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)
 
 
                 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 8460d82d4b5e125ef6d3ac545843109d7b104b49..ce41cf9208c8d13b19523adbbe01c6a401e6f181 100644 (file)
--- a/wxPython/demo/data/resource_wdr.xrc
+++ b/wxPython/demo/data/resource_wdr.xrc
@@ -23,7 +23,7 @@
             <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxGROW|wxALIGN_CENTRE_VERTICAL</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_NameField">
             <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxGROW|wxALIGN_CENTRE_VERTICAL</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_NameField">

-              <size>80,-1</size>
+              <size>100,-1</size>

               <value></value>
             </object>
           </object>
               <value></value>
             </object>
           </object>


@@ -38,7 +38,7 @@
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_Addr1Field">
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_Addr1Field">

-              <size>80,-1</size>
+              <size>100,-1</size>

               <value></value>
             </object>
           </object>
               <value></value>
             </object>
           </object>


@@ -49,7 +49,7 @@
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_TEXTCTRL">
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_TEXTCTRL">

-              <size>80,-1</size>
+              <size>100,-1</size>

               <value></value>
             </object>
           </object>
               <value></value>
             </object>
           </object>


@@ -102,7 +102,7 @@
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_PhoneField">
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_PhoneField">

-              <size>80,-1</size>
+              <size>100,-1</size>

               <value></value>
             </object>
           </object>
               <value></value>
             </object>
           </object>


@@ -117,7 +117,7 @@
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_EmailField">
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_EmailField">

-              <size>80,-1</size>
+              <size>100,-1</size>

               <value></value>
             </object>
           </object>
               <value></value>
             </object>
           </object>