Fixed Simple Toolbar bug; removed 2 pixel kludge in splash screen

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

diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 8f94319c6230eceed973002641b13c4eb14cd138..188a3240521004094b666e4e38c66b8a7215423a 100644 (file)
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -31,7 +31,7 @@
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}

-\date{May 25th 2001}
+\date{April 25th 2001}

 }
 \makeindex
 \begin{document}
 }
 \makeindex
 \begin{document}

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index 54c8982dc9cc69983559a1161ed20e0441892962..1f7932c5a61b2d5ce30bc9804d3f17ee5bc5174f 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -48,8 +48,9 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil
 
     // For some reason, we need to make the client size a couple of pixels
     // bigger for all of the bitmap to show.
 
     // For some reason, we need to make the client size a couple of pixels
     // bigger for all of the bitmap to show.

+    // Or do we?

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-    int fudge = 2;
+    int fudge = 0;

 #else
     int fudge = 0;
 #endif
 #else
     int fudge = 0;
 #endif


@@ -78,8 +79,7 @@ wxSplashScreen::~wxSplashScreen()
 
 void wxSplashScreen::OnNotify(wxTimerEvent& event)
 {
 
 void wxSplashScreen::OnNotify(wxTimerEvent& event)
 {

-    m_timer.Stop();
-    this->Destroy();
+    Close(TRUE);

 }
 
 void wxSplashScreen::OnCloseWindow(wxCloseEvent& event)
 }
 
 void wxSplashScreen::OnCloseWindow(wxCloseEvent& event)

diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index 33d0dfeb9f42a34193399180107e77b5e0084f19..99248be4c5628c655ce18340da9c0d21f9ebee04 100644 (file)
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -682,7 +682,8 @@ void wxToolBarSimple::SpringUpButton(int id)
 
     if ( tool && tool->CanBeToggled() )
     {
 
     if ( tool && tool->CanBeToggled() )
     {

-        tool->Toggle();
+        if (tool->IsToggled())
+            tool->Toggle();

 
         DrawTool(tool);
     }
 
         DrawTool(tool);
     }

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 3c235e7f3d15d2598cf237e092821f55ecbaa1cd..e3196d481778e7e8f1b71977e9b877125a7be8b7 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -1149,7 +1149,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
         ccs.hWindowMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();
     ccs.idFirstChild = wxFIRST_MDI_CHILD;
 
         ccs.hWindowMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();
     ccs.idFirstChild = wxFIRST_MDI_CHILD;
 

-    DWORD msStyle = MDIS_ALLCHILDSTYLES | WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN;
+    DWORD msStyle = /* MDIS_ALLCHILDSTYLES | */ WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN;

     if ( style & wxHSCROLL )
         msStyle |= WS_HSCROLL;
     if ( style & wxVSCROLL )
     if ( style & wxHSCROLL )
         msStyle |= WS_HSCROLL;
     if ( style & wxVSCROLL )