#pragma hdrstop
#endif
-#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
+#if wxUSE_MSGDLG && !defined(__WXGPE__)
#include "wx/msgdlg.h"
#endif
#include "wx/gtk/private.h"
+#include "wx/gtk/private/mnemonics.h"
#include <gtk/gtk.h>
+#if wxUSE_LIBHILDON
+ #include <hildon-widgets/hildon-note.h>
+#endif // wxUSE_LIBHILDON
+
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
wxMessageDialog::wxMessageDialog(wxWindow *parent,
const wxString& caption,
long style,
const wxPoint& WXUNUSED(pos))
- : wxMessageDialogBase(GetParentForModalDialog(parent),
- message,
- caption,
- style)
+ : wxMessageDialogWithCustomLabels(GetParentForModalDialog(parent),
+ message,
+ caption,
+ style)
{
}
-void wxMessageDialog::GTKCreateMsgDialog()
+wxString wxMessageDialog::GetDefaultYesLabel() const
{
- GtkMessageType type = GTK_MESSAGE_ERROR;
- GtkButtonsType buttons = GTK_BUTTONS_OK;
+ 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;
+}
- if (m_dialogStyle & wxYES_NO)
+void wxMessageDialog::DoSetCustomLabel(wxString& var, const ButtonLabel& label)
+{
+ int stockId = label.GetStockId();
+ if ( stockId == wxID_NONE )
{
- if (m_dialogStyle & wxCANCEL)
- buttons = GTK_BUTTONS_NONE;
- else
- buttons = GTK_BUTTONS_YES_NO;
+ wxMessageDialogWithCustomLabels::DoSetCustomLabel(var, label);
+ var = wxConvertMnemonicsToGTK(var);
}
+ else // stock label
+ {
+ var = wxGetStockGtkID(stockId);
+ }
+}
+
+void wxMessageDialog::GTKCreateMsgDialog()
+{
+ GtkWindow * const parent = m_parent ? GTK_WINDOW(m_parent->m_widget) : NULL;
+
+#if wxUSE_LIBHILDON
+ const char *stockIcon;
+ if ( m_dialogStyle & wxICON_ERROR )
+ stockIcon = "qgn_note_gene_syserror";
+ else if ( m_dialogStyle & wxICON_EXCLAMATION )
+ stockIcon = "qgn_note_gene_syswarning";
+ else if ( m_dialogStyle & wxICON_INFORMATION )
+ stockIcon = "qgn_note_info";
+ else if ( m_dialogStyle & wxICON_QUESTION )
+ stockIcon = "qgn_note_confirm";
+ else
+ stockIcon = "";
- 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,
+ "note_type", HILDON_NOTE_CONFIRMATION_BUTTON_TYPE,
+ "description", (const char *)GetFullMessage().utf8_str(),
+ "icon", stockIcon,
+ NULL
+ );
+#else // !wxUSE_LIBHILDON
+ 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;
+ 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)
needsExtMessage = true;
}
else // extended message not needed or not supported
-#endif // GTK+ 2.4+
+#endif // GTK+ 2.6+
{
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,
(const char *)wxGTK_CONV(m_extendedMessage)
);
}
-#endif // GTK+ 2.4+
+#endif // GTK+ 2.6+
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+
+ 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);
+
+ // 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
+ static const bool addButtons = true;
+#else // !wxUSE_LIBHILDON
+ const bool addButtons = buttons == GTK_BUTTONS_NONE;
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+
+ if ( m_dialogStyle & wxYES_NO ) // Yes/No or Yes/No/Cancel dialog
{
- if (m_dialogStyle & wxCANCEL)
+ if ( addButtons )
{
- gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_NO,
+ 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,
+ gtk_dialog_add_button(dlg, wxGTK_CONV(GetYesLabel()),
GTK_RESPONSE_YES);
+
+ if ( m_dialogStyle & wxCANCEL )
+ {
+ gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()),
+ GTK_RESPONSE_CANCEL);
+ }
+ }
+
+ // it'd probably be harmless to call gtk_dialog_set_default_response()
+ // twice but why do it if we're going to change the default below
+ // anyhow
+ if ( !(m_dialogStyle & wxCANCEL_DEFAULT) )
+ {
+ gtk_dialog_set_default_response(dlg,
+ m_dialogStyle & wxNO_DEFAULT
+ ? GTK_RESPONSE_NO
+ : GTK_RESPONSE_YES);
+ }
+ }
+ else if ( addButtons ) // 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_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);
}
- if (m_parent)
- gtk_window_set_transient_for(GTK_WINDOW(m_widget),
- GTK_WINDOW(m_parent->m_widget));
+ if ( m_dialogStyle & wxCANCEL_DEFAULT )
+ {
+ gtk_dialog_set_default_response(dlg, GTK_RESPONSE_CANCEL);
+ }
}
int wxMessageDialog::ShowModal()
gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
gtk_widget_destroy(m_widget);
+ g_object_unref(m_widget);
m_widget = NULL;
switch (result)
}
-#endif // wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
+#endif // wxUSE_MSGDLG && !defined(__WXGPE__)
projects / wxWidgets.git / blobdiff