Correctly parse times without seconds in wxDateTime::ParseTime().

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

diff --git a/src/msw/msgdlg.cpp b/src/msw/msgdlg.cpp
index 6166b125a45b39c73ba59ba3ac0a7d4543cc5668..108beb7d1bcb4ba1e91a754edbfde98a1c9ebbbe 100644 (file)
--- a/src/msw/msgdlg.cpp
+++ b/src/msw/msgdlg.cpp
@@ -30,6 +30,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/intl.h"

     #include "wx/utils.h"
     #include "wx/dialog.h"
     #if wxUSE_MSGBOX_HOOK
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #if wxUSE_MSGBOX_HOOK


@@ -200,9 +201,9 @@ void wxMessageDialog::ReplaceStaticWithEdit()
     // find the static control to replace: normally there are two of them, the
     // icon and the text itself so search for all of them and ignore the icon
     // ones
     // find the static control to replace: normally there are two of them, the
     // icon and the text itself so search for all of them and ignore the icon
     // ones

-    HWND hwndStatic = ::FindWindowEx(GetHwnd(), NULL, _T("STATIC"), NULL);
+    HWND hwndStatic = ::FindWindowEx(GetHwnd(), NULL, wxT("STATIC"), NULL);

     if ( ::GetWindowLong(hwndStatic, GWL_STYLE) & SS_ICON )
     if ( ::GetWindowLong(hwndStatic, GWL_STYLE) & SS_ICON )

-        hwndStatic = ::FindWindowEx(GetHwnd(), hwndStatic, _T("STATIC"), NULL);
+        hwndStatic = ::FindWindowEx(GetHwnd(), hwndStatic, wxT("STATIC"), NULL);

 
     if ( !hwndStatic )
     {
 
     if ( !hwndStatic )
     {


@@ -257,7 +258,7 @@ void wxMessageDialog::ReplaceStaticWithEdit()
     // do create the new control
     HWND hwndEdit = ::CreateWindow
                       (
     // do create the new control
     HWND hwndEdit = ::CreateWindow
                       (

-                        _T("EDIT"),
+                        wxT("EDIT"),

                         wxTextBuffer::Translate(text).wx_str(),
                         WS_CHILD | WS_VSCROLL | WS_VISIBLE |
                         ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL,
                         wxTextBuffer::Translate(text).wx_str(),
                         WS_CHILD | WS_VSCROLL | WS_VISIBLE |
                         ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL,


@@ -445,6 +446,34 @@ int wxMessageDialog::ShowModal()
         m_parent = GetParentForModalDialog();
     HWND hWnd = m_parent ? GetHwndOf(m_parent) : NULL;
 
         m_parent = GetParentForModalDialog();
     HWND hWnd = m_parent ? GetHwndOf(m_parent) : NULL;
 

+#if wxUSE_INTL
+    // native message box always uses the current user locale but the program
+    // may be using a different one and in this case we need to manually
+    // translate the button labels to avoid mismatch between the language of
+    // the message box text and its buttons
+    wxLocale * const loc = wxGetLocale();
+    if ( loc && loc->GetLanguage() != wxLocale::GetSystemLanguage() )
+    {
+        if ( m_dialogStyle & wxYES_NO )
+        {
+            // use the strings with mnemonics here as the native message box
+            // does
+            SetYesNoLabels(_("&Yes"), _("&No"));
+        }
+
+        // we may or not have the Ok/Cancel buttons but either we do have them
+        // or we already made the labels custom because we called
+        // SetYesNoLabels() above so doing this does no harm -- and is
+        // necessary in wxYES_NO | wxCANCEL case
+        //
+        // note that we don't use mnemonics here for consistency with the
+        // native message box (which probably doesn't use them because
+        // Enter/Esc keys can be already used to dismiss the message box
+        // using keyboard)
+        SetOKCancelLabels(_("OK"), _("Cancel"));
+    }
+#endif // wxUSE_INTL
+

     // translate wx style in MSW
     unsigned int msStyle;
     const long wxStyle = GetMessageDialogStyle();
     // translate wx style in MSW
     unsigned int msStyle;
     const long wxStyle = GetMessageDialogStyle();


@@ -528,7 +557,7 @@ int wxMessageDialog::ShowModal()
     switch (msAns)
     {
         default:
     switch (msAns)
     {
         default:

-            wxFAIL_MSG(_T("unexpected ::MessageBox() return code"));
+            wxFAIL_MSG(wxT("unexpected ::MessageBox() return code"));

             // fall through
 
         case IDCANCEL:
             // fall through
 
         case IDCANCEL: