Fix stc doxygen warnings and regen stc files.

[wxWidgets.git] / src / gtk / colordlg.cpp

diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp
index c6ac162f2fc934bdb89a946012b6851a7e8ef4ee..781a2316e1e8c68408604b4b0e70205c02e5573f 100644 (file)
--- a/src/gtk/colordlg.cpp
+++ b/src/gtk/colordlg.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004/06/04
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004/06/04

-// RCS-ID:      $Id$

 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -19,6 +18,7 @@
 #if wxUSE_COLOURDLG
 
 #include "wx/colordlg.h"
 #if wxUSE_COLOURDLG
 
 #include "wx/colordlg.h"

+#include "wx/modalhook.h"

 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"


@@ -27,6 +27,7 @@
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/gtk2-compat.h"
 #include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/gtk2-compat.h"

+#include "wx/gtk/private/dialogcount.h"

 
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-color-selector.h>
 
 #if wxUSE_LIBHILDON
     #include <hildon-widgets/hildon-color-selector.h>


@@ -82,8 +83,12 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
 
 int wxColourDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     ColourDataToDialog();
 
     ColourDataToDialog();
 

+    wxOpenModalDialogLocker modalLocker;
+

     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
     gtk_widget_hide(m_widget);
 
     gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
     gtk_widget_hide(m_widget);