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

Removed arbitrary window-shrinking code; corrected log message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-07-01 17:24:42 +00:00
parent daa616fca0
commit e6ba3fd4b7
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/sizer.cpp
View File

@@ -383,6 +383,9 @@ wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) )
wxRect rect = wxGetClientDisplayRect(); wxRect rect = wxGetClientDisplayRect();
wxSize sizeMax (rect.width,rect.height); wxSize sizeMax (rect.width,rect.height);
// Sorry, but this bit is wrong -- it makes a window that should just be
// able to fit onto the screen, not fit on the screen. -- JACS
#if 0
// Make the max size a bit smaller than the visible portion of // Make the max size a bit smaller than the visible portion of
// the screen. A window which takes the entire screen doesn't // the screen. A window which takes the entire screen doesn't
// look very nice either // look very nice either
@@ -391,6 +394,7 @@ wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) )
sizeMax.y *= 9; sizeMax.y *= 9;
sizeMax.y /= 10; sizeMax.y /= 10;
#endif
return sizeMax; return sizeMax;
} }

2
src/msw/dialog.cpp
View File

@@ -208,7 +208,7 @@ bool wxDialog::EnableCloseButton(bool enable)
if ( !::EnableMenuItem(hmenu, SC_CLOSE, if ( !::EnableMenuItem(hmenu, SC_CLOSE,
MF_BYCOMMAND | (enable ? MF_ENABLED : MF_GRAYED)) ) MF_BYCOMMAND | (enable ? MF_ENABLED : MF_GRAYED)) )
{ {
wxLogLastError(_T("DeleteMenu(SC_CLOSE)")); wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
return FALSE; return FALSE;
} }