Fix typo in last commit

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

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index c1d4f486e9c4c4072c7ef7f212ce93c83eedb1f6..2b47ac27ef63382bd35e6802fb1b9b77b6f343fc 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -1,196 +1,325 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msgdlgg.cpp
-// Purpose:     wxGenericMessageDialog
-// Author:      Julian Smart, Robert Roebling
+// Name:        src/gtk/msgdlg.cpp
+// Purpose:     wxMessageDialog for GTK+2
+// Author:      Vaclav Slavik

 // Modified by:
 // Modified by:

-// Created:     04/01/98
+// Created:     2003/02/28

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

-// Copyright:   (c) Julian Smart, Markus Holzem, Robert Roebling
-// Licence:           wxWindows license
+// Copyright:   (c) Vaclav Slavik, 2003
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_MSGDLG && !defined(__WXGPE__)
+
+#include "wx/msgdlg.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/statbmp.h"
-#include "wx/stattext.h"
-#include "wx/layout.h"
-#include "wx/intl.h"
-#include "wx/bitmap.h"
-#include "wx/app.h"
+    #include "wx/intl.h"

 #endif
 
 #endif
 

-#include <stdio.h>
-#include <string.h>
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/messagetype.h"
+#include "wx/gtk/private/mnemonics.h"
+#include <gtk/gtk.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)
+
+wxMessageDialog::wxMessageDialog(wxWindow *parent,
+                                 const wxString& message,
+                                 const wxString& caption,
+                                 long style,
+                                 const wxPoint& WXUNUSED(pos))
+               : 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;
+}

 
 

-#include "wx/gtk/msgdlg.h"
-#include "wx/statline.h"
+wxString wxMessageDialog::GetDefaultCancelLabel() const
+{
+    return GTK_STOCK_CANCEL;
+}

 
 

-///////////////////////////////////////////////////////////////////
-// New dialog box implementations
+wxString wxMessageDialog::GetDefaultHelpLabel() const
+{
+    return GTK_STOCK_HELP;
+}

 
 

-// Split message, using constraints to position controls
-wxSize wxSplitMessage2( const wxString &message, wxWindow *parent, int text_pos_x )
+void wxMessageDialog::DoSetCustomLabel(wxString& var, const ButtonLabel& label)

 {
 {

-    int y = 15;
-    int w = 50;
-    wxString line( _T("") );
-    for (uint pos = 0; pos < message.Len(); pos++)
+    int stockId = label.GetStockId();
+    if ( stockId == wxID_NONE )

     {
     {

-        if (message[pos] == _T('\n'))
-        {
-            if (!line.IsEmpty())
-            {
-                wxStaticText *s1 = new wxStaticText( parent, -1, line, wxPoint(text_pos_x,y) );
-                wxSize size1( s1->GetSize() );
-                if (size1.x > w) w = size1.x;
-                line = _T("");
-            }
-            y += 18;
-        }
-        else
-        {
-            line += message[pos];
-        }
+        wxMessageDialogBase::DoSetCustomLabel(var, label);
+        var = wxConvertMnemonicsToGTK(var);

     }
     }

-    
-    if (!line.IsEmpty())
+    else // stock label

     {
     {

-        wxStaticText *s2 = new wxStaticText( parent, -1, line, wxPoint(text_pos_x,y) );
-        wxSize size2( s2->GetSize() );
-        if (size2.x > w) w = size2.x;
+        var = wxGetStockGtkID(stockId);

     }
     }

-        
-    y += 18;
-    
-    return wxSize(w+15+text_pos_x,y);

 }
 
 }
 

-#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
-        EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
-        EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
-        EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
-END_EVENT_TABLE()
+void wxMessageDialog::GTKCreateMsgDialog()
+{
+    GtkWindow * const parent = m_parent ? GTK_WINDOW(m_parent->m_widget) : NULL;

 
 

-IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
-#endif
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+    const char *stockIcon = "";

 
 

-wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString& message, 
-   const wxString& caption, long style, const wxPoint& pos) :
-  wxDialog( parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE )
-{
-    m_dialogStyle = style;
+    switch ( GetEffectiveIcon() )
+    {
+        case wxICON_ERROR:
+            stockIcon = "qgn_note_gene_syserror";
+            break;

 
 

-    int text_pos_x = 15;
-    
-    if (m_dialogStyle & wxICON_MASK)
-        text_pos_x += 80;
+        case wxICON_WARNING:
+            stockIcon = "qgn_note_gene_syswarning";
+            break;

 
 

-    wxSize message_size( wxSplitMessage2( message, this, text_pos_x ) );
+        case wxICON_QUESTION:
+            stockIcon = "qgn_note_confirm";
+            break;

 
 

-    if (m_dialogStyle & wxICON_MASK)
-    {
-       if (message_size.y < 50) message_size.y = 50;
-        (void) new wxStaticBitmap( this, -1,
-                                   wxTheApp->GetStdIcon(m_dialogStyle
-                                                        & wxICON_MASK),
-                                   wxPoint(15,message_size.y/2-16) ); 
+        case wxICON_INFORMATION:
+            stockIcon = "qgn_note_info";
+            break;

     }
 
     }
 

-    wxButton *ok = (wxButton *) NULL;
-    wxButton *cancel = (wxButton *) NULL;
-    wxButton *yes = (wxButton *) NULL;
-    wxButton *no = (wxButton *) NULL;
-    
-    int y = message_size.y + 30;
-    
-    if (style & wxYES_NO) 
+    // 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() )

     {
     {

-        yes = new wxButton( this, wxID_YES, _("Yes"), wxPoint(-1,y), wxSize(80,-1) );
-        m_buttons.Append( yes );
-        no = new wxButton( this, wxID_NO, _("No"), wxPoint(-1,y), wxSize(80,-1) );
-        m_buttons.Append( no );
+        // "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 (style & wxOK) 
+    if ( !wxGTKImpl::ConvertMessageTypeFromWX(GetEffectiveIcon(), &type) )

     {
     {

-        ok = new wxButton( this, wxID_OK, _("OK"), wxPoint(-1,y), wxSize(80,-1) );
-        m_buttons.Append( ok );
+        // 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;

     }
 
     }
 

-    if (style & wxCANCEL) 
+    wxString message;
+#if GTK_CHECK_VERSION(2, 6, 0)
+    bool needsExtMessage = false;
+    if ( gtk_check_version(2, 6, 0) == NULL && !m_extendedMessage.empty() )
+    {
+        message = m_message;
+        needsExtMessage = true;
+    }
+    else // extended message not needed or not supported
+#endif // GTK+ 2.6+

     {
     {

-        cancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxPoint(-1,y), wxSize(80,-1) );
-        m_buttons.Append( cancel );
+        message = GetFullMessage();

     }
 
     }
 

-    if (ok)
+    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 )

     {
     {

-        ok->SetDefault();
-        ok->SetFocus();
+        gtk_message_dialog_format_secondary_text
+        (
+            (GtkMessageDialog *)m_widget,
+            "%s",
+            (const char *)wxGTK_CONV(m_extendedMessage)
+        );

     }
     }

-    else if (yes)
+#endif // GTK+ 2.6+
+#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));
+
+    GtkDialog * const dlg = GTK_DIALOG(m_widget);
+
+    if ( m_dialogStyle & wxSTAY_ON_TOP )

     {
     {

-        yes->SetDefault();
-        yes->SetFocus();
+        gtk_window_set_keep_above(GTK_WINDOW(m_widget), TRUE);

     }
     }

-    
-    int w = m_buttons.GetCount() * 100;
-    if (message_size.x > w) w = message_size.x;
-    int space = w / (m_buttons.GetCount()*2);
-    
-    int n = 0;
-    wxNode *node = m_buttons.First();
-    while (node)
+
+    // 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 )

     {
     {

-        wxWindow *win = (wxWindow*)node->Data();
-        int x = (n*2+1)*space - 40 + 15;
-        win->Move( x, -1 );
-        node = node->Next();
-        n++;
+        if ( m_dialogStyle & wxHELP )
+        {
+            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);
+
+            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);
+        }
+        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);
+            }
+        }

     }
     }

-    
-#ifdef __WXGTK__
-    (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
-#endif
-    
-    SetSize( w+30, y+40 );

 
 

-    Centre( wxBOTH );
-}
+    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;

 
 

-void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
-{
-    EndModal( wxID_YES );
+    if ( defaultButton != GTK_RESPONSE_NONE )
+        gtk_dialog_set_default_response(dlg, defaultButton);

 }
 
 }
 

-void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event))
+int wxMessageDialog::ShowModal()

 {
 {

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

 
 

-void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-    /* Allow cancellation via ESC/Close button except if
-       only YES and NO are specified. */
-    if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) )
+    if ( !m_widget )

     {
     {

-        EndModal( wxID_CANCEL );
+        GTKCreateMsgDialog();
+        wxCHECK_MSG( m_widget, wxID_CANCEL,
+                     wxT("failed to create GtkMessageDialog") );
+    }
+
+    // This should be necessary, but otherwise the
+    // parent TLW will disappear..
+    if (m_parent)
+        gtk_window_present( GTK_WINDOW(m_parent->m_widget) );
+
+    gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
+    gtk_widget_destroy(m_widget);
+    g_object_unref(m_widget);
+    m_widget = NULL;
+
+    switch (result)
+    {
+        default:
+            wxFAIL_MSG(wxT("unexpected GtkMessageDialog return code"));
+            // fall through
+
+        case GTK_RESPONSE_CANCEL:
+        case GTK_RESPONSE_DELETE_EVENT:
+        case GTK_RESPONSE_CLOSE:
+            return wxID_CANCEL;
+        case GTK_RESPONSE_OK:
+            return wxID_OK;
+        case GTK_RESPONSE_YES:
+            return wxID_YES;
+        case GTK_RESPONSE_NO:
+            return wxID_NO;
+        case GTK_RESPONSE_HELP:
+            return wxID_HELP;

     }
 }
 
 
     }
 }
 
 

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