/////////////////////////////////////////////////////////////////////////////
-// 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:
-// Created: 04/01/98
+// Created: 2003/02/28
// 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__
-#pragma hdrstop
+ #pragma hdrstop
#endif
+#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
+
+#include "wx/msgdlg.h"
+
#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/intl.h"
#endif
-#include <stdio.h>
-#include <string.h>
-
-#include "wx/gtk/msgdlg.h"
-#include "wx/statline.h"
+#include "wx/gtk/private.h"
+#include <gtk/gtk.h>
-#include "wx/gtk/info.xpm"
-#include "wx/gtk/error.xpm"
-#include "wx/gtk/question.xpm"
-#include "wx/gtk/warning.xpm"
+IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
-///////////////////////////////////////////////////////////////////
-// New dialog box implementations
+wxMessageDialog::wxMessageDialog(wxWindow *parent,
+ const wxString& message,
+ const wxString& caption,
+ long style,
+ const wxPoint& WXUNUSED(pos))
+ : wxMessageDialogBase(GetParentForModalDialog(parent),
+ message,
+ caption,
+ style)
+{
+}
-// Split message, using constraints to position controls
-wxSize wxSplitMessage2( const wxString &message, wxWindow *parent, int text_pos_x )
+void wxMessageDialog::GTKCreateMsgDialog()
{
- int y = 15;
- int w = 50;
- wxString line( _T("") );
- for (uint pos = 0; pos < message.Len(); pos++)
+ GtkMessageType type = GTK_MESSAGE_ERROR;
+ GtkButtonsType buttons = GTK_BUTTONS_OK;
+
+ if (m_dialogStyle & wxYES_NO)
{
- 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;
- }
+ if (m_dialogStyle & wxCANCEL)
+ buttons = GTK_BUTTONS_NONE;
else
- {
- line += message[pos];
- }
+ buttons = GTK_BUTTONS_YES_NO;
}
-
- if (!line.IsEmpty())
+
+ if (m_dialogStyle & wxOK)
{
- wxStaticText *s2 = new wxStaticText( parent, -1, line, wxPoint(text_pos_x,y) );
- wxSize size2( s2->GetSize() );
- if (size2.x > w) w = size2.x;
+ if (m_dialogStyle & wxCANCEL)
+ buttons = GTK_BUTTONS_OK_CANCEL;
+ else
+ buttons = GTK_BUTTONS_OK;
}
-
- 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()
-
-IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
-#endif
-
-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;
-
- int text_pos_x = 15;
-
- if (m_dialogStyle & wxICON_MASK)
- text_pos_x += 80;
-
- wxSize message_size( wxSplitMessage2( message, this, text_pos_x ) );
- if (m_dialogStyle & wxICON_MASK)
- if (message_size.y < 50) message_size.y = 50;
-
- if (m_dialogStyle & wxICON_INFORMATION)
- (void) new wxStaticBitmap( this, -1, wxBitmap( info_xpm ), wxPoint(15,message_size.y/2-16) );
- else
- if (m_dialogStyle & wxICON_HAND)
- (void) new wxStaticBitmap( this, -1, wxBitmap( error_xpm ), wxPoint(15,message_size.y/2-16) );
- else
- if (m_dialogStyle & wxICON_QUESTION)
- (void) new wxStaticBitmap( this, -1, wxBitmap( question_xpm ), wxPoint(15,message_size.y/2-16) );
- else
if (m_dialogStyle & wxICON_EXCLAMATION)
- (void) new wxStaticBitmap( this, -1, wxBitmap( warning_xpm ), wxPoint(15,message_size.y/2-16) );
-
- 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)
+ 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
{
- 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 );
+ // GTK+ doesn't have a "typeless" msg box, so try to auto detect...
+ type = m_dialogStyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO;
}
- if (style & wxOK)
+ wxString message;
+#if GTK_CHECK_VERSION(2, 6, 0)
+ bool needsExtMessage = false;
+ if ( gtk_check_version(2, 6, 0) == NULL && !m_extendedMessage.empty() )
{
- ok = new wxButton( this, wxID_OK, _("OK"), wxPoint(-1,y), wxSize(80,-1) );
- m_buttons.Append( ok );
+ message = m_message;
+ needsExtMessage = true;
}
-
- if (style & wxCANCEL)
+ else // extended message not needed or not supported
+#endif // GTK+ 2.4+
{
- cancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxPoint(-1,y), wxSize(80,-1) );
- m_buttons.Append( cancel );
+ message = GetFullMessage();
}
- if (ok)
- {
- ok->SetDefault();
- ok->SetFocus();
- }
- else if (yes)
+ m_widget = gtk_message_dialog_new(m_parent ? GTK_WINDOW(m_parent->m_widget)
+ : NULL,
+ GTK_DIALOG_MODAL,
+ type,
+ buttons,
+ "%s",
+ (const char*)wxGTK_CONV(message));
+
+#if GTK_CHECK_VERSION(2, 6, 0)
+ if ( needsExtMessage )
{
- yes->SetDefault();
- yes->SetFocus();
+ gtk_message_dialog_format_secondary_text
+ (
+ (GtkMessageDialog *)m_widget,
+ "%s",
+ (const char *)wxGTK_CONV(m_extendedMessage)
+ );
}
-
- 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)
+#endif // GTK+ 2.4+
+
+ if (m_caption != wxMessageBoxCaptionStr)
+ gtk_window_set_title(GTK_WINDOW(m_widget), wxGTK_CONV(m_caption));
+
+ if (m_dialogStyle & wxYES_NO)
{
- wxWindow *win = (wxWindow*)node->Data();
- int x = (n*2+1)*space - 40 + 15;
- win->Move( x, -1 );
- node = node->Next();
- n++;
+ if (m_dialogStyle & wxCANCEL)
+ {
+ gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_NO,
+ 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_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);
}
-
-#ifdef __WXGTK__
- (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
-#endif
-
- SetSize( w+30, y+40 );
- Centre( wxBOTH );
+ if (m_parent)
+ gtk_window_set_transient_for(GTK_WINDOW(m_widget),
+ GTK_WINDOW(m_parent->m_widget));
}
-void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
+int wxMessageDialog::ShowModal()
{
- EndModal( wxID_YES );
-}
+ if ( !m_widget )
+ {
+ GTKCreateMsgDialog();
+ wxCHECK_MSG( m_widget, wxID_CANCEL,
+ _T("failed to create GtkMessageDialog") );
+ }
-void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event))
-{
- EndModal( wxID_NO );
-}
+ // This should be necessary, but otherwise the
+ // parent TLW will disappear..
+ if (m_parent)
+ gtk_window_present( GTK_WINDOW(m_parent->m_widget) );
-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) )
+ gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
+ gtk_widget_destroy(m_widget);
+ m_widget = NULL;
+
+ switch (result)
{
- EndModal( wxID_CANCEL );
+ default:
+ wxFAIL_MSG(_T("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;
}
}
+#endif // wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
projects / wxWidgets.git / blobdiff