X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3bd8b1a48d542ae8737a985052febe9ae0a5d63..da6f998486f1070e205f2e0a54f22a1b67cb32a4:/src/gtk/dialog.cpp diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index a79ee902e2..98f08d7d6f 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -2,7 +2,6 @@ // Name: src/gtk/dialog.cpp // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,7 +18,7 @@ #include "wx/evtloop.h" #include "wx/scopedptr.h" -#include "wx/testing.h" +#include "wx/modalhook.h" #include #include "wx/gtk/private/gtk2-compat.h" @@ -35,9 +34,7 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop) void wxDialog::Init() { m_modalLoop = NULL; - m_returnCode = 0; m_modalShowing = false; - m_themeEnabled = true; } wxDialog::wxDialog( wxWindow *parent, @@ -133,7 +130,7 @@ realize_hook(GSignalInvocationHint*, unsigned, const GValue* param_values, void* int wxDialog::ShowModal() { - WX_TESTING_SHOW_MODAL_HOOK(); + WX_HOOK_MODAL_DIALOG(); wxASSERT_MSG( !IsModal(), "ShowModal() can't be called twice" );