reorganized wxBitmap/wxBitmapHandler classes to use wxBitmapType instead of "long...

[wxWidgets.git] / src / gtk / filedlg.cpp

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index d0d224b110e86312b2ab4cb247867ad358e5ad64..f7f6d51fb77739fe4a10cd91c5e5b3533c23eb6b 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -80,7 +80,7 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject(dialog);

-    dialog->GetEventHandler()->ProcessEvent(event);
+    dialog->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


@@ -96,7 +96,7 @@ gtk_filedialog_cancel_callback(GtkWidget * WXUNUSED(w), wxFileDialog *dialog)
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     event.SetEventObject(dialog);
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     event.SetEventObject(dialog);

-    dialog->GetEventHandler()->ProcessEvent(event);
+    dialog->HandleWindowEvent(event);

 }
 
 static void gtk_filedialog_response_callback(GtkWidget *w,
 }
 
 static void gtk_filedialog_response_callback(GtkWidget *w,


@@ -131,6 +131,11 @@ static void gtk_filedialog_update_preview_callback(GtkFileChooser *chooser,
 
 } // extern "C"
 
 
 } // extern "C"
 

+static void wxInsertChildInFileDialog(wxWindow* WXUNUSED(parent),
+                                      wxWindow* WXUNUSED(child))
+{
+}
+

 
 //-----------------------------------------------------------------------------
 // wxFileDialog
 
 //-----------------------------------------------------------------------------
 // wxFileDialog


@@ -151,6 +156,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                            const wxString& name)
     : wxFileDialogBase()
 {
                            const wxString& name)
     : wxFileDialogBase()
 {

+    m_insertCallback = wxInsertChildInFileDialog;

     parent = GetParentForModalDialog(parent);
     
     if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName,
     parent = GetParentForModalDialog(parent);
     
     if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFileName,


@@ -276,19 +282,27 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     }
 }
 
     }
 }
 

-void wxFileDialog::OnFakeOk( wxCommandEvent &event )
+
+void wxFileDialog::OnFakeOk(wxCommandEvent& WXUNUSED(event))

 {
     EndDialog(wxID_OK);
 }
 
 int wxFileDialog::ShowModal()
 {
 {
     EndDialog(wxID_OK);
 }
 
 int wxFileDialog::ShowModal()
 {

-    return wxDialog::ShowModal();
-}
+    if (CreateExtraControl())
+    {
+        GtkWidget *control = m_extraControl->m_widget;

 
 

-bool wxFileDialog::Show( bool show )
-{
-    return wxDialog::Show( show );
+        // see wxNotebook::InsertPage() for explaination
+        // why gtk_widget_unparent() is not used here
+        control->parent = NULL;
+
+        gtk_widget_show(control);
+        gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(m_widget), control);
+    }
+
+    return wxDialog::ShowModal();

 }
 
 void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y), 
 }
 
 void wxFileDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),