Prevent unnecessary assert when someone tries to

   move the native file dialog.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/filedlg.h b/include/wx/gtk/filedlg.h
index c448dbb3bdefd4fab23fdbb20c0e2c33ddcf8c16..31b895da18ea97cbf909211d5622d10791306bc2 100644 (file)
--- a/include/wx/gtk/filedlg.h
+++ b/include/wx/gtk/filedlg.h
@@ -56,6 +56,13 @@ public:
 //private:
     bool m_destroyed_by_delete;
 
 //private:
     bool m_destroyed_by_delete;
 

+    // override this from wxTLW since the native
+    // form doesn't have any m_wxwindow
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
+

 private:
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_EVENT_TABLE()
 private:
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_EVENT_TABLE()

diff --git a/include/wx/gtk1/filedlg.h b/include/wx/gtk1/filedlg.h
index c448dbb3bdefd4fab23fdbb20c0e2c33ddcf8c16..31b895da18ea97cbf909211d5622d10791306bc2 100644 (file)
--- a/include/wx/gtk1/filedlg.h
+++ b/include/wx/gtk1/filedlg.h
@@ -56,6 +56,13 @@ public:
 //private:
     bool m_destroyed_by_delete;
 
 //private:
     bool m_destroyed_by_delete;
 

+    // override this from wxTLW since the native
+    // form doesn't have any m_wxwindow
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
+

 private:
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_EVENT_TABLE()
 private:
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
     DECLARE_EVENT_TABLE()

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 61925cde04bf84eb4764f15b1f8c91f54538b1ca..04040bd548ed0555849e2f6e55e728df38724953 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -267,6 +267,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__

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 61925cde04bf84eb4764f15b1f8c91f54538b1ca..04040bd548ed0555849e2f6e55e728df38724953 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -267,6 +267,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__