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
This commit is contained in:
Vadim Zeitlin 2006-12-21 19:26:48 +00:00
parent 9a9b58229f
commit cc197ed421
4 changed files with 47 additions and 1 deletions

View File

@ -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

View File

@ -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; }

View File

@ -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"

View File

@ -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