X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66c59e2c54cd688d17a4bbed00050defe7ed12c7..e6ba38871f6cc5c02391c04e37e481d0428cef3f:/src/generic/colrdlgg.cpp?ds=sidebyside diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index ec97500ac8..a8dec5b490 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -16,7 +16,7 @@ #pragma hdrstop #endif -#if wxUSE_COLOURDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__)) +#if wxUSE_COLOURDLG #ifndef WX_PRECOMP #include "wx/utils.h" @@ -140,8 +140,9 @@ void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data) { - if ( !wxDialog::Create(parent, wxID_ANY, _("Choose colour"), - wxPoint(0,0), wxSize(900, 900)) ) + if ( !wxDialog::Create(GetParentForModalDialog(parent), wxID_ANY, + _("Choose colour"), + wxPoint(0, 0), wxSize(900, 900)) ) return false; if (data) @@ -580,4 +581,4 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event)) #endif // wxUSE_SLIDER -#endif // wxUSE_COLOURDLG && !defined(__WXGTK20__) +#endif // wxUSE_COLOURDLG