use const for xpm icons

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

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index 58ed5548a471123803e3067ff1bc0a0c490b3b37..0b4dd87c22ac5d326881141bbbcafd9a121f7acf 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -16,7 +16,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
+#if wxUSE_MSGDLG && !defined(__WXGPE__)

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


@@ -79,7 +79,7 @@ void wxMessageDialog::GTKCreateMsgDialog()
     wxString message;
 #if GTK_CHECK_VERSION(2, 6, 0)
     bool needsExtMessage = false;
     wxString message;
 #if GTK_CHECK_VERSION(2, 6, 0)
     bool needsExtMessage = false;

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

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


@@ -137,6 +137,12 @@ void wxMessageDialog::GTKCreateMsgDialog()
 
 int wxMessageDialog::ShowModal()
 {
 
 int wxMessageDialog::ShowModal()
 {

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

     if ( !m_widget )
     {
         GTKCreateMsgDialog();
     if ( !m_widget )
     {
         GTKCreateMsgDialog();


@@ -173,4 +179,4 @@ int wxMessageDialog::ShowModal()
 }
 
 
 }
 
 

-#endif // wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
+#endif // wxUSE_MSGDLG && !defined(__WXGPE__)