removed superfluous font size scaling in wxGtkPrinterDCImpl::SetFont()

[wxWidgets.git] / src / msw / msgdlg.cpp

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index c8aaa8ef73156daa84a50c075b4cba461f4fd08d..9d91acab813b36b8c5d6710edc6910adb7e4a453 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -16,35 +16,223 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_MSGDLG
+

 #include "wx/msgdlg.h"
 
 #include "wx/msgdlg.h"
 

+// there is no hook support under CE so we can't use the code for message box
+// positioning there
+#ifndef __WXWINCE__
+    #define wxUSE_MSGBOX_HOOK 1
+#else
+    #define wxUSE_MSGBOX_HOOK 0
+#endif
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"

+    #if wxUSE_MSGBOX_HOOK
+        #include "wx/hashmap.h"
+    #endif

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"

+#include "wx/msw/private/button.h"
+#include "wx/msw/private/metrics.h"
+
+#if wxUSE_MSGBOX_HOOK
+    #include "wx/fontutil.h"
+#endif

 
 // For MB_TASKMODAL
 #ifdef __WXWINCE__
 
 // For MB_TASKMODAL
 #ifdef __WXWINCE__

-#include "wx/msw/wince/missing.h"
+    #include "wx/msw/wince/missing.h"

 #endif
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
 #endif
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 

-wxMessageDialog::wxMessageDialog(wxWindow *parent,
-                                 const wxString& message,
-                                 const wxString& caption,
-                                 long style,
-                                 const wxPoint& WXUNUSED(pos))
+#if wxUSE_MSGBOX_HOOK
+
+// there can potentially be one message box per thread so we use a hash map
+// with thread ids as keys and (currently shown) message boxes as values
+//
+// TODO: replace this with wxTLS once it's available
+WX_DECLARE_HASH_MAP(unsigned long, wxMessageDialog *,
+                    wxIntegerHash, wxIntegerEqual,
+                    wxMessageDialogMap);
+
+namespace
+{
+
+wxMessageDialogMap& HookMap()
+{
+    static wxMessageDialogMap s_Map;
+
+    return s_Map;
+}
+
+} // anonymous namespace
+
+/* static */
+WXLRESULT wxCALLBACK
+wxMessageDialog::HookFunction(int code, WXWPARAM wParam, WXLPARAM lParam)
+{
+    // Find the thread-local instance of wxMessageDialog
+    const DWORD tid = ::GetCurrentThreadId();
+    wxMessageDialogMap::iterator node = HookMap().find(tid);
+    wxCHECK_MSG( node != HookMap().end(), false,
+                    wxT("bogus thread id in wxMessageDialog::Hook") );
+
+    wxMessageDialog *  const wnd = node->second;
+
+    const HHOOK hhook = (HHOOK)wnd->m_hook;
+    const LRESULT rc = ::CallNextHookEx(hhook, code, wParam, lParam);
+
+    if ( code == HCBT_ACTIVATE )
+    {
+        // we won't need this hook any longer
+        ::UnhookWindowsHookEx(hhook);
+        wnd->m_hook = NULL;
+        HookMap().erase(tid);
+
+        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
+
+        // there seems to be no reason to leave it set
+        wnd->SetHWND(NULL);
+    }
+
+    return rc;
+}
+
+namespace

 {
 {

-    m_caption = caption;
-    m_message = message;
-    m_parent = parent;
-    SetMessageDialogStyle(style);
+
+// helper of AdjustButtonLabels(): set window position expressed in screen
+// coordinates, whether the window is child or top level
+void MoveWindowToScreenRect(HWND hwnd, RECT rc)
+{
+    if ( const HWND hwndParent = ::GetAncestor(hwnd, GA_PARENT) )
+    {
+        // map to parent window coordinates (notice that a RECT is laid out as
+        // 2 consecutive POINTs)
+        ::MapWindowPoints(HWND_DESKTOP, hwndParent,
+                          reinterpret_cast<POINT *>(&rc), 2);
+    }
+
+    ::MoveWindow(hwnd,
+                 rc.left, rc.top,
+                 rc.right - rc.left, rc.bottom - rc.top,
+                 FALSE);

 }
 
 }
 

+// helper of AdjustButtonLabels(): move the given window by dx
+//
+// works for both child and top level windows
+void OffsetWindow(HWND hwnd, int dx)
+{
+    RECT rc = wxGetWindowRect(hwnd);
+
+    rc.left += dx;
+    rc.right += dx;
+
+    MoveWindowToScreenRect(hwnd, rc);
+}
+
+} // anonymous namespace
+
+void wxMessageDialog::AdjustButtonLabels()
+{
+    // changing the button labels is the easy part but we also need to ensure
+    // that the buttons are big enough for the label strings and increase their
+    // size (and hence the size of the message box itself) if they are not
+
+    // TODO-RTL: check whether this works correctly in RTL
+
+    // the order in this array is the one in which buttons appear in the
+    // message box
+    const static struct ButtonAccessors
+    {
+        int id;
+        wxString (wxMessageDialog::*getter)() const;
+    }
+    buttons[] =
+    {
+        { IDYES,    &wxMessageDialog::GetYesLabel    },
+        { IDNO,     &wxMessageDialog::GetNoLabel     },
+        { IDOK,     &wxMessageDialog::GetOKLabel     },
+        { IDCANCEL, &wxMessageDialog::GetCancelLabel },
+    };
+
+    // this contains the amount by which we increased the message box width
+    int dx = 0;
+
+    const NONCLIENTMETRICS& ncm = wxMSWImpl::GetNonClientMetrics();
+    const wxFont fontMsgBox(wxNativeFontInfo(ncm.lfMessageFont));
+
+    // we want to use this font in GetTextExtent() calls below but we don't
+    // want to send WM_SETFONT to the message box, who knows how is it going to
+    // react to it (right now it doesn't seem to do anything but what if this
+    // changes)
+    wxWindowBase::SetFont(fontMsgBox);
+
+    for ( unsigned n = 0; n < WXSIZEOF(buttons); n++ )
+    {
+        const HWND hwndBtn = ::GetDlgItem(GetHwnd(), buttons[n].id);
+        if ( !hwndBtn )
+            continue;   // it's ok, not all buttons are always present
+
+        const wxString label = (this->*buttons[n].getter)();
+        const wxSize sizeLabel = wxWindowBase::GetTextExtent(label);
+
+        // check if the button is big enough for this label
+        RECT rc = wxGetWindowRect(hwndBtn);
+        const int widthOld = rc.right - rc.left;
+        const int widthNew = wxMSWButton::GetFittingSize(this, sizeLabel).x;
+        const int dw = widthNew - widthOld;
+        if ( dw > 0 )
+        {
+            // we need to resize the button
+            rc.right += dw;
+            MoveWindowToScreenRect(hwndBtn, rc);
+
+            // and also move all the other buttons
+            for ( unsigned m = n + 1; m < WXSIZEOF(buttons); m++ )
+            {
+                const HWND hwndBtnNext = ::GetDlgItem(GetHwnd(), buttons[m].id);
+                if ( hwndBtnNext )
+                    OffsetWindow(hwndBtnNext, dw);
+            }
+
+            dx += dw;
+        }
+
+        ::SetWindowText(hwndBtn, label.wx_str());
+    }
+
+
+    // resize the message box itself if needed
+    if ( dx )
+        OffsetWindow(GetHwnd(), dx);
+
+    // surprisingly, we don't need to resize the static text control, it seems
+    // to adjust itself to the new size, at least under Windows 2003
+    // (TODO: test if this happens on older Windows versions)
+}
+
+#endif // wxUSE_MSGBOX_HOOK
+
+

 int wxMessageDialog::ShowModal()
 {
     if ( !wxTheApp->GetTopWindow() )
 int wxMessageDialog::ShowModal()
 {
     if ( !wxTheApp->GetTopWindow() )


@@ -97,16 +285,43 @@ int wxMessageDialog::ShowModal()
     if ( wxStyle & wxSTAY_ON_TOP )
         msStyle |= MB_TOPMOST;
 
     if ( wxStyle & wxSTAY_ON_TOP )
         msStyle |= MB_TOPMOST;
 

+#ifndef __WXWINCE__

     if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
         msStyle |= MB_RTLREADING | MB_RIGHT;
     if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
         msStyle |= MB_RTLREADING | MB_RIGHT;

+#endif

 
     if (hWnd)
         msStyle |= MB_APPLMODAL;
     else
         msStyle |= MB_TASKMODAL;
 
 
     if (hWnd)
         msStyle |= MB_APPLMODAL;
     else
         msStyle |= MB_TASKMODAL;
 

+    // per MSDN documentation for MessageBox() we can prefix the message with 2
+    // right-to-left mark characters to tell the function to use RTL layout
+    // (unfortunately this only works in Unicode builds)
+    wxString message = GetFullMessage();
+#if wxUSE_UNICODE
+    if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+    {
+        // NB: not all compilers support \u escapes
+        static const wchar_t wchRLM = 0x200f;
+        message.Prepend(wxString(wchRLM, 2));
+    }
+#endif // wxUSE_UNICODE
+
+#if wxUSE_MSGBOX_HOOK
+    // install the hook if we need to position the dialog in a non-default way
+    // or change the labels
+    if ( (wxStyle & wxCENTER) || HasCustomLabels() )
+    {
+        const DWORD tid = ::GetCurrentThreadId();
+        m_hook = ::SetWindowsHookEx(WH_CBT,
+                                    &wxMessageDialog::HookFunction, NULL, tid);
+        HookMap()[tid] = this;
+    }
+#endif // wxUSE_MSGBOX_HOOK
+

     // do show the dialog
     // do show the dialog

-    int msAns = MessageBox(hWnd, m_message.c_str(), m_caption.c_str(), msStyle);
+    int msAns = MessageBox(hWnd, message.wx_str(), m_caption.wx_str(), msStyle);

     int ans;
     switch (msAns)
     {
     int ans;
     switch (msAns)
     {


@@ -129,3 +344,5 @@ int wxMessageDialog::ShowModal()
     }
     return ans;
 }
     }
     return ans;
 }

+
+#endif // wxUSE_MSGDLG