/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.cpp
+// Name: src/gtk1/dialog.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dialog.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/dialog.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/cursor.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/frame.h"
+ #include "wx/cursor.h"
+#endif // WX_PRECOMP
+
+#include "wx/evtloop.h"
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk1/win_gtk.h"
//-----------------------------------------------------------------------------
// global data
EVT_CLOSE (wxDialog::OnCloseWindow)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
-
void wxDialog::Init()
{
m_returnCode = 0;
wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
cancelEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(cancelEvent);
+ HandleWindowEvent(cancelEvent);
s_closing.DeleteObject(this);
}
GtkOnSize( m_x, m_y, m_width, m_height );
}
+ if (show && CanDoLayoutAdaptation())
+ DoLayoutAdaptation();
+
bool ret = wxWindow::Show( show );
if (show) InitDialog();
// use the apps top level window as parent if none given unless explicitly
// forbidden
- if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
+ wxWindow * const parent = GetParentForModalDialog();
+ if ( parent )
{
- wxWindow *parent = wxTheApp->GetTopWindow();
- if ( parent &&
- parent != this &&
- parent->IsBeingDeleted() &&
- !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
- {
- m_parent = parent;
- gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) );
- }
+ m_parent = parent;
+ gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) );
}
wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
Show( true );
- SetFocus();
-
m_modalShowing = true;
g_openDialogs++;
gtk_grab_add( m_widget );
- gtk_main();
+
+ wxEventLoop().Run();
+
gtk_grab_remove( m_widget );
g_openDialogs--;