wxRTC: fixed guidelines overwriting adjacent cell borders; corrected capitalisation...

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

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 2b47ac27ef63382bd35e6802fb1b9b77b6f343fc..8bc0dae840bda65d3b889cbca334861c546a4ebd 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2003/02/28
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2003/02/28

-// RCS-ID:      $Id$

 // Copyright:   (c) Vaclav Slavik, 2003
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Vaclav Slavik, 2003
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -24,10 +23,13 @@
     #include "wx/intl.h"
 #endif
 
     #include "wx/intl.h"
 #endif
 

+#include "wx/modalhook.h"
+
+#include <gtk/gtk.h>

 #include "wx/gtk/private.h"
 #include "wx/gtk/private/messagetype.h"
 #include "wx/gtk/private/mnemonics.h"
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/messagetype.h"
 #include "wx/gtk/private/mnemonics.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/dialogcount.h"

 
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-note.h>
 
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-note.h>


@@ -166,15 +168,13 @@ void wxMessageDialog::GTKCreateMsgDialog()
     }
 
     wxString message;
     }
 
     wxString message;

-#if GTK_CHECK_VERSION(2, 6, 0)

     bool needsExtMessage = false;
     bool needsExtMessage = false;

-    if ( gtk_check_version(2, 6, 0) == NULL && !m_extendedMessage.empty() )
+    if (!m_extendedMessage.empty())

     {
         message = m_message;
         needsExtMessage = true;
     }
     {
         message = m_message;
         needsExtMessage = true;
     }

-    else // extended message not needed or not supported
-#endif // GTK+ 2.6+
+    else // extended message not needed

     {
         message = GetFullMessage();
     }
     {
         message = GetFullMessage();
     }


@@ -186,7 +186,6 @@ void wxMessageDialog::GTKCreateMsgDialog()
                                       "%s",
                                       (const char*)wxGTK_CONV(message));
 
                                       "%s",
                                       (const char*)wxGTK_CONV(message));
 

-#if GTK_CHECK_VERSION(2, 6, 0)

     if ( needsExtMessage )
     {
         gtk_message_dialog_format_secondary_text
     if ( needsExtMessage )
     {
         gtk_message_dialog_format_secondary_text


@@ -196,7 +195,6 @@ void wxMessageDialog::GTKCreateMsgDialog()
             (const char *)wxGTK_CONV(m_extendedMessage)
         );
     }
             (const char *)wxGTK_CONV(m_extendedMessage)
         );
     }

-#endif // GTK+ 2.6+

 #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
 
     g_object_ref(m_widget);
 #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
 
     g_object_ref(m_widget);


@@ -277,6 +275,8 @@ void wxMessageDialog::GTKCreateMsgDialog()
 
 int wxMessageDialog::ShowModal()
 {
 
 int wxMessageDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     // break the mouse capture as it would interfere with modal dialog (see
     // wxDialog::ShowModal)
     wxWindow * const win = wxWindow::GetCapture();
     // break the mouse capture as it would interfere with modal dialog (see
     // wxDialog::ShowModal)
     wxWindow * const win = wxWindow::GetCapture();


@@ -295,7 +295,10 @@ int wxMessageDialog::ShowModal()
     if (m_parent)
         gtk_window_present( GTK_WINDOW(m_parent->m_widget) );
 
     if (m_parent)
         gtk_window_present( GTK_WINDOW(m_parent->m_widget) );
 

+    wxOpenModalDialogLocker modalLocker;
+

     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));

+    GTKDisconnect(m_widget);

     gtk_widget_destroy(m_widget);
     g_object_unref(m_widget);
     m_widget = NULL;
     gtk_widget_destroy(m_widget);
     g_object_unref(m_widget);
     m_widget = NULL;