Small changes

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

diff --git a/distrib/msw/contrib.rsp b/distrib/msw/contrib.rsp
index 455cdd5c6924612c512f7e66a709aad51c922ff5..f485f049bc184b2889ed9ac90cb205ea06536276 100644 (file)
--- a/distrib/msw/contrib.rsp
+++ b/distrib/msw/contrib.rsp
@@ -91,6 +91,32 @@ contrib/samples/gizmos/editlbox/*.rc
 contrib/samples/gizmos/editlbox/EditlboxVC.dsp
 contrib/samples/gizmos/editlbox/EditlboxVC.dsw
 
+contrib/samples/gizmos/dynsash/*.cpp
+contrib/samples/gizmos/dynsash/*.h
+contrib/samples/gizmos/dynsash/*.def
+contrib/samples/gizmos/dynsash/makefile*
+contrib/samples/gizmos/dynsash/*.xbm
+contrib/samples/gizmos/dynsash/*.xpm
+contrib/samples/gizmos/dynsash/*.txt
+contrib/samples/gizmos/dynsash/*.ico
+contrib/samples/gizmos/dynsash/*.bmp
+contrib/samples/gizmos/dynsash/*.rc
+contrib/samples/gizmos/dynsash/DynsashVC.dsp
+contrib/samples/gizmos/dynsash/SynsashVC.dsw
+
+contrib/samples/gizmos/dynsash_switch/*.cpp
+contrib/samples/gizmos/dynsash_switch/*.h
+contrib/samples/gizmos/dynsash_switch/*.def
+contrib/samples/gizmos/dynsash_switch/makefile*
+contrib/samples/gizmos/dynsash_switch/*.xbm
+contrib/samples/gizmos/dynsash_switch/*.xpm
+contrib/samples/gizmos/dynsash_switch/*.txt
+contrib/samples/gizmos/dynsash_switch/*.ico
+contrib/samples/gizmos/dynsash_switch/*.bmp
+contrib/samples/gizmos/dynsash_switch/*.rc
+contrib/samples/gizmos/dynsash_switch/DynsashSwitchVC.dsp
+contrib/samples/gizmos/dynsash_switch/DynsashSwitchVC.dsw
+
 contrib/samples/animate/*.cpp
 contrib/samples/animate/*.h
 contrib/samples/animate/*.def

diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt
index 85e1e66cd6767a457806ba70b3d4e465953fa0a2..342384f77fd1b8c0913e0ddd6bf88ed24f90aa6e 100644 (file)
--- a/distrib/msw/innobott.txt
+++ b/distrib/msw/innobott.txt
@@ -31,7 +31,7 @@
 ; DO NOT DELETE THEM or you may be unable to reload the script
 
 ;[ScriptSetup]
-;VerNum=2.3.1
+;VerNum=2.3.2
 ;InnoVer=1.3
 ;AddVerTo=AppVerName
 ;SetupFilename=setup.exe

diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt
index 68cce278eda3dca4458fa24b65ca3b23945cad81..d10650c6a345bd2e7ce7bc4006a1e428805af14e 100644 (file)
--- a/distrib/msw/innotop.txt
+++ b/distrib/msw/innotop.txt
@@ -4,13 +4,13 @@
 
 [Setup]
     MinVersion=4.0,4.0
-    AppName=wxWindows 2.3.1
+    AppName=wxWindows 2.3.2
     AppId=wxWindows
     CreateUninstallRegKey=1
     UsePreviousAppDir=1
     UsePreviousGroup=1
-    AppVersion=2.3.1
-    AppVerName=wxWindows 2.3.1
+    AppVersion=2.3.2
+    AppVerName=wxWindows 2.3.2
     AppCopyright=Copyright © The wxWindows Team
     BackColor=$FF0000
     BackColor2=$000000
@@ -19,7 +19,7 @@
     WindowStartMaximized=1
     WindowVisible=1
     WindowResizable=1
-    UninstallDisplayName=wxWindows 2.3.1
+    UninstallDisplayName=wxWindows 2.3.2
     UninstallLogMode=Append
     DirExistsWarning=auto
     UninstallFilesDir={app}
@@ -28,10 +28,10 @@
     CreateAppDir=1
     DisableProgramGroupPage=0
     AlwaysCreateUninstallIcon=1
-    UninstallIconName=Uninstall wxWindows 2.3.1
+    UninstallIconName=Uninstall wxWindows 2.3.2
     Uninstallable=1
-    DefaultDirName=c:\wx230
-    DefaultGroupName=wxWindows 2.3.1
+    DefaultDirName=c:\wx232
+    DefaultGroupName=wxWindows 2.3.2
     LicenseFile=C:\wx2dev\wxWindows\docs\licence.txt
     InfoBeforeFile=C:\wx2dev\wxWindows\docs\readme.txt
     InfoAfterFile=C:\wx2dev\wxWindows\docs\msw\install.txt

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index dd9f0e448bd16a663e1020cc1efe6fe7f879eb04..f8183e4c3727bb2f58e3c3c9a63e07eaca8f7edf 100644 (file)
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -107,6 +107,8 @@ contrib/samples/gizmos/Makefile.in
 contrib/samples/gizmos/multicell/Makefile.in
 contrib/samples/gizmos/splittree/Makefile.in
 contrib/samples/gizmos/editlbox/Makefile.in
+contrib/samples/gizmos/dynsash/Makefile.in
+contrib/samples/gizmos/dynsash_switch/Makefile.in
 contrib/samples/ogl/Makefile.in
 contrib/samples/ogl/ogledit/Makefile.in
 contrib/samples/ogl/studio/Makefile.in

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index 938f6b78ba4c564c9b7f4b93c18af901f0b6ba07..2c0d403645b3919a923c816933797fd25b877049 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -68,7 +68,11 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil
 
     Show(TRUE);
     m_window->SetFocus();
-    wxYield(); // Without this, you see a blank screen for an instant
+#ifdef __WXMSW__
+    Update(); // Without this, you see a blank screen for an instant
+#else
+    wxYieldIfNeeded(); // Should eliminate this
+#endif
 }
 
 wxSplashScreen::~wxSplashScreen()