From 9e7ed2b008e4c179b4b46449877f2e492cc0ab9f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 26 Mar 2002 01:43:27 +0000 Subject: [PATCH] switch to _EXPORTED_ hash maps to avoid VC++ warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/artprov.cpp | 8 ++++---- src/common/intl.cpp | 40 ++++++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp index 27a7d54d90..088fc3a2f8 100644 --- a/src/common/artprov.cpp +++ b/src/common/artprov.cpp @@ -49,7 +49,7 @@ WX_DEFINE_LIST(wxArtProvidersList); // Cache class - stores already requested bitmaps // ---------------------------------------------------------------------------- -WX_DECLARE_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash); +WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash); class WXDLLEXPORT wxArtProviderCache { @@ -59,7 +59,7 @@ public: { m_bitmapsHash[full_id] = bmp; } void Clear(); - + static wxString ConstructHashID(const wxArtID& id, const wxArtClient& client, const wxSize& size); @@ -140,7 +140,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL; sm_cache->Clear(); return TRUE; } - + return FALSE; } @@ -170,7 +170,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL; bmp = node->GetData()->CreateBitmap(id, client, size); if ( bmp.Ok() ) { - if ( size != wxDefaultSize && + if ( size != wxDefaultSize && (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) ) { wxImage img = bmp.ConvertToImage(); diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 20f1925725..168c333343 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -147,7 +147,7 @@ static inline wxString ExtractNotLang(const wxString& langFull) // This is a "low-level" class and is used only by wxMsgCatalog // ---------------------------------------------------------------------------- -WX_DECLARE_STRING_HASH_MAP(wxString, wxMessagesHash) +WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxString, wxMessagesHash) class wxMsgCatalogFile { @@ -194,7 +194,7 @@ private: const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 index) const { return (const char *)(m_pData + Swap(pTable[index].ofsString)); } - + wxString GetCharset() const; // utility functions @@ -430,7 +430,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons hash[key] = wxString(StringAtOfs(m_pTransTable, i), inputConv); #else if ( convertEncoding ) - hash[key] = + hash[key] = wxString(inputConv.cMB2WC(StringAtOfs(m_pTransTable, i)), wxConvLocal); else @@ -457,7 +457,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc); if (a[0] == enc) // no conversion needed, locale uses native encoding - convertEncoding = FALSE; + convertEncoding = FALSE; if (a.GetCount() == 0) // we don't know common equiv. under this platform convertEncoding = FALSE; @@ -473,7 +473,7 @@ void wxMsgCatalogFile::FillHash(wxMessagesHash& hash, bool convertEncoding) cons for (size_t i = 0; i < m_numStrings; i++) { wxString key(StringAtOfs(m_pOrigTable, i)); - hash[key] = + hash[key] = converter.Convert(wxString(StringAtOfs(m_pTransTable, i))); } } @@ -495,7 +495,7 @@ wxString wxMsgCatalogFile::GetCharset() const { // first, find encoding header: const char *hdr = StringAtOfs(m_pOrigTable, 0); - if ( hdr == NULL || hdr[0] != 0 ) + if ( hdr == NULL || hdr[0] != 0 ) { // not supported by this catalog, does not have correct header return wxEmptyString; @@ -507,19 +507,19 @@ wxString wxMsgCatalogFile::GetCharset() const if ( pos == wxNOT_FOUND ) { // incorrectly filled Content-Type header - return wxEmptyString; + return wxEmptyString; } size_t n = pos + 34; /*strlen("Content-Type: text/plain; charset=")*/ while ( header[n] != wxT('\n') ) charset << header[n++]; - + if ( charset == wxT("CHARSET") ) { // "CHARSET" is not valid charset, but lazy translator return wxEmptyString; } - + return charset; } @@ -527,13 +527,13 @@ wxString wxMsgCatalogFile::GetCharset() const // wxMsgCatalog class // ---------------------------------------------------------------------------- -bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName, +bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName, bool bConvertEncoding) { wxMsgCatalogFile file; - + m_name = szName; - + if ( file.Load(szDirPrefix, szName) ) { file.FillHash(m_messages, bConvertEncoding); @@ -1196,7 +1196,7 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix) break; } } - + #elif defined(__WIN32__) LCID lcid = GetUserDefaultLCID(); if ( lcid != 0 ) @@ -1397,7 +1397,7 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString, const wxChar *pszTrans = NULL; wxMsgCatalog *pMsgCat; - if ( szDomain != NULL ) + if ( szDomain != NULL ) { pMsgCat = FindCatalog(szDomain); @@ -1405,10 +1405,10 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString, if ( pMsgCat != NULL ) pszTrans = pMsgCat->GetString(szOrigString); } - else + else { // search in all domains - for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) + for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) { pszTrans = pMsgCat->GetString(szOrigString); if ( pszTrans != NULL ) // take the first found @@ -1416,10 +1416,10 @@ const wxChar *wxLocale::GetString(const wxChar *szOrigString, } } - if ( pszTrans == NULL ) + if ( pszTrans == NULL ) { #ifdef __WXDEBUG__ - if ( !NoTransErr::Suppress() ) + if ( !NoTransErr::Suppress() ) { NoTransErr noTransErr; @@ -1447,7 +1447,7 @@ wxMsgCatalog *wxLocale::FindCatalog(const wxChar *szDomain) const { // linear search in the linked list wxMsgCatalog *pMsgCat; - for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) + for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext ) { if ( wxStricmp(pMsgCat->GetName(), szDomain) == 0 ) return pMsgCat; @@ -2321,7 +2321,7 @@ void wxLocale::InitLanguagesDB() LNG(wxLANGUAGE_YORUBA, "yo" , 0 , 0 , "Yoruba") LNG(wxLANGUAGE_ZHUANG, "za" , 0 , 0 , "Zhuang") LNG(wxLANGUAGE_ZULU, "zu" , 0 , 0 , "Zulu") - + }; #undef LNG