Rebake for 2.6.2

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

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 61925cde04bf84eb4764f15b1f8c91f54538b1ca..1293d32fd3e1ff115736fad315f41d0ce1a27894 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -39,7 +39,6 @@
 //-----------------------------------------------------------------------------
 
 extern void wxapp_install_idle_handler();
 //-----------------------------------------------------------------------------
 
 extern void wxapp_install_idle_handler();

-extern bool g_isIdle;

 
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button
 
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button


@@ -156,7 +155,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         GtkFileChooserAction gtk_action;
         GtkWindow* gtk_parent = NULL;
         if (parent)
         GtkFileChooserAction gtk_action;
         GtkWindow* gtk_parent = NULL;
         if (parent)

-            gtk_parent = GTK_WINDOW(parent->m_widget);
+            gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );

 
         gchar* ok_btn_stock;
         if ( style & wxSAVE )
 
         gchar* ok_btn_stock;
         if ( style & wxSAVE )


@@ -267,6 +266,14 @@ bool wxFileDialog::Show( bool show )
         return wxGenericFileDialog::Show( show );
 }
 
         return wxGenericFileDialog::Show( show );
 }
 

+void wxFileDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags )
+{
+    if (!m_wxwindow)
+        return;
+    else
+        wxGenericFileDialog::DoSetSize( x, y, width, height, sizeFlags );
+}
+

 wxString wxFileDialog::GetPath() const
 {
 #ifdef __WXGTK24__
 wxString wxFileDialog::GetPath() const
 {
 #ifdef __WXGTK24__