From b6bcaaca0ffa311a5a8d635255dbf8508b99aa3b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 5 Sep 2008 19:28:38 +0000 Subject: [PATCH] adjust the labels before centering the dialog as doing it can change the dialog size git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/msgdlg.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp index be6f508df6..9d91acab81 100644 --- a/src/msw/msgdlg.cpp +++ b/src/msw/msgdlg.cpp @@ -98,15 +98,16 @@ wxMessageDialog::HookFunction(int code, WXWPARAM wParam, WXLPARAM lParam) wnd->SetHWND((HWND)wParam); + // update the labels if necessary: we need to do it before centering + // the dialog as this can change its size + if ( wnd->HasCustomLabels() ) + wnd->AdjustButtonLabels(); + // centre the message box on its parent if requested if ( wnd->GetMessageDialogStyle() & wxCENTER ) wnd->Center(); // center on parent //else: default behaviour, center on screen - // also update the labels if necessary - if ( wnd->HasCustomLabels() ) - wnd->AdjustButtonLabels(); - // there seems to be no reason to leave it set wnd->SetHWND(NULL); } -- 2.45.2