Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-04-26 20:34:19 +00:00
parent 67a6726a2c
commit e143729845
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/manual.tex
View File

@@ -31,7 +31,7 @@
}} }}
\winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin, \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
Robin Dunn, et al} Robin Dunn, et al}
\date{May 25th 2001} \date{April 25th 2001}
} }
\makeindex \makeindex
\begin{document} \begin{document}

6
src/generic/splash.cpp
View File

@@ -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 // For some reason, we need to make the client size a couple of pixels
// bigger for all of the bitmap to show. // bigger for all of the bitmap to show.
// Or do we?
#ifdef __WXMSW__ #ifdef __WXMSW__
int fudge = 2; int fudge = 0;
#else #else
int fudge = 0; int fudge = 0;
#endif #endif
@@ -78,8 +79,7 @@ wxSplashScreen::~wxSplashScreen()
void wxSplashScreen::OnNotify(wxTimerEvent& event) void wxSplashScreen::OnNotify(wxTimerEvent& event)
{ {
m_timer.Stop(); Close(TRUE);
this->Destroy();
} }
void wxSplashScreen::OnCloseWindow(wxCloseEvent& event) void wxSplashScreen::OnCloseWindow(wxCloseEvent& event)

3
src/generic/tbarsmpl.cpp
View File

@@ -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);
} }

2
src/msw/mdi.cpp
View File

@@ -1149,7 +1149,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
ccs.hWindowMenu = (HMENU) parent->GetWindowMenu()->GetHMenu(); ccs.hWindowMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();
ccs.idFirstChild = wxFIRST_MDI_CHILD; 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 ) if ( style & wxHSCROLL )
msStyle |= WS_HSCROLL; msStyle |= WS_HSCROLL;
if ( style & wxVSCROLL ) if ( style & wxVSCROLL )