Fix stc doxygen warnings and regen stc files.

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

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 685411ea48460aec909406d887728764e4a60466..98f08d7d6facc8eb50855ddb951462061a41c4ca 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -1,193 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/gtk/dialog.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/dialog.h"
 
 #include "wx/dialog.h"

-#include "wx/frame.h"
-#include "wx/app.h"
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "wx/gtk/win_gtk.h"
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern wxList wxPendingDelete;
-
-//-----------------------------------------------------------------------------
-// "delete_event"
-//-----------------------------------------------------------------------------
-
-bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-    win->Close();
-
-    return TRUE;
-}
-
-//-----------------------------------------------------------------------------
-// "size_allocate"
-//-----------------------------------------------------------------------------

 
 

-static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxDialog *win )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->HasVMT()) return;
-
-/*
-    printf( "OnDialogResize from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-   if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-   {
-       win->m_sizeSet = FALSE;
-       win->m_width = alloc->width;
-       win->m_height = alloc->height;
-   }
-}
-
-//-----------------------------------------------------------------------------
-// "configure_event"
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/cursor.h"
+#endif // WX_PRECOMP

 
 

-static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->HasVMT()) return FALSE;
-
-    win->m_x = event->x;
-    win->m_y = event->y;
-
-    wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
-    mevent.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( mevent );
-
-    return FALSE;
-}
+#include "wx/evtloop.h"

 
 

-//-----------------------------------------------------------------------------
-// "realize" from m_widget
-//-----------------------------------------------------------------------------
+#include "wx/scopedptr.h"
+#include "wx/modalhook.h"

 
 

-/* we cannot MWM hints and icons before the widget has been realized, 
-   so we do this directly after realization */
+#include <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/dialogcount.h"

 
 

-static gint 
-gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)

 
 

-    /* reset the icon */
-    if (win->m_icon != wxNullIcon)
-    {
-        wxIcon icon( win->m_icon );
-        win->m_icon = wxNullIcon;
-       win->SetIcon( icon );
-    }
-    
-    return FALSE;
-}
-    
-//-----------------------------------------------------------------------------
-// "map" from m_widget
-//-----------------------------------------------------------------------------

 
 

-static gint 
-gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
-{
-    /* I haven''t been able to set the position of
-       the dialog before it is shown, so I do it here */
-    gtk_widget_set_uposition( widget, win->m_x, win->m_y );
-    
-    /* all this is for Motif Window Manager "hints" and is supposed to be
-       recognized by other WM as well. not tested. */
-    long decor = (long) GDK_DECOR_BORDER ;
-    long func = (long) GDK_FUNC_MOVE ;
-    
-    if ((win->m_windowStyle & wxCAPTION) != 0)
-       decor |= GDK_DECOR_TITLE;
-    if ((win->m_windowStyle & wxSYSTEM_MENU) != 0)
-    {
-       decor |= GDK_DECOR_MENU;
-       func |= GDK_FUNC_CLOSE;
-    }
-    if ((win->m_windowStyle & wxMINIMIZE_BOX) != 0)
-    {
-       func |= GDK_FUNC_MINIMIZE;
-       decor |= GDK_DECOR_MINIMIZE;
-    }
-    if ((win->m_windowStyle & wxMAXIMIZE_BOX) != 0)
-    {
-       decor |= GDK_DECOR_MAXIMIZE;
-       func |= GDK_FUNC_MAXIMIZE;           
-    }
-    if ((win->m_windowStyle & wxRESIZE_BORDER) != 0)
-    {
-       func |= GDK_FUNC_RESIZE;
-       decor |= GDK_DECOR_RESIZEH;
-    }
-    gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
-    gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
-      
-    /* GTK's shrinking/growing policy */
-    if ((win->m_windowStyle & wxRESIZE_BORDER) == 0)
-        gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
-    else
-        gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
-    
-    return FALSE;
-}
-    

 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxDialog,wxPanel)
-    EVT_BUTTON  (wxID_OK,       wxDialog::OnOK)
-    EVT_BUTTON  (wxID_CANCEL,   wxDialog::OnCancel)
-    EVT_BUTTON  (wxID_APPLY,    wxDialog::OnApply)
-    EVT_SIZE    (wxDialog::OnSize)
-    EVT_CLOSE   (wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxPanel)
-

 void wxDialog::Init()
 {
 void wxDialog::Init()
 {

-    m_sizeSet = FALSE;
-    m_modalShowing = FALSE;
+    m_modalLoop = NULL;
+    m_modalShowing = false;

 }
 
 wxDialog::wxDialog( wxWindow *parent,
 }
 
 wxDialog::wxDialog( wxWindow *parent,


@@ -197,7 +44,7 @@ wxDialog::wxDialog( wxWindow *parent,
 {
     Init();
 
 {
     Init();
 

-    Create( parent, id, title, pos, size, style, name );
+    (void)Create( parent, id, title, pos, size, style, name );

 }
 
 bool wxDialog::Create( wxWindow *parent,
 }
 
 bool wxDialog::Create( wxWindow *parent,


@@ -205,361 +52,138 @@ bool wxDialog::Create( wxWindow *parent,
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {

-    wxTopLevelWindows.Append( this );
-
-    m_needParent = FALSE;
-
-    PreCreation( parent, id, pos, size, style, name );
-
-    m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-    GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
-
-    gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL);
-
-    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
-        GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this );
-
-    m_wxwindow = gtk_myfixed_new();
-    gtk_widget_show( m_wxwindow );
-    GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
-
-    gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
-
-    SetTitle( title );
-
-    if (m_parent) m_parent->AddChild( this );
-
-    PostCreation();
-
-    /*  we cannot set MWM hints  before the widget has
-        been realized, so we do this directly after realization */
-    gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
-                       GTK_SIGNAL_FUNC(gtk_dialog_realized_callback), (gpointer) this );
-
-    /* we set the position of the window after the map event. setting it
-       before has no effect (with KWM) */
-    gtk_signal_connect( GTK_OBJECT(m_widget), "map",
-                       GTK_SIGNAL_FUNC(gtk_dialog_map_callback), (gpointer) this );
-
-    /* the user resized the frame by dragging etc. */
-    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
-        GTK_SIGNAL_FUNC(gtk_dialog_size_callback), (gpointer)this );
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
-        GTK_SIGNAL_FUNC(gtk_dialog_configure_callback), (gpointer)this );
+    // all dialogs should have tab traversal enabled
+    style |= wxTAB_TRAVERSAL;

 
 

-    return TRUE;
+    return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);

 }
 
 }
 

-wxDialog::~wxDialog()
+bool wxDialog::Show( bool show )

 {
 {

-    wxTopLevelWindows.DeleteObject( this );
-
-    if (wxTheApp->GetTopWindow() == this)
+    if (!show && IsModal())

     {
     {

-        wxTheApp->SetTopWindow( (wxWindow*) NULL );
+        EndModal( wxID_CANCEL );

     }
 
     }
 

-    if (wxTopLevelWindows.Number() == 0)
-    {
-        wxTheApp->ExitMainLoop();
-    }
-}
+    if (show && CanDoLayoutAdaptation())
+        DoLayoutAdaptation();

 
 

-void wxDialog::SetTitle( const wxString& title )
-{
-    m_title = title;
-    if (m_title.IsNull()) m_title = _T("");
-    gtk_window_set_title( GTK_WINDOW(m_widget), m_title.mbc_str() );
-}
+    bool ret = wxDialogBase::Show(show);

 
 

-wxString wxDialog::GetTitle() const
-{
-    return (wxString&)m_title;
-}
+    if (show)
+        InitDialog();

 
 

-void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) )
-{
-    if (Validate()) TransferDataFromWindow();
+    return ret;

 }
 
 }
 

-void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
+wxDialog::~wxDialog()

 {
 {

-    if (IsModal())
-    {
+    // if the dialog is modal, this will end its event loop
+    if ( IsModal() )

         EndModal(wxID_CANCEL);
         EndModal(wxID_CANCEL);

-    }
-    else
-    {
-        SetReturnCode(wxID_CANCEL);
-        this->Show(FALSE);
-    }

 }
 
 }
 

-void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
-{
-    if ( Validate() && TransferDataFromWindow())
-    {
-        if (IsModal())
-        {
-            EndModal(wxID_OK);
-        }
-        else
-        {
-            SetReturnCode(wxID_OK);
-            this->Show(FALSE);
-        }
-    }
-}
-
-void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
-    // yes
-}
-
-void wxDialog::OnCloseWindow(wxCloseEvent& event)
-{
-    // We'll send a Cancel message by default,
-    // which may close the dialog.
-    // Check for looping if the Cancel event handler calls Close().
-
-    // Note that if a cancel button and handler aren't present in the dialog,
-    // nothing will happen when you close the dialog via the window manager, or
-    // via Close().
-    // We wouldn't want to destroy the dialog by default, since the dialog may have been
-    // created on the stack.
-    // However, this does mean that calling dialog->Close() won't delete the dialog
-    // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be
-    // sure to destroy the dialog.
-    // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
-
-    static wxList s_closing;
-
-    if (s_closing.Member(this))
-        return;   // no loops
-
-    s_closing.Append(this);
-
-    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
-    cancelEvent.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(cancelEvent);
-    s_closing.DeleteObject(this);
-}
-
-bool wxDialog::Destroy()
+bool wxDialog::IsModal() const

 {
 {

-    if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
-
-    return TRUE;
+    return m_modalShowing;

 }
 
 }
 

-void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
-{
-    wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
-
-    if (GetAutoLayout())
-    {
-        Layout();
-    }
-    else
-    {
-        /* no child: go out ! */
-        if (!GetChildren().First()) return;
-
-        /* do we have exactly one child? */
-        wxWindow *child = (wxWindow *) NULL;
-        for(wxNode *node = GetChildren().First(); node; node = node->Next())
+// Workaround for Ubuntu overlay scrollbar, which adds our GtkWindow to a
+// private window group in a GtkScrollbar realize handler. This breaks the grab
+// done by gtk_window_set_modal(), and allows menus and toolbars in the parent
+// frame to remain active. So, we install an emission hook on the "realize"
+// signal while showing a modal dialog. For any realize on a GtkScrollbar,
+// we check the top level parent to see if it has an explicitly set window
+// group that is not the same as its transient parent. If we find this, we
+// put the top level back in the same window group as its transient parent, and
+// re-add the grab.
+// Ubuntu 12.04 and 12.10 are known to have this problem.
+
+// need 2.10 for gtk_window_get_group()
+#if GTK_CHECK_VERSION(2,10,0)
+extern "C" {
+static gboolean
+realize_hook(GSignalInvocationHint*, unsigned, const GValue* param_values, void*)
+{
+    void* p = g_value_peek_pointer(param_values);
+    if (GTK_IS_SCROLLBAR(p))
+    {
+        GtkWindow* toplevel = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(p)));
+        GtkWindow* transient_parent = gtk_window_get_transient_for(toplevel);
+        if (transient_parent && gtk_window_has_group(toplevel))

         {
         {

-            wxWindow *win = (wxWindow *)node->Data();
-            if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog))
+            GtkWindowGroup* group = gtk_window_get_group(toplevel);
+            GtkWindowGroup* group_parent = gtk_window_get_group(transient_parent);
+            if (group != group_parent)

             {
             {

-                /* it's the second one: do nothing */
-                if (child) return;
-                child = win;
+                gtk_window_group_add_window(group_parent, toplevel);
+                gtk_grab_add(GTK_WIDGET(toplevel));

             }
         }
             }
         }

-
-        /* yes: set it's size to fill all the frame */
-        int client_x, client_y;
-        GetClientSize( &client_x, &client_y );
-        child->SetSize( 1, 1, client_x-2, client_y);

     }
     }

+    return true;

 }
 }

-
-void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
-{
-    wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
-    wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid dialog") );
-
-    if (m_resizing) return; /* I don't like recursions */
-    m_resizing = TRUE;
-
-    int old_x = m_x;
-    int old_y = m_y;
-    int old_width = m_width;
-    int old_height = m_height;
-
-    if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
-    {
-        if (x != -1) m_x = x;
-        if (y != -1) m_y = y;
-        if (width != -1) m_width = width;
-        if (height != -1) m_height = height;
-    }
-    else
-    {
-        m_x = x;
-        m_y = y;
-        m_width = width;
-        m_height = height;
-    }
-
-    if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
-    {
-        if (width == -1) m_width = 80;
-    }
-
-    if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
-    {
-       if (height == -1) m_height = 26;
-    }
-
-    if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
-    if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
-    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
-    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
-
-    if ((m_x != -1) || (m_y != -1))
-    {
-        if ((m_x != old_x) || (m_y != old_y))
-       {
-           /* we set the position here and when showing the dialog
-              for the first time in idle time */
-            gtk_widget_set_uposition( m_widget, m_x, m_y );
-       }
-    }
-
-    if ((m_width != old_width) || (m_height != old_height))
-    {
-        /* actual resizing is deferred to GtkOnSize in idle time and
-          when showing the dialog */
-        m_sizeSet = FALSE;
-    }
-
-    m_resizing = FALSE;

 }
 }

+#endif // GTK 2.10

 
 

-void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
-{
-    // due to a bug in gtk, x,y are always 0
-    // m_x = x;
-    // m_y = y;
-
-    if ((m_height == height) && (m_width == width) && (m_sizeSet)) return;
-    if (!m_wxwindow) return;
-
-    m_width = width;
-    m_height = height;
-
-    if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
-    if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
-    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
-    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
-
-    /* we actually set the size of a frame here and no-where else */
-    gtk_widget_set_usize( m_widget, m_width, m_height );
-
-    m_sizeSet = TRUE;
-
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-}
-
-void wxDialog::Centre( int direction )
+int wxDialog::ShowModal()

 {
 {

-    wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
-
-    int x = 0;
-    int y = 0;
+    WX_HOOK_MODAL_DIALOG();

 
 

-    if ((direction & wxHORIZONTAL) == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
-    if ((direction & wxVERTICAL) == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
+    wxASSERT_MSG( !IsModal(), "ShowModal() can't be called twice" );

 
 

-    Move( x, y );
-}
-
-void wxDialog::OnInternalIdle()
-{
-    if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
-        GtkOnSize( m_x, m_y, m_width, m_height );
-}
+    // release the mouse if it's currently captured as the window having it
+    // will be disabled when this dialog is shown -- but will still keep the
+    // capture making it impossible to do anything in the modal dialog itself
+    wxWindow * const win = wxWindow::GetCapture();
+    if ( win )
+        win->GTKReleaseMouseAndNotify();

 
 

-bool wxDialog::Show( bool show )
-{
-    if (!show && IsModal())
+    wxWindow * const parent = GetParentForModalDialog();
+    if ( parent )

     {
     {

-        EndModal( wxID_CANCEL );
+        gtk_window_set_transient_for( GTK_WINDOW(m_widget),
+                                      GTK_WINDOW(parent->m_widget) );

     }
 
     }
 

-    if (show && !m_sizeSet)
-    {
-        /* by calling GtkOnSize here, we don't have to call
-           either after showing the frame, which would entail
-           much ugly flicker nor from within the size_allocate
-           handler, because GTK 1.1.X forbids that. */
-
-        GtkOnSize( m_x, m_y, m_width, m_height );
-    }
+    wxBusyCursorSuspender cs; // temporarily suppress the busy cursor

 
 

-    if (show != m_isShown)
+#if GTK_CHECK_VERSION(2,10,0)
+    unsigned sigId = 0;
+    gulong hookId = 0;
+#ifndef __WXGTK3__
+    // Ubuntu overlay scrollbar uses at least GTK 2.24
+    if (gtk_check_version(2,24,0) == NULL)
+#endif

     {
     {

-        if (show)
-       {
-           gtk_widget_show( m_widget );
-       }
-        else
-            gtk_widget_hide( m_widget );
-           
-        m_isShown = show;
+        sigId = g_signal_lookup("realize", GTK_TYPE_WIDGET);
+        hookId = g_signal_add_emission_hook(sigId, 0, realize_hook, NULL, NULL);

     }
     }

+#endif

 
 

-    if (show) InitDialog();
+    Show( true );

 
 

-    return TRUE;
-}
+    m_modalShowing = true;

 
 

-bool wxDialog::IsModal() const
-{
-    return m_modalShowing;
-}
+    wxOpenModalDialogLocker modalLock;

 
 

-void wxDialog::SetModal( bool WXUNUSED(flag) )
-{
-/*
-  if (flag)
-    m_windowStyle |= wxDIALOG_MODAL;
-  else
-    if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
-*/
-    wxFAIL_MSG( _T("wxDialog:SetModal obsolete now") );
-}
+    // NOTE: gtk_window_set_modal internally calls gtk_grab_add() !
+    gtk_window_set_modal(GTK_WINDOW(m_widget), TRUE);

 
 

-int wxDialog::ShowModal()
-{
-    if (IsModal())
+    // Run modal dialog event loop.

     {
     {

-       wxFAIL_MSG( _T("wxDialog:ShowModal called twice") );
-       return GetReturnCode();
+        wxGUIEventLoopTiedPtr modal(&m_modalLoop, new wxGUIEventLoop());
+        m_modalLoop->Run();

     }
 
     }
 

-    Show( TRUE );
-
-    m_modalShowing = TRUE;
+#if GTK_CHECK_VERSION(2,10,0)
+    if (sigId)
+        g_signal_remove_emission_hook(sigId, hookId);
+#endif

 
 

-    gtk_grab_add( m_widget );
-    gtk_main();
-    gtk_grab_remove( m_widget );
+    gtk_window_set_modal(GTK_WINDOW(m_widget), FALSE);

 
     return GetReturnCode();
 }
 
     return GetReturnCode();
 }


@@ -570,30 +194,16 @@ void wxDialog::EndModal( int retCode )
 
     if (!IsModal())
     {
 
     if (!IsModal())
     {

-        wxFAIL_MSG( _T("wxDialog:EndModal called twice") );
+        wxFAIL_MSG( "either wxDialog:EndModal called twice or ShowModal wasn't called" );

         return;
     }
 
         return;
     }
 

-    m_modalShowing = FALSE;
-
-    gtk_main_quit();
-
-    Show( FALSE );
-}
-
-void wxDialog::InitDialog()
-{
-    wxWindow::InitDialog();
-}
-
-void wxDialog::SetIcon( const wxIcon &icon )
-{
-    m_icon = icon;
-    if (!icon.Ok()) return;
+    m_modalShowing = false;

 
 

-    wxMask *mask = icon.GetMask();
-    GdkBitmap *bm = (GdkBitmap *) NULL;
-    if (mask) bm = mask->GetBitmap();
+    // Ensure Exit() is only called once. The dialog's event loop may be terminated
+    // externally due to an uncaught exception.
+    if (m_modalLoop && m_modalLoop->IsRunning())
+        m_modalLoop->Exit();

 
 

-    gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
+    Show( false );

 }
 }