projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops, forgot to fix wxHtmlTag dtor
[wxWidgets.git]
/
src
/
gtk
/
dialog.cpp
diff --git
a/src/gtk/dialog.cpp
b/src/gtk/dialog.cpp
index b52338cef1e8e8829c87b05d864a7a5f4367e797..a4532f5d190afc47433eef16476d21759edb0779 100644
(file)
--- a/
src/gtk/dialog.cpp
+++ b/
src/gtk/dialog.cpp
@@
-632,7
+632,9
@@
int wxDialog::ShowModal()
return GetReturnCode();
}
return GetReturnCode();
}
- if ( !GetParent() )
+ // use the apps top level window as parent if none given unless explicitly
+ // forbidden
+ if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
{
wxWindow *parent = wxTheApp->GetTopWindow();
if ( parent && parent != this )
{
wxWindow *parent = wxTheApp->GetTopWindow();
if ( parent && parent != this )