restored (as deprecated) accidentally removed wx{Dir|File}Dialog::Get/SetStyle()

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

diff --git a/docs/changes.txt b/docs/changes.txt
index ac1a417acdc3be4b7471757d10bf0ca6c89adcad..3820e02e630f8f9eff4ff036ec2c202dcb20621b 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -68,7 +68,8 @@ Deprecated methods since 2.6.x and their replacements
   wxFS_SEEKABLE flags is deprecated. You can still seek, but use the flag.
 - Constructor wxZipInputStream(const wxString& archive, const wxString& file)
   deprecated in favour of wxFileSystem (other zip ctors are not deprecated).
-
+- wx{Dir|File}Dialog::{Set|Get}Style deprecated in favour of the generic
+  wxWindow::{Set|Get}WindowStyle()
 
 
 Major new features in 2.8 release

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 9a7477102baab70b0a4109fe3f620be5cb038d03..a5b0cba0217c5323409ba648374c4c3f3dc3910c 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -73,6 +73,12 @@ public:
         return true;
     }
 
+#if WXWIN_COMPATIBILITY_2_6
+
+    wxDEPRECATED( long GetStyle() const );
+    wxDEPRECATED( void SetStyle(long style) );
+
+#endif  // WXWIN_COMPATIBILITY_2_6
 
     virtual void SetMessage(const wxString& message) { m_message = message; }
     virtual void SetPath(const wxString& path) { m_path = path; }

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 8a16ded2628538f1ec8cc4a430985e00ccefeff6..ac4659db992d779b888c614a6f25a7fefdbe42e8 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -129,6 +129,14 @@ public:
                                            wxArrayString& filters) );
 #endif // WXWIN_COMPATIBILITY_2_4
 
+#if WXWIN_COMPATIBILITY_2_6
+
+    wxDEPRECATED( long GetStyle() const );
+    wxDEPRECATED( void SetStyle(long style) );
+
+#endif  // WXWIN_COMPATIBILITY_2_6
+
+
     // Append first extension to filePath from a ';' separated extensionList
     // if filePath = "path/foo.bar" just return it as is
     // if filePath = "foo[.]" and extensionList = "*.jpg;*.png" return "foo.jpg"

diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp
index ecaa62b0a028a7e34e2b08c1228a4f47846d2619..307c1ffd8a6a78d2d58018561469bfa8384152e9 100644 (file)
--- a/src/common/fldlgcmn.cpp
+++ b/src/common/fldlgcmn.cpp
@@ -113,6 +113,19 @@ int wxFileDialogBase::ParseWildcard(const wxString& filterStr,
 }
 #endif // WXWIN_COMPATIBILITY_2_4
 
+#if WXWIN_COMPATIBILITY_2_6
+long wxFileDialogBase::GetStyle() const
+{
+    return GetWindowStyle();
+}
+
+void wxFileDialogBase::SetStyle(long style)
+{
+    SetWindowStyle(style);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+
 wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
                                            const wxString &extensionList)
 {
@@ -313,4 +326,22 @@ WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
     return wxDefaultFileSelector(false, what, extension, default_name, parent);
 }
 
+
+//----------------------------------------------------------------------------
+// wxDirDialogBase
+//----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_6
+long wxDirDialogBase::GetStyle() const
+{
+    return GetWindowStyle();
+}
+
+void wxDirDialogBase::SetStyle(long style)
+{
+    SetWindowStyle(style);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+
 #endif // wxUSE_FILEDLG