diff --git a/wxPython/demo/.cvsignore b/wxPython/demo/.cvsignore
index 87f417de0c..3648f08aa4 100644
--- a/wxPython/demo/.cvsignore
+++ b/wxPython/demo/.cvsignore
@@ -1,6 +1,8 @@
 *.pyc
 .DS_Store
+._demo.py
 .emacs.desktop
+.gdb_history
 .setup.sh
 b.bat
 hangman_dict.txt
diff --git a/wxPython/demo/wxIntCtrl.py b/wxPython/demo/wxIntCtrl.py
index 4760de53e6..8adcb0e307 100644
--- a/wxPython/demo/wxIntCtrl.py
+++ b/wxPython/demo/wxIntCtrl.py
@@ -11,11 +11,11 @@ class TestPanel( wxPanel ):
         panel = wxPanel( self, -1 )
 
         self.set_min = wxCheckBox( panel, -1, "Set minimum value:" )
-        self.min = wxIntCtrl( panel, size=wxSize( 50, 20 ) )
+        self.min = wxIntCtrl( panel, size=wxSize( 50, -1 ) )
         self.min.Enable( FALSE )
 
         self.set_max = wxCheckBox( panel, -1, "Set maximum value:" )
-        self.max = wxIntCtrl( panel, size=wxSize( 50, 20 ) )
+        self.max = wxIntCtrl( panel, size=wxSize( 50, -1 ) )
         self.max.Enable( FALSE )
 
         self.limit_target = wxCheckBox( panel, -1, "Limit control" )
diff --git a/wxPython/demo/wxValidator.py b/wxPython/demo/wxValidator.py
index 3e997e4a74..77a9525bd4 100644
--- a/wxPython/demo/wxValidator.py
+++ b/wxPython/demo/wxValidator.py
@@ -203,10 +203,6 @@ class TestValidateDialog(wxDialog):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    if wxPlatform == "__WXMAC__":
-        wxMessageBox("This demo currently fails on the Mac. The problem is being looked into...", "Sorry")
-        return
-
     win = TestValidatorPanel(nb)
     return win