Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/choice.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-30 07:34:30 +00:00
parent e031f1df56
commit b36e08d086
11 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/generic/dirctrlg.cpp
View File

@@ -30,6 +30,7 @@
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/cmndata.h"
#include "wx/choice.h"
#endif
#include "wx/module.h"
@@ -45,7 +46,6 @@
#include "wx/artprov.h"
#include "wx/mimetype.h"
#include "wx/image.h"
#include "wx/choice.h"
#if wxUSE_STATLINE
#include "wx/statline.h"
@@ -283,7 +283,7 @@ bool wxIsDriveAvailable(const wxString& dirName)
#ifdef __WATCOMC__
wxUnusedVar(dirName);
#else
if ( dirName.Len() == 3 && dirName[1u] == wxT(':') )
if ( dirName.length() == 3 && dirName[1u] == wxT(':') )
{
wxString dirNameLower(dirName.Lower());
// VS: always return true for removable media, since Win95 doesn't
@@ -343,7 +343,7 @@ bool wxIsDriveAvailable(const wxString& WXUNUSED_IN_WINCE(dirName))
// Check if this is a root directory and if so,
// whether the drive is available.
if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':'))
if (dirName.length() == 3 && dirName[(size_t)1] == wxT(':'))
{
wxString dirNameLower(dirName.Lower());
#if defined(__GNUWIN32__) && !(defined(__MINGW32_MAJOR_VERSION) && __MINGW32_MAJOR_VERSION >= 1)
@@ -988,12 +988,12 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
childPath.MakeLower();
#endif
if (childPath.Len() <= path2.Len())
if (childPath.length() <= path2.length())
{
wxString path3 = path2.Mid(0, childPath.Len());
wxString path3 = path2.Mid(0, childPath.length());
if (childPath == path3)
{
if (path3.Len() == path2.Len())
if (path3.length() == path2.length())
done = true;
else
done = false;