#endif
#include "wx/gtk/private.h"
+#include "wx/gtk/private/messagetype.h"
#include "wx/gtk/private/mnemonics.h"
#include <gtk/gtk.h>
#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& caption,
long style,
const wxPoint& WXUNUSED(pos))
- : wxMessageDialogWithCustomLabels(GetParentForModalDialog(parent),
- message,
- caption,
- style)
+ : wxMessageDialogBase
+ (
+ GetParentForModalDialog(parent, style),
+ message,
+ caption,
+ style
+ )
{
}
int stockId = label.GetStockId();
if ( stockId == wxID_NONE )
{
- wxMessageDialogWithCustomLabels::DoSetCustomLabel(var, label);
+ wxMessageDialogBase::DoSetCustomLabel(var, label);
var = wxConvertMnemonicsToGTK(var);
}
else // stock label
{
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 wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+ const char *stockIcon = "";
+
+ switch ( GetEffectiveIcon() )
+ {
+ 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;
+ }
// 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
+#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
GtkMessageType type = GTK_MESSAGE_ERROR;
GtkButtonsType buttons = GTK_BUTTONS_NONE;
}
}
- 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;
}
);
}
#endif // GTK+ 2.6+
-#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
g_object_ref(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
// the combinations we may have
-#if wxUSE_LIBHILDON
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
static const bool addButtons = true;
#else // !wxUSE_LIBHILDON
const bool addButtons = buttons == GTK_BUTTONS_NONE;
{
if ( addButtons )
{
- gtk_dialog_add_button(dlg, GetNoLabel(), GTK_RESPONSE_NO);
- gtk_dialog_add_button(dlg, GetYesLabel(), GTK_RESPONSE_YES);
+ // 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, GetCancelLabel(),
+ gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()),
GTK_RESPONSE_CANCEL);
}
+
+ gtk_dialog_add_button(dlg, wxGTK_CONV(GetYesLabel()),
+ GTK_RESPONSE_YES);
}
- gtk_dialog_set_default_response(dlg,
- m_dialogStyle & wxNO_DEFAULT
- ? GTK_RESPONSE_NO
- : GTK_RESPONSE_YES);
+ // 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, GetOKLabel(), GTK_RESPONSE_OK);
+ gtk_dialog_add_button(dlg, wxGTK_CONV(GetOKLabel()), GTK_RESPONSE_OK);
if ( m_dialogStyle & wxCANCEL )
- gtk_dialog_add_button(dlg, GetCancelLabel(), GTK_RESPONSE_CANCEL);
+ {
+ gtk_dialog_add_button(dlg, wxGTK_CONV(GetCancelLabel()),
+ GTK_RESPONSE_CANCEL);
+ }
+ }
+
+ if ( m_dialogStyle & wxCANCEL_DEFAULT )
+ {
+ gtk_dialog_set_default_response(dlg, GTK_RESPONSE_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
switch (result)
{
default:
- wxFAIL_MSG(_T("unexpected GtkMessageDialog return code"));
+ wxFAIL_MSG(wxT("unexpected GtkMessageDialog return code"));
// fall through
case GTK_RESPONSE_CANCEL:
projects / wxWidgets.git / blobdiff