X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20380343684f83760933a77c826c2a371da5d375..345ff9c65b3ef17709785708b224dfcbf5135583:/src/gtk/filedlg.cpp diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index a472332a8b..ff7541c6b7 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -10,7 +10,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_FILEDLG +#if wxUSE_FILEDLG #include "wx/filedlg.h" @@ -145,12 +145,12 @@ static void extra_widget_size_request(GtkWidget*, GtkRequisition* req, wxWindow* } } -static void wxInsertChildInFileDialog(wxWindow* parent, wxWindow* child) +void wxFileDialog::AddChildGTK(wxWindowGTK* child) { g_signal_connect_after(child->m_widget, "size_request", G_CALLBACK(extra_widget_size_request), child); gtk_file_chooser_set_extra_widget( - GTK_FILE_CHOOSER(parent->m_widget), child->m_widget); + GTK_FILE_CHOOSER(m_widget), child->m_widget); } //----------------------------------------------------------------------------- @@ -173,7 +173,6 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, const wxString& name) : wxFileDialogBase() { - m_insertCallback = wxInsertChildInFileDialog; parent = GetParentForModalDialog(parent); if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName, @@ -321,8 +320,8 @@ int wxFileDialog::ShowModal() return wxDialog::ShowModal(); } -void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), +void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(sizeFlags)) { } @@ -336,7 +335,7 @@ void wxFileDialog::OnSize(wxSizeEvent&) wxString wxFileDialog::GetPath() const { wxFileName fn = m_fc.GetPath(); - + if (HasFdFlag(wxFD_SAVE)) { // add extension @@ -412,4 +411,4 @@ int wxFileDialog::GetFilterIndex() const return m_fc.GetFilterIndex(); } -#endif // wxUSE_FILEDLG +#endif // wxUSE_FILEDLG