Fix for crash when opening empty node

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

diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp
index 8aaa2313cc60038050d2efa3724d7600bf51844a..4504fd97c7006f4ddebec42919f77367c2d8ae4b 100644 (file)
--- a/src/os2/msgdlg.cpp
+++ b/src/os2/msgdlg.cpp
@@ -1,33 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlg.cpp
+// Name:        src/os2/msgdlg.cpp

 // Purpose:     wxMessageDialog
 // Author:      David Webster
 // Modified by:
 // Created:     10/10/99
 // Purpose:     wxMessageDialog
 // Author:      David Webster
 // Modified by:
 // Created:     10/10/99

-// RCS-ID:      $$
+// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "msgdlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/app.h"

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

+
+#ifndef WX_PRECOMP
+    #include <stdio.h>
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/app.h"
+    #include "wx/math.h"

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

-#include <math.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 


@@ -36,25 +32,12 @@
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 

-wxMessageDialog::wxMessageDialog(
-  wxWindow*                         pParent
-, const wxString&                   rsMessage
-, const wxString&                   rsCaption
-, long                              lStyle
-, const wxPoint&                    pPos
-)
-{
-    m_sCaption     = rsCaption;
-    m_sMessage     = rsMessage;
-    m_lDialogStyle = lStyle;
-    m_pParent      = NULL; // pParent;
-} // end of wxMessageDialog::wxMessageDialog
-

 int wxMessageDialog::ShowModal()
 {
     HWND                            hWnd = 0;
     ULONG                           ulStyle = MB_OK;
     int                             nAns = wxOK;
 int wxMessageDialog::ShowModal()
 {
     HWND                            hWnd = 0;
     ULONG                           ulStyle = MB_OK;
     int                             nAns = wxOK;

+    const long                      lStyle = GetMessageDialogStyle();

 
     if (!wxTheApp->GetTopWindow())
     {
 
     if (!wxTheApp->GetTopWindow())
     {


@@ -68,35 +51,35 @@ int wxMessageDialog::ShowModal()
             wxTheApp->Dispatch();
     }
 
             wxTheApp->Dispatch();
     }
 

-    if (m_pParent)
-        hWnd = (HWND) m_pParent->GetHWND();
+    if (m_parent)
+        hWnd = (HWND) m_parent->GetHWND();

     else
         hWnd = HWND_DESKTOP;
     else
         hWnd = HWND_DESKTOP;

-    if (m_lDialogStyle & wxYES_NO)
+    if (lStyle & wxYES_NO)

     {
     {

-        if (m_lDialogStyle & wxCANCEL)
+        if (lStyle & wxCANCEL)

             ulStyle = MB_YESNOCANCEL;
         else
             ulStyle = MB_YESNO;
 
             ulStyle = MB_YESNOCANCEL;
         else
             ulStyle = MB_YESNO;
 

-        if (m_lDialogStyle & wxNO_DEFAULT)
+        if (lStyle & wxNO_DEFAULT)

             ulStyle |= MB_DEFBUTTON2;
     }
 
             ulStyle |= MB_DEFBUTTON2;
     }
 

-    if (m_lDialogStyle & wxOK)
+    if (lStyle & wxOK)

     {
     {

-        if (m_lDialogStyle & wxCANCEL)
+        if (lStyle & wxCANCEL)

             ulStyle = MB_OKCANCEL;
         else
             ulStyle = MB_OK;
     }
             ulStyle = MB_OKCANCEL;
         else
             ulStyle = MB_OK;
     }

-    if (m_lDialogStyle & wxICON_EXCLAMATION)
+    if (lStyle & wxICON_EXCLAMATION)

         ulStyle |= MB_ICONEXCLAMATION;
         ulStyle |= MB_ICONEXCLAMATION;

-    else if (m_lDialogStyle & wxICON_HAND)
+    else if (lStyle & wxICON_HAND)

         ulStyle |= MB_ICONHAND;
         ulStyle |= MB_ICONHAND;

-    else if (m_lDialogStyle & wxICON_INFORMATION)
+    else if (lStyle & wxICON_INFORMATION)

         ulStyle |= MB_ICONEXCLAMATION;
         ulStyle |= MB_ICONEXCLAMATION;

-    else if (m_lDialogStyle & wxICON_QUESTION)
+    else if (lStyle & wxICON_QUESTION)

         ulStyle |= MB_ICONQUESTION;
 
     if (hWnd != HWND_DESKTOP)
         ulStyle |= MB_ICONQUESTION;
 
     if (hWnd != HWND_DESKTOP)


@@ -114,8 +97,8 @@ int wxMessageDialog::ShowModal()
 
     ULONG                           ulAns = ::WinMessageBox( hWnd
                                                             ,hWnd
 
     ULONG                           ulAns = ::WinMessageBox( hWnd
                                                             ,hWnd

-                                                            ,(PSZ)m_sMessage.c_str()
-                                                            ,(PSZ)m_sCaption.c_str()
+                                                            ,GetFullMessage().c_str()
+                                                            ,m_caption.c_str()

                                                             ,0L
                                                             ,ulStyle);
     switch (ulAns)
                                                             ,0L
                                                             ,ulStyle);
     switch (ulAns)


@@ -137,4 +120,3 @@ int wxMessageDialog::ShowModal()
     }
     return nAns;
 } // end of wxMessageDialog::ShowModal
     }
     return nAns;
 } // end of wxMessageDialog::ShowModal

-