X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab1ce969dfb27f5d366ee6a0de3ff2bc0205b56a..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/generic/filedlgg.cpp diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 2bbe652c8d..072c6072c6 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -31,13 +31,14 @@ #include "wx/msgdlg.h" #include "wx/bmpbuttn.h" #include "wx/checkbox.h" + #include "wx/choice.h" + #include "wx/stattext.h" + #include "wx/textctrl.h" + #include "wx/sizer.h" + #include "wx/filedlg.h" // wxFD_OPEN, wxFD_SAVE... #endif -#include "wx/textctrl.h" -#include "wx/choice.h" -#include "wx/stattext.h" #include "wx/longlong.h" -#include "wx/sizer.h" #include "wx/tokenzr.h" #include "wx/config.h" #include "wx/imaglist.h" @@ -45,7 +46,6 @@ #include "wx/artprov.h" #include "wx/filefn.h" #include "wx/file.h" // for wxS_IXXX constants only -#include "wx/filedlg.h" // wxFD_OPEN, wxFD_SAVE... #include "wx/generic/filedlgg.h" #include "wx/generic/dirctrlg.h" // for wxFileIconsTable @@ -733,7 +733,7 @@ void wxFileCtrl::GoToParentDir() { if (!IsTopMostDir(m_dirName)) { - size_t len = m_dirName.Len(); + size_t len = m_dirName.length(); if (wxEndsWithPathSeparator(m_dirName)) m_dirName.Remove( len-1, 1 ); wxString fname( wxFileNameFromPath(m_dirName) ); @@ -1027,7 +1027,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent, m_dir = wxFILE_SEP_PATH; } - size_t len = m_dir.Len(); + size_t len = m_dir.length(); if ((len > 1) && (wxEndsWithPathSeparator(m_dir))) m_dir.Remove( len-1, 1 ); @@ -1627,10 +1627,10 @@ void wxGenericFileDialog::UpdateControls() #endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__) } -#ifdef USE_GENERIC_FILEDIALOG +#ifdef wxUSE_GENERIC_FILEDIALOG IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog) -#endif // USE_GENERIC_FILEDIALOG +#endif // wxUSE_GENERIC_FILEDIALOG #endif // wxUSE_FILEDLG