projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OpenGL for iPhone
[wxWidgets.git]
/
src
/
gtk1
/
dialog.cpp
diff --git
a/src/gtk1/dialog.cpp
b/src/gtk1/dialog.cpp
index a58dcb55dbf94fa45a902fbb627e0c35bc9f773d..540910d9dc035f9b00b5cb016fad385a4464b07b 100644
(file)
--- a/
src/gtk1/dialog.cpp
+++ b/
src/gtk1/dialog.cpp
@@
-15,9
+15,9
@@
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/frame.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/frame.h"
+ #include "wx/cursor.h"
#endif // WX_PRECOMP
#endif // WX_PRECOMP
-#include "wx/cursor.h"
#include "wx/evtloop.h"
#include <gdk/gdk.h>
#include "wx/evtloop.h"
#include <gdk/gdk.h>
@@
-141,7
+141,7
@@
void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
cancelEvent.SetEventObject( this );
wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
cancelEvent.SetEventObject( this );
-
GetEventHandler()->Process
Event(cancelEvent);
+
HandleWindow
Event(cancelEvent);
s_closing.DeleteObject(this);
}
s_closing.DeleteObject(this);
}
@@
-162,6
+162,9
@@
bool wxDialog::Show( bool show )
GtkOnSize( m_x, m_y, m_width, m_height );
}
GtkOnSize( m_x, m_y, m_width, m_height );
}
+ if (show && CanDoLayoutAdaptation())
+ DoLayoutAdaptation();
+
bool ret = wxWindow::Show( show );
if (show) InitDialog();
bool ret = wxWindow::Show( show );
if (show) InitDialog();
@@
-191,11
+194,8
@@
int wxDialog::ShowModal()
// forbidden
if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
{
// forbidden
if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
{
- wxWindow *parent = wxTheApp->GetTopWindow();
- if ( parent &&
- parent != this &&
- parent->IsBeingDeleted() &&
- !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
+ wxWindow * const parent = GetParentForModalDialog();
+ if ( parent )
{
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) );