X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e152a239b8291a00b9928550285eb14a9db58cb..70b8ab778fc3f9f89874a242bfa014f2b313c59b:/src/msw/mdi.cpp diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index b5744e22ce..ee869d9759 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -206,8 +206,8 @@ bool wxMDIParentFrame::Create(wxWindow *parent, else m_windowId = NewControlId(); - long exflags; - long msflags = MSWGetCreateWindowFlags(&exflags); + WXDWORD exflags; + WXDWORD msflags = MSWGetCreateWindowFlags(&exflags); if ( !wxWindow::MSWCreate(wxMDIFrameClassName, title, @@ -1034,17 +1034,20 @@ bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo) // not on the values specified in wxWindow m_max variables bool processed = MSWDefWindowProc(WM_GETMINMAXINFO, 0, (LPARAM)mmInfo) != 0; + int minWidth = GetMinWidth(), + minHeight = GetMinHeight(); + // but allow GetSizeHints() to set the min size - if ( m_minWidth != -1 ) + if ( minWidth != -1 ) { - info->ptMinTrackSize.x = m_minWidth; + info->ptMinTrackSize.x = minWidth; processed = TRUE; } - if ( m_minHeight != -1 ) + if ( minHeight != -1 ) { - info->ptMinTrackSize.y = m_minHeight; + info->ptMinTrackSize.y = minHeight; processed = TRUE; }