missing commit

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

diff --git a/src/msw/richmsgdlg.cpp b/src/msw/richmsgdlg.cpp
index fe0bb4940dd24b360377f155993792849783521e..58bb7cf68d297e93db2b33ff7eef817023f039c8 100644 (file)
--- a/src/msw/richmsgdlg.cpp
+++ b/src/msw/richmsgdlg.cpp
@@ -18,6 +18,7 @@
 #if wxUSE_RICHMSGDLG
 
 #include "wx/richmsgdlg.h"
 #if wxUSE_RICHMSGDLG
 
 #include "wx/richmsgdlg.h"

+#include "wx/modalhook.h"

 
 #ifndef WX_PRECOMP
     #include "wx/msw/private.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/private.h"


@@ -33,6 +34,8 @@
 
 int wxRichMessageDialog::ShowModal()
 {
 
 int wxRichMessageDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

 #ifdef wxHAS_MSW_TASKDIALOG
     using namespace wxMSWMessageDialog;
 
 #ifdef wxHAS_MSW_TASKDIALOG
     using namespace wxMSWMessageDialog;
 


@@ -47,14 +50,14 @@ int wxRichMessageDialog::ShowModal()
         // add a checkbox
         if ( !m_checkBoxText.empty() )
         {
         // add a checkbox
         if ( !m_checkBoxText.empty() )
         {

-            tdc.pszVerificationText = m_checkBoxText.wx_str();
+            tdc.pszVerificationText = m_checkBoxText.t_str();

             if ( m_checkBoxValue )
                 tdc.dwFlags |= TDF_VERIFICATION_FLAG_CHECKED;
         }
 
         // add collapsible footer
         if ( !m_detailedText.empty() )
             if ( m_checkBoxValue )
                 tdc.dwFlags |= TDF_VERIFICATION_FLAG_CHECKED;
         }
 
         // add collapsible footer
         if ( !m_detailedText.empty() )

-            tdc.pszExpandedInformation = m_detailedText.wx_str();
+            tdc.pszExpandedInformation = m_detailedText.t_str();

 
         TaskDialogIndirect_t taskDialogIndirect = GetTaskDialogIndirectFunc();
         if ( !taskDialogIndirect )
 
         TaskDialogIndirect_t taskDialogIndirect = GetTaskDialogIndirectFunc();
         if ( !taskDialogIndirect )