From df69528b7eacc7c74f31879e761c804e470d12f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 20 Jun 2006 10:24:07 +0000 Subject: [PATCH] Include wx/hashmap.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/hashmap.h | 3 +-- include/wx/wx.h | 1 + src/common/artprov.cpp | 2 +- src/common/hashmap.cpp | 4 ++-- src/common/intl.cpp | 6 +++--- src/common/strconv.cpp | 2 +- src/common/xpmdecod.cpp | 2 +- src/mgl/cursor.cpp | 2 +- src/motif/timer.cpp | 3 +-- src/msw/dde.cpp | 8 ++++---- src/msw/timer.cpp | 3 +-- src/msw/volume.cpp | 4 ++-- src/palmos/timer.cpp | 3 +-- src/palmos/volume.cpp | 3 +-- 14 files changed, 21 insertions(+), 25 deletions(-) diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index b6ff1455e2..abcd5c36c9 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: hashmap.h +// Name: wx/hashmap.h // Purpose: wxHashMap class // Author: Mattia Barbon // Modified by: @@ -708,4 +708,3 @@ WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual, #endif // _WX_HASHMAP_H_ - diff --git a/include/wx/wx.h b/include/wx/wx.h index 99aabf12bb..53ce696f50 100644 --- a/include/wx/wx.h +++ b/include/wx/wx.h @@ -18,6 +18,7 @@ #include "wx/list.h" #include "wx/hash.h" #include "wx/string.h" +#include "wx/hashmap.h" #include "wx/arrstr.h" #include "wx/intl.h" #include "wx/log.h" diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp index 5d3ab8655e..d97e28b455 100644 --- a/src/common/artprov.cpp +++ b/src/common/artprov.cpp @@ -23,10 +23,10 @@ #ifndef WX_PRECOMP #include "wx/list.h" #include "wx/log.h" + #include "wx/hashmap.h" #endif #include "wx/artprov.h" -#include "wx/hashmap.h" #include "wx/module.h" #if wxUSE_IMAGE diff --git a/src/common/hashmap.cpp b/src/common/hashmap.cpp index d5b3229b74..6612272118 100644 --- a/src/common/hashmap.cpp +++ b/src/common/hashmap.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: hashmap.cpp +// Name: src/common/hashmap.cpp // Purpose: wxHashMap implementation // Author: Mattia Barbon // Modified by: @@ -13,7 +13,7 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #include "wx/hashmap.h" diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 0f3e9b0572..c51372ac9e 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -46,6 +46,7 @@ #include "wx/log.h" #include "wx/utils.h" #include "wx/app.h" + #include "wx/hashmap.h" #endif // WX_PRECOMP #ifndef __WXWINCE__ @@ -71,7 +72,6 @@ #include "wx/module.h" #include "wx/fontmap.h" #include "wx/encconv.h" -#include "wx/hashmap.h" #include "wx/ptr_scpd.h" #include "wx/apptrait.h" #include "wx/stdpaths.h" @@ -1939,9 +1939,9 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix) // check for this // do we have just the language (or sublang too)? - bool justLang = langFull.Len() == LEN_LANG; + bool justLang = langFull.length() == LEN_LANG; if ( justLang || - (langFull.Len() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) ) + (langFull.length() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) ) { // 0. Make sure the lang is according to latest ISO 639 // (this is necessary because glibc uses iw and in instead diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 49e78f40dd..ef07724797 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -19,6 +19,7 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/utils.h" + #include "wx/hashmap.h" #endif #include "wx/strconv.h" @@ -3073,7 +3074,6 @@ void wxCSConv::SetName(const wxChar *charset) } #if wxUSE_FONTMAP -#include "wx/hashmap.h" WX_DECLARE_HASH_MAP( wxFontEncoding, wxString, wxIntegerHash, wxIntegerEqual, wxEncodingNameCache ); diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index ac1b1b7249..a5fdfa8f15 100644 --- a/src/common/xpmdecod.cpp +++ b/src/common/xpmdecod.cpp @@ -103,13 +103,13 @@ license is as follows: #include "wx/intl.h" #include "wx/log.h" #include "wx/utils.h" + #include "wx/hashmap.h" #if wxUSE_STREAMS #include "wx/stream.h" #endif #endif #include "wx/image.h" -#include "wx/hashmap.h" #include #include diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp index 275c62c34b..48e37f2b59 100644 --- a/src/mgl/cursor.cpp +++ b/src/mgl/cursor.cpp @@ -20,10 +20,10 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/utils.h" + #include "wx/hashmap.h" #endif #include "wx/module.h" -#include "wx/hashmap.h" #include "wx/mgl/private.h" diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp index 3c930989aa..48677e8a1f 100644 --- a/src/motif/timer.cpp +++ b/src/motif/timer.cpp @@ -16,10 +16,9 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/hashmap.h" #endif -#include "wx/hashmap.h" - #ifdef __VMS__ #pragma message disable nosimpint #endif diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index d69720c31d..547f67b767 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/dde.cpp +// Name: src/msw/dde.cpp // Purpose: DDE classes // Author: Julian Smart // Modified by: @@ -29,12 +29,12 @@ #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/app.h" + #include "wx/hashmap.h" #endif #include "wx/module.h" #include "wx/dde.h" #include "wx/intl.h" -#include "wx/hashmap.h" #include "wx/msw/private.h" @@ -300,7 +300,7 @@ bool wxDDEServer::Create(const wxString& server) wxDDEServer::~wxDDEServer() { - if ( !m_serviceName.IsEmpty() ) + if ( !m_serviceName.empty() ) { HSZ hsz = DDEAtomFromString(m_serviceName); @@ -558,7 +558,7 @@ bool wxDDEConnection::Execute(const wxChar *data, int size, wxIPCFormat WXUNUSED GetHConv(), NULL, // If the transaction specified by the wType parameter does not pass data or is XTYP_EXECUTE, -// wFmt should be zero. +// wFmt should be zero. 0, XTYP_EXECUTE, DDE_TIMEOUT, diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index e9904ba27c..8fe20ab638 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -27,10 +27,9 @@ #include "wx/app.h" #include "wx/intl.h" #include "wx/log.h" + #include "wx/hashmap.h" #endif -#include "wx/hashmap.h" - #include "wx/msw/private.h" // ---------------------------------------------------------------------------- diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp index 5da2655208..1331da183d 100644 --- a/src/msw/volume.cpp +++ b/src/msw/volume.cpp @@ -30,10 +30,10 @@ #include "wx/icon.h" #endif #include "wx/intl.h" + #include "wx/hashmap.h" #endif // WX_PRECOMP #include "wx/dir.h" -#include "wx/hashmap.h" #include "wx/dynlib.h" #include "wx/arrimpl.cpp" @@ -262,7 +262,7 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc, { wxString filename(pRes->lpRemoteName); - if (filename.Len()) + if (!filename.empty()) { if (filename.Last() != '\\') filename.Append('\\'); diff --git a/src/palmos/timer.cpp b/src/palmos/timer.cpp index 74ae9f1965..f9628a20d4 100644 --- a/src/palmos/timer.cpp +++ b/src/palmos/timer.cpp @@ -27,10 +27,9 @@ #include "wx/app.h" #include "wx/intl.h" #include "wx/log.h" + #include "wx/hashmap.h" #endif -#include "wx/hashmap.h" - #include "wx/palmos/private.h" // from utils.cpp diff --git a/src/palmos/volume.cpp b/src/palmos/volume.cpp index a73244f012..69137b60ef 100644 --- a/src/palmos/volume.cpp +++ b/src/palmos/volume.cpp @@ -33,10 +33,9 @@ #endif #include "wx/intl.h" #include "wx/arrstr.h" + #include "wx/hashmap.h" #endif // WX_PRECOMP -#include "wx/hashmap.h" - #include #include -- 2.45.2