]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/msgdlg.cpp
Fix bug in wxFileName::Exists("/").
[wxWidgets.git] / src / gtk / msgdlg.cpp
index 267d54db07a006af8ee616becad40b5f19172367..5bbdc930b815ccc555ccdf5cd3c17aebe6c6b373 100644 (file)
@@ -16,7 +16,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
+#if wxUSE_MSGDLG && !defined(__WXGPE__)
 
 #include "wx/msgdlg.h"
 
     #include "wx/intl.h"
 #endif
 
-#include "wx/gtk/private.h"
 #include <gtk/gtk.h>
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/messagetype.h"
+#include "wx/gtk/private/mnemonics.h"
+
+#if wxUSE_LIBHILDON
+    #include <hildon-widgets/hildon-note.h>
+#endif // wxUSE_LIBHILDON
+
+#if wxUSE_LIBHILDON2
+    #include <hildon/hildon.h>
+#endif // wxUSE_LIBHILDON2
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
@@ -34,71 +44,146 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
                                  const wxString& caption,
                                  long style,
                                  const wxPoint& WXUNUSED(pos))
-               : wxMessageDialogBase(GetParentForModalDialog(parent),
-                                     message,
-                                     caption,
-                                     style)
+               : wxMessageDialogBase
+                 (
+                    GetParentForModalDialog(parent, style),
+                    message,
+                    caption,
+                    style
+                 )
+{
+}
+
+wxString wxMessageDialog::GetDefaultYesLabel() const
 {
+    return GTK_STOCK_YES;
+}
+
+wxString wxMessageDialog::GetDefaultNoLabel() const
+{
+    return GTK_STOCK_NO;
+}
+
+wxString wxMessageDialog::GetDefaultOKLabel() const
+{
+    return GTK_STOCK_OK;
+}
+
+wxString wxMessageDialog::GetDefaultCancelLabel() const
+{
+    return GTK_STOCK_CANCEL;
+}
+
+wxString wxMessageDialog::GetDefaultHelpLabel() const
+{
+    return GTK_STOCK_HELP;
+}
+
+void wxMessageDialog::DoSetCustomLabel(wxString& var, const ButtonLabel& label)
+{
+    int stockId = label.GetStockId();
+    if ( stockId == wxID_NONE )
+    {
+        wxMessageDialogBase::DoSetCustomLabel(var, label);
+        var = wxConvertMnemonicsToGTK(var);
+    }
+    else // stock label
+    {
+        var = wxGetStockGtkID(stockId);
+    }
 }
 
 void wxMessageDialog::GTKCreateMsgDialog()
 {
-    GtkMessageType type = GTK_MESSAGE_ERROR;
-    GtkButtonsType buttons = GTK_BUTTONS_OK;
+    GtkWindow * const parent = m_parent ? GTK_WINDOW(m_parent->m_widget) : NULL;
 
-    if (m_dialogStyle & wxYES_NO)
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+    const char *stockIcon = "";
+
+    switch ( GetEffectiveIcon() )
     {
-        if (m_dialogStyle & wxCANCEL)
-            buttons = GTK_BUTTONS_NONE;
-        else
-            buttons = GTK_BUTTONS_YES_NO;
+        case wxICON_ERROR:
+            stockIcon = "qgn_note_gene_syserror";
+            break;
+
+        case wxICON_WARNING:
+            stockIcon = "qgn_note_gene_syswarning";
+            break;
+
+        case wxICON_QUESTION:
+            stockIcon = "qgn_note_confirm";
+            break;
+
+        case wxICON_INFORMATION:
+            stockIcon = "qgn_note_info";
+            break;
     }
 
-    if (m_dialogStyle & wxOK)
+    // there is no generic note creation function in public API so we have no
+    // choice but to use g_object_new() directly
+    m_widget = (GtkWidget *)g_object_new
+               (
+                HILDON_TYPE_NOTE,
+#if wxUSE_LIBHILDON
+                "note_type", HILDON_NOTE_CONFIRMATION_BUTTON_TYPE,
+#else // wxUSE_LIBHILDON
+                "note_type", HILDON_NOTE_TYPE_CONFIRMATION_BUTTON,
+#endif // wxUSE_LIBHILDON /wxUSE_LIBHILDON2
+                "description", (const char *)GetFullMessage().utf8_str(),
+                "icon", stockIcon,
+                NULL
+               );
+#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+    GtkMessageType type = GTK_MESSAGE_ERROR;
+    GtkButtonsType buttons = GTK_BUTTONS_NONE;
+
+    // when using custom labels, we have to add all the buttons ourselves
+    if ( !HasCustomLabels() )
     {
-        if (m_dialogStyle & wxCANCEL)
-            buttons = GTK_BUTTONS_OK_CANCEL;
-        else
-            buttons = GTK_BUTTONS_OK;
+        // "Help" button is not supported by predefined combinations so we
+        // always need to create the buttons manually when it's used.
+        if ( !(m_dialogStyle & wxHELP) )
+        {
+            if ( m_dialogStyle & wxYES_NO )
+            {
+                if ( !(m_dialogStyle & wxCANCEL) )
+                    buttons = GTK_BUTTONS_YES_NO;
+                //else: no standard GTK_BUTTONS_YES_NO_CANCEL so leave as NONE
+            }
+            else if ( m_dialogStyle & wxOK )
+            {
+                buttons = m_dialogStyle & wxCANCEL ? GTK_BUTTONS_OK_CANCEL
+                                                   : GTK_BUTTONS_OK;
+            }
+        }
     }
 
-    if (m_dialogStyle & wxICON_EXCLAMATION)
-        type = GTK_MESSAGE_WARNING;
-    else if (m_dialogStyle & wxICON_ERROR)
-        type = GTK_MESSAGE_ERROR;
-    else if (m_dialogStyle & wxICON_INFORMATION)
-        type = GTK_MESSAGE_INFO;
-    else if (m_dialogStyle & wxICON_QUESTION)
-        type = GTK_MESSAGE_QUESTION;
-    else
+    if ( !wxGTKImpl::ConvertMessageTypeFromWX(GetEffectiveIcon(), &type) )
     {
-        // GTK+ doesn't have a "typeless" msg box, so try to auto detect...
+        // if no style is explicitly specified, detect the suitable icon
+        // ourselves (this can be disabled by using wxICON_NONE)
         type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO;
     }
 
     wxString message;
-#if GTK_CHECK_VERSION(2, 6, 0)
     bool needsExtMessage = false;
-    if ( gtk_check_version(2, 6, 0) == NULL && !m_extendedMessage.empty() )
+    if (!m_extendedMessage.empty())
     {
         message = m_message;
         needsExtMessage = true;
     }
-    else // extended message not needed or not supported
-#endif // GTK+ 2.4+
+    else // extended message not needed
     {
         message = GetFullMessage();
     }
 
-    m_widget = gtk_message_dialog_new(m_parent ? GTK_WINDOW(m_parent->m_widget)
-                                              : NULL,
+    m_widget = gtk_message_dialog_new(parent,
                                       GTK_DIALOG_MODAL,
                                       type,
                                       buttons,
                                       "%s",
                                       (const char*)wxGTK_CONV(message));
 
-#if GTK_CHECK_VERSION(2, 6, 0)
     if ( needsExtMessage )
     {
         gtk_message_dialog_format_secondary_text
@@ -108,40 +193,97 @@ void wxMessageDialog::GTKCreateMsgDialog()
             (const char *)wxGTK_CONV(m_extendedMessage)
         );
     }
-#endif // GTK+ 2.4+
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+
+    g_object_ref(m_widget);
 
     if (m_caption != wxMessageBoxCaptionStr)
         gtk_window_set_title(GTK_WINDOW(m_widget), wxGTK_CONV(m_caption));
 
-    if (m_dialogStyle & wxYES_NO)
+    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
+    // the combinations we may have
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+    static const bool addButtons = true;
+#else // !wxUSE_LIBHILDON
+    const bool addButtons = buttons == GTK_BUTTONS_NONE;
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+
+
+    if ( addButtons )
     {
-        if (m_dialogStyle & wxCANCEL)
+        if ( m_dialogStyle & wxHELP )
         {
-            gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_NO,
+            gtk_dialog_add_button(dlg, wxGTK_CONV(GetHelpLabel()),
+                                  GTK_RESPONSE_HELP);
+        }
+
+        if ( m_dialogStyle & wxYES_NO ) // Yes/No or Yes/No/Cancel dialog
+        {
+            // Add the buttons in the correct order which is, according to
+            // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en
+            // the following one:
+            //
+            // [Help]                  [Alternative] [Cancel] [Affirmative]
+
+            gtk_dialog_add_button(dlg, wxGTK_CONV(GetNoLabel()),
                                   GTK_RESPONSE_NO);
-            gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_CANCEL,
-                                  GTK_RESPONSE_CANCEL);
-            gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_YES,
+
+            if ( m_dialogStyle & wxCANCEL )
+            {
+                gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()),
+                                      GTK_RESPONSE_CANCEL);
+            }
+
+            gtk_dialog_add_button(dlg, wxGTK_CONV(GetYesLabel()),
                                   GTK_RESPONSE_YES);
         }
-        if (m_dialogStyle & wxNO_DEFAULT)
-            gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_NO);
-        else
-            gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_YES);
+        else // Ok or Ok/Cancel dialog
+        {
+            gtk_dialog_add_button(dlg, wxGTK_CONV(GetOKLabel()), GTK_RESPONSE_OK);
+            if ( m_dialogStyle & wxCANCEL )
+            {
+                gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()),
+                                      GTK_RESPONSE_CANCEL);
+            }
+        }
     }
 
-    if (m_parent)
-        gtk_window_set_transient_for(GTK_WINDOW(m_widget),
-                                     GTK_WINDOW(m_parent->m_widget));
+    gint defaultButton;
+    if ( m_dialogStyle & wxCANCEL_DEFAULT )
+        defaultButton = GTK_RESPONSE_CANCEL;
+    else if ( m_dialogStyle & wxNO_DEFAULT )
+        defaultButton = GTK_RESPONSE_NO;
+    else if ( m_dialogStyle & wxYES_NO )
+        defaultButton = GTK_RESPONSE_YES;
+    else // No need to change the default value, whatever it is.
+        defaultButton = GTK_RESPONSE_NONE;
+
+    if ( defaultButton != GTK_RESPONSE_NONE )
+        gtk_dialog_set_default_response(dlg, defaultButton);
 }
 
 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();
         wxCHECK_MSG( m_widget, wxID_CANCEL,
-                     _T("failed to create GtkMessageDialog") );
+                     wxT("failed to create GtkMessageDialog") );
     }
 
     // This should be necessary, but otherwise the
@@ -150,13 +292,15 @@ int wxMessageDialog::ShowModal()
         gtk_window_present( GTK_WINDOW(m_parent->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;
 
     switch (result)
     {
         default:
-            wxFAIL_MSG(_T("unexpected GtkMessageDialog return code"));
+            wxFAIL_MSG(wxT("unexpected GtkMessageDialog return code"));
             // fall through
 
         case GTK_RESPONSE_CANCEL:
@@ -169,8 +313,10 @@ int wxMessageDialog::ShowModal()
             return wxID_YES;
         case GTK_RESPONSE_NO:
             return wxID_NO;
+        case GTK_RESPONSE_HELP:
+            return wxID_HELP;
     }
 }
 
 
-#endif // wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
+#endif // wxUSE_MSGDLG && !defined(__WXGPE__)