AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cocoa/choice.mm
View File

@ -13,10 +13,11 @@
#if wxUSE_CHOICE
#include "wx/choice.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/app.h"
#include "wx/choice.h"
#include "wx/arrstr.h"
#endif //WX_PRECOMP

6
src/common/choiccmn.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: common/choiccmn.cpp
// Name: src/common/choiccmn.cpp
// Purpose: common (to all ports) wxChoice functions
// Author: Vadim Zeitlin
// Modified by:
@ -26,8 +26,9 @@
#if wxUSE_CHOICE
#include "wx/choice.h"
#ifndef WX_PRECOMP
#include "wx/choice.h"
#endif
const wxChar wxChoiceNameStr[] = wxT("choice");
@ -52,4 +53,3 @@ void wxChoiceBase::Command(wxCommandEvent& event)
}
#endif // wxUSE_CHOICE

2
src/generic/choicbkg.cpp
View File

@ -30,9 +30,9 @@
#ifndef WX_PRECOMP
#include "wx/settings.h"
#include "wx/choice.h"
#endif
#include "wx/choice.h"
#include "wx/imaglist.h"
#include "wx/sizer.h"

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;

6
src/generic/filedlgg.cpp
View File

@ -31,10 +31,10 @@
#include "wx/msgdlg.h"
#include "wx/bmpbuttn.h"
#include "wx/checkbox.h"
#include "wx/choice.h"
#endif
#include "wx/textctrl.h"
#include "wx/choice.h"
#include "wx/stattext.h"
#include "wx/longlong.h"
#include "wx/sizer.h"
@ -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 );

3
src/msw/choice.cpp
View File

@ -26,8 +26,9 @@
#if wxUSE_CHOICE && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
#include "wx/choice.h"
#ifndef WX_PRECOMP
#include "wx/choice.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/brush.h"

3
src/msw/wince/choicece.cpp
View File

@ -26,8 +26,9 @@
#if wxUSE_CHOICE && defined(__SMARTPHONE__) && defined(__WXWINCE__)
#include "wx/choice.h"
#ifndef WX_PRECOMP
#include "wx/choice.h"
#include <commctrl.h>
#include "wx/msw/missing.h"
#include "wx/msw/winundef.h"

3
src/os2/choice.cpp
View File

@ -14,8 +14,9 @@
#if wxUSE_CHOICE
#include "wx/choice.h"
#ifndef WX_PRECOMP
#include "wx/choice.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/settings.h"

3
src/palmos/choice.cpp
View File

@ -25,8 +25,9 @@
#if wxUSE_CHOICE
#include "wx/choice.h"
#ifndef WX_PRECOMP
#include "wx/choice.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/brush.h"

5
src/univ/choice.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: univ/choice.cpp
// Name: src/univ/choice.cpp
// Purpose: wxChoice implementation
// Author: Vadim Zeitlin
// Modified by:
@ -25,8 +25,9 @@
#if wxUSE_CHOICE
#include "wx/choice.h"
#ifndef WX_PRECOMP
#include "wx/choice.h"
#include "wx/arrstr.h"
#endif

7
src/xrc/xh_choic.cpp
View File

@ -15,16 +15,15 @@
#pragma hdrstop
#endif
#if wxUSE_XRC
#if wxUSE_XRC && wxUSE_CHOICE
#include "wx/xrc/xh_choic.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/choice.h"
#endif
#include "wx/choice.h"
IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler)
wxChoiceXmlHandler::wxChoiceXmlHandler()
@ -96,4 +95,4 @@ bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
(m_insideBox && node->GetName() == wxT("item")));
}
#endif // wxUSE_XRC
#endif // wxUSE_XRC && wxUSE_CHOICE