Include wx/hashmap.h according to precompiled headers of wx/wx.h (with other minor...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index b6ff1455e2ddaec6ab3bdc9da6188447a92685d7..abcd5c36c9af5aed6878df3c1ed3dddfb9c7a565 100644 (file)
--- 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 99aabf12bb0b4790bd06bacea860b38b51ce8ad0..53ce696f500af06ce75641879f0c2df0a948b4ec 100644 (file)
--- 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 5d3ab8655e922548c1e64adcb0f83720e17879fd..d97e28b4559b2706e10a0751155e34e5a4726a3a 100644 (file)
--- 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 d5b3229b74fbe636f92e73bf5a6da2e52eb37e10..6612272118a24e813980c4740aab98e7a946e1c4 100644 (file)
--- 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 0f3e9b0572410d445024bcc7340b9b6f91b33f07..c51372ac9ed2f64130efefa2b8d0bd8a0038afc8 100644 (file)
--- 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 49e78f40dd9f71f28129782099c729b9d39523cb..ef07724797c5f67061dda645ca8d04462751e120 100644 (file)
--- 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 ac1b1b7249151f5ce7dd67cc03bff742c2fea99d..a5fdfa8f15c0a4d44e31d2485c384c4e3f1956f8 100644 (file)
--- 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 <string.h>
 
 #include <ctype.h>

diff --git a/src/mgl/cursor.cpp b/src/mgl/cursor.cpp
index 275c62c34b84ac6b64520facd0a20cf5785887e7..48e37f2b5981e74e961057908e8450ca99aa3858 100644 (file)
--- 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 3c930989aa38b1a536ee2b14c73070d8ae364895..48677e8a1fcaedb052891ce22969620863b8060c 100644 (file)
--- 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 d69720c31db060a22fdb9a0f4c606b02e04de38b..547f67b7670c3a20252ffbc5e48322390273978b 100644 (file)
--- 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 e9904ba27cae700518ec109b39a412985d036111..8fe20ab6383d0399d271de4a7425d2e367a84602 100644 (file)
--- 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 5da2655208e615336b33857b5481d01464832b7a..1331da183dd03691ad83f1db1df2c02093754500 100644 (file)
--- 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 74ae9f19652deefacdc07aaf03397b4988566809..f9628a20d41548aa773b4ba8d65f77ebabd41a00 100644 (file)
--- 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 a73244f012432511b5cbfbf1cca5c922766f0974..69137b60ef5a900a585e75d1acb2fad87185823b 100644 (file)
--- 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 <VFSMgr.h>
 #include <PalmTypesCompatibility.h>