X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d1214cd7298f63d03b8f3686524c5f227fcd242..11a23db53128bf244a089123b7fd27deb577a889:/src/gtk/colordlg.cpp?ds=sidebyside diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp index c6ac162f2f..781a2316e1 100644 --- a/src/gtk/colordlg.cpp +++ b/src/gtk/colordlg.cpp @@ -4,7 +4,6 @@ // Author: Vaclav Slavik // Modified by: // Created: 2004/06/04 -// RCS-ID: $Id$ // Copyright: (c) Vaclav Slavik, 2004 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,6 +18,7 @@ #if wxUSE_COLOURDLG #include "wx/colordlg.h" +#include "wx/modalhook.h" #ifndef WX_PRECOMP #include "wx/intl.h" @@ -27,6 +27,7 @@ #include #include "wx/gtk/private.h" #include "wx/gtk/private/gtk2-compat.h" +#include "wx/gtk/private/dialogcount.h" #if wxUSE_LIBHILDON #include @@ -82,8 +83,12 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) int wxColourDialog::ShowModal() { + WX_HOOK_MODAL_DIALOG(); + ColourDataToDialog(); + wxOpenModalDialogLocker modalLocker; + gint result = gtk_dialog_run(GTK_DIALOG(m_widget)); gtk_widget_hide(m_widget);