From 0b51434e6efc0de148c1ea6863b4e0f2ec10bf72 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 23 Sep 2003 02:04:38 +0000
Subject: [PATCH] demo tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/demo/.cvsignore           | 1 +
 wxPython/demo/EventManager.py      | 2 +-
 wxPython/demo/wxPageSetupDialog.py | 7 +++++--
 wxPython/demo/wxToolBar.py         | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/wxPython/demo/.cvsignore b/wxPython/demo/.cvsignore
index 3648f08aa4..fbb6996b15 100644
--- a/wxPython/demo/.cvsignore
+++ b/wxPython/demo/.cvsignore
@@ -3,6 +3,7 @@
 ._demo.py
 .emacs.desktop
 .gdb_history
+.setup.bat
 .setup.sh
 b.bat
 hangman_dict.txt
diff --git a/wxPython/demo/EventManager.py b/wxPython/demo/EventManager.py
index 2966b930ff..25da54f2cb 100644
--- a/wxPython/demo/EventManager.py
+++ b/wxPython/demo/EventManager.py
@@ -188,7 +188,7 @@ class InnerTile(wxPanel):
         r = InnerTile.START_COLOR_TUPLE[0] + (InnerTile.DELTAS[0] * percent)
         g = InnerTile.START_COLOR_TUPLE[1] + (InnerTile.DELTAS[1] * percent)
         b = InnerTile.START_COLOR_TUPLE[2] + (InnerTile.DELTAS[2] * percent)
-        self.setColor(wxColor(r,g,b))
+        self.setColor(wxColor(int(r), int(g), int(b)))
 
 
 
diff --git a/wxPython/demo/wxPageSetupDialog.py b/wxPython/demo/wxPageSetupDialog.py
index df344ec6ab..692d21973d 100644
--- a/wxPython/demo/wxPageSetupDialog.py
+++ b/wxPython/demo/wxPageSetupDialog.py
@@ -5,8 +5,11 @@ from wxPython.wx import *
 
 def runTest(frame, nb, log):
     data = wxPageSetupDialogData()
-    data.SetMarginTopLeft(wxPoint(50,50))
-    data.SetMarginBottomRight(wxPoint(50,50))
+    data.SetMarginTopLeft( (15, 15) )
+    data.SetMarginBottomRight( (15, 15) )
+    #data.SetDefaultMinMargins(True)
+    data.SetPaperId(wxPAPER_LETTER)
+                               
     dlg = wxPageSetupDialog(frame, data)
     if dlg.ShowModal() == wxID_OK:
         data = dlg.GetPageSetupData()
diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/wxToolBar.py
index 83b99599cc..693dbabd37 100644
--- a/wxPython/demo/wxToolBar.py
+++ b/wxPython/demo/wxToolBar.py
@@ -69,6 +69,8 @@ class TestToolBar(wxFrame):
 
     def OnToolClick(self, event):
         self.log.WriteText("tool %s clicked\n" % event.GetId())
+        tb = self.GetToolBar()
+        tb.EnableTool(10, not tb.GetToolEnabled(10))
 
     def OnToolRClick(self, event):
         self.log.WriteText("tool %s right-clicked\n" % event.GetId())