projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added list style to text attributes, independent from paragraph style
[wxWidgets.git]
/
src
/
gtk
/
msgdlg.cpp
diff --git
a/src/gtk/msgdlg.cpp
b/src/gtk/msgdlg.cpp
index eaa3d7cf3ab59fc6f1a810bef999b0da26f5d284..fa66968937476f0e61976fd80b2d79437d44273e 100644
(file)
--- a/
src/gtk/msgdlg.cpp
+++ b/
src/gtk/msgdlg.cpp
@@
-1,33
+1,32
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: msgdlg.cpp
+// Name:
src/gtk/
msgdlg.cpp
// Purpose: wxMessageDialog for GTK+2
// Author: Vaclav Slavik
// Modified by:
// Created: 2003/02/28
// RCS-ID: $Id$
// Copyright: (c) Vaclav Slavik, 2003
// Purpose: wxMessageDialog for GTK+2
// Author: Vaclav Slavik
// Modified by:
// Created: 2003/02/28
// RCS-ID: $Id$
// Copyright: (c) Vaclav Slavik, 2003
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "msgdlg.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
#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
#endif
#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
+#include "wx/msgdlg.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/intl.h"
+#endif
+
#include "wx/gtk/private.h"
#include <gtk/gtk.h>
#include "wx/gtk/private.h"
#include <gtk/gtk.h>
-#include "wx/msgdlg.h"
-#include "wx/intl.h"
-
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
wxMessageDialog::wxMessageDialog(wxWindow *parent,
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
wxMessageDialog::wxMessageDialog(wxWindow *parent,
@@
-38,37
+37,37
@@
wxMessageDialog::wxMessageDialog(wxWindow *parent,
{
m_caption = caption;
m_message = message;
{
m_caption = caption;
m_message = message;
-
m_dialogStyle = style
;
+
SetMessageDialogStyle(style)
;
m_parent = wxGetTopLevelParent(parent);
GtkMessageType type = GTK_MESSAGE_ERROR;
GtkButtonsType buttons = GTK_BUTTONS_OK;
m_parent = wxGetTopLevelParent(parent);
GtkMessageType type = GTK_MESSAGE_ERROR;
GtkButtonsType buttons = GTK_BUTTONS_OK;
- if (
m_dialogS
tyle & wxYES_NO)
+ if (
s
tyle & wxYES_NO)
{
buttons = GTK_BUTTONS_YES_NO;
}
{
buttons = GTK_BUTTONS_YES_NO;
}
- if (
m_dialogS
tyle & wxOK)
+ if (
s
tyle & wxOK)
{
{
- if (
m_dialogS
tyle & wxCANCEL)
+ if (
s
tyle & wxCANCEL)
buttons = GTK_BUTTONS_OK_CANCEL;
else
buttons = GTK_BUTTONS_OK;
}
buttons = GTK_BUTTONS_OK_CANCEL;
else
buttons = GTK_BUTTONS_OK;
}
- if (
m_dialogS
tyle & wxICON_EXCLAMATION)
+ if (
s
tyle & wxICON_EXCLAMATION)
type = GTK_MESSAGE_WARNING;
type = GTK_MESSAGE_WARNING;
- else if (
m_dialogS
tyle & wxICON_ERROR)
+ else if (
s
tyle & wxICON_ERROR)
type = GTK_MESSAGE_ERROR;
type = GTK_MESSAGE_ERROR;
- else if (
m_dialogS
tyle & wxICON_INFORMATION)
+ else if (
s
tyle & wxICON_INFORMATION)
type = GTK_MESSAGE_INFO;
type = GTK_MESSAGE_INFO;
- else if (
m_dialogS
tyle & wxICON_QUESTION)
+ else if (
s
tyle & wxICON_QUESTION)
type = GTK_MESSAGE_QUESTION;
else
{
// GTK+ doesn't have a "typeless" msg box, so try to auto detect...
type = GTK_MESSAGE_QUESTION;
else
{
// GTK+ doesn't have a "typeless" msg box, so try to auto detect...
- type =
m_dialogS
tyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO;
+ type =
s
tyle & wxYES ? GTK_MESSAGE_QUESTION : GTK_MESSAGE_INFO;
}
m_widget = gtk_message_dialog_new(m_parent ?
}
m_widget = gtk_message_dialog_new(m_parent ?
@@
-79,24
+78,33
@@
wxMessageDialog::wxMessageDialog(wxWindow *parent,
if (m_caption != wxMessageBoxCaptionStr)
gtk_window_set_title(GTK_WINDOW(m_widget), wxGTK_CONV(m_caption));
if (m_caption != wxMessageBoxCaptionStr)
gtk_window_set_title(GTK_WINDOW(m_widget), wxGTK_CONV(m_caption));
- if (
m_dialogS
tyle & wxYES_NO)
+ if (
s
tyle & wxYES_NO)
{
{
- if (
m_dialogS
tyle & wxCANCEL)
+ if (
s
tyle & wxCANCEL)
gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
gtk_dialog_add_button(GTK_DIALOG(m_widget), GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
- if (
m_dialogS
tyle & wxNO_DEFAULT)
+ if (
s
tyle & 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);
}
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 (parent)
+ if (
m_
parent)
gtk_window_set_transient_for(GTK_WINDOW(m_widget),
GTK_WINDOW(m_parent->m_widget));
}
gtk_window_set_transient_for(GTK_WINDOW(m_widget),
GTK_WINDOW(m_parent->m_widget));
}
-
+
+wxMessageDialog::~wxMessageDialog()
+{
+}
+
int wxMessageDialog::ShowModal()
{
int wxMessageDialog::ShowModal()
{
+ // 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);
m_widget = NULL;
gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
gtk_widget_destroy(m_widget);
m_widget = NULL;
@@
-121,5
+129,4
@@
int wxMessageDialog::ShowModal()
}
}
-#endif // wxUSE_MSGDLG && defined(__WXGTK20__)
-
+#endif // wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)