Restore socket initialization times counter.

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

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index cca4971b6e2bf2c7c765af3f845bc895bf853b51..0b2b5f9bb20ed46ca864ca801b1404dce2221ee2 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -190,6 +190,11 @@ void wxMessageDialog::GTKCreateMsgDialog()
 
     GtkDialog * const dlg = GTK_DIALOG(m_widget);
 
 
     GtkDialog * const dlg = GTK_DIALOG(m_widget);
 

+    if ( m_dialogStyle & wxSTAY_ON_TOP )
+    {
+        gtk_window_set_keep_above(GTK_WINDOW(m_widget), TRUE);
+    }
+

     // we need to add buttons manually if we use custom labels or always for
     // Yes/No/Cancel dialog as GTK+ doesn't support it natively and when using
     // Hildon we add all the buttons manually as it doesn't support too many of
     // we need to add buttons manually if we use custom labels or always for
     // Yes/No/Cancel dialog as GTK+ doesn't support it natively and when using
     // Hildon we add all the buttons manually as it doesn't support too many of


@@ -255,7 +260,7 @@ int wxMessageDialog::ShowModal()
     {
         GTKCreateMsgDialog();
         wxCHECK_MSG( m_widget, wxID_CANCEL,
     {
         GTKCreateMsgDialog();
         wxCHECK_MSG( m_widget, wxID_CANCEL,

-                     _T("failed to create GtkMessageDialog") );
+                     wxT("failed to create GtkMessageDialog") );

     }
 
     // This should be necessary, but otherwise the
     }
 
     // This should be necessary, but otherwise the


@@ -271,7 +276,7 @@ int wxMessageDialog::ShowModal()
     switch (result)
     {
         default:
     switch (result)
     {
         default:

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

             // fall through
 
         case GTK_RESPONSE_CANCEL:
             // fall through
 
         case GTK_RESPONSE_CANCEL: