From: Julian Smart Date: Wed, 18 Jan 2006 16:45:41 +0000 (+0000) Subject: Reverted semicolons patch X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3f5c62f982ff185daf8bed1f87ef7214fbb6d8cc Reverted semicolons patch git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h index 49c339bec0..33fae4c104 100644 --- a/include/wx/clntdata.h +++ b/include/wx/clntdata.h @@ -21,12 +21,12 @@ WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxShadowObjectMethod, wxShadowObjectMethods, class WXDLLIMPEXP_BASE -) +); WX_DECLARE_STRING_HASH_MAP_WITH_DECL( void *, wxShadowObjectFields, class WXDLLIMPEXP_BASE -) +); class WXDLLIMPEXP_BASE wxShadowObject { diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h index 3f713a9a39..7f85910dd7 100644 --- a/include/wx/cshelp.h +++ b/include/wx/cshelp.h @@ -138,7 +138,7 @@ private: }; WX_DECLARE_EXPORTED_HASH_MAP( wxUIntPtr, wxString, wxIntegerHash, - wxIntegerEqual, wxSimpleHelpProviderHashMap ) + wxIntegerEqual, wxSimpleHelpProviderHashMap ); // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports // only plain text help strings and shows the string associated with the diff --git a/include/wx/dynload.h b/include/wx/dynload.h index 540bd0374b..b754dee03f 100644 --- a/include/wx/dynload.h +++ b/include/wx/dynload.h @@ -29,7 +29,7 @@ class WXDLLIMPEXP_BASE wxPluginLibrary; WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxPluginLibrary *, wxDLManifest, - class WXDLLIMPEXP_BASE) + class WXDLLIMPEXP_BASE); typedef wxDLManifest wxDLImports; // --------------------------------------------------------------------------- diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h index beccdf7a66..ba864ce522 100644 --- a/include/wx/fs_zip.h +++ b/include/wx/fs_zip.h @@ -18,7 +18,7 @@ #include "wx/hashmap.h" -WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap) +WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap); //--------------------------------------------------------------------------- diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index f4d5bc365e..d38fe44b93 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -474,7 +474,7 @@ public: wxFontEncoding encoding = wxFONTENCODING_DEFAULT); }; -WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap ) +WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap ); class WXDLLEXPORT wxColourDatabase { diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index f068d6d93b..31280b1f5b 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -640,7 +640,7 @@ public: \ /* count() == 0 | 1 */ \ size_type count( const const_key_type& key ) \ { return GetNode( key ) ? 1 : 0; } \ -}; +} #endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP) @@ -699,7 +699,7 @@ public: \ // Declarations of common hashmap classes WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual, - wxLongToLongHashMap, class WXDLLIMPEXP_BASE ) + wxLongToLongHashMap, class WXDLLIMPEXP_BASE ); #endif // _WX_HASHMAP_H_ diff --git a/include/wx/hashset.h b/include/wx/hashset.h index 9c96e5e9e2..599690d402 100644 --- a/include/wx/hashset.h +++ b/include/wx/hashset.h @@ -83,7 +83,7 @@ public: \ /* count() == 0 | 1 */ \ size_type count( const const_key_type& key ) \ { return GetNode( key ) ? 1 : 0; } \ -}; +} #endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP) diff --git a/include/wx/image.h b/include/wx/image.h index f65a1ff4aa..e685022009 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -118,7 +118,7 @@ public: WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry, wxIntegerHash, wxIntegerEqual, - wxImageHistogramBase) + wxImageHistogramBase); class WXDLLEXPORT wxImageHistogram : public wxImageHistogramBase { diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h index 69c8f04c72..8fc4f90d27 100644 --- a/include/wx/msw/treectrl.h +++ b/include/wx/msw/treectrl.h @@ -43,7 +43,7 @@ struct WXDLLEXPORT wxTreeViewItem; #define wxTREE_INSERT_LAST 0xFFFF0002 // hash storing attributes for our items -WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr) +WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr); // ---------------------------------------------------------------------------- // wxTreeCtrl diff --git a/include/wx/paper.h b/include/wx/paper.h index ab1150843b..1f26fbd102 100644 --- a/include/wx/paper.h +++ b/include/wx/paper.h @@ -66,7 +66,7 @@ private: DECLARE_DYNAMIC_CLASS(wxPrintPaperType) }; -WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap) +WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap); class WXDLLEXPORT wxPrintPaperTypeList; diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h index ff4b2ecc48..f87227bc38 100644 --- a/include/wx/protocol/http.h +++ b/include/wx/protocol/http.h @@ -19,7 +19,7 @@ #include "wx/protocol/protocol.h" WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxString, wxStringToStringHashMap, - class WXDLLIMPEXP_NET ) + class WXDLLIMPEXP_NET ); class WXDLLIMPEXP_NET wxHTTP : public wxProtocol { diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp index 817d5e08db..d7497a45ff 100644 --- a/src/common/artprov.cpp +++ b/src/common/artprov.cpp @@ -44,7 +44,7 @@ WX_DEFINE_LIST(wxArtProvidersList) // Cache class - stores already requested bitmaps // ---------------------------------------------------------------------------- -WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash) +WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash); class WXDLLEXPORT wxArtProviderCache { diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index 4fc0f8ce40..b098d4854b 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -434,7 +434,7 @@ _WX_DEFINE_BASEARRAY(double, wxBaseArrayDouble) #include #include "wx/afterstd.h" -_WX_DEFINE_BASEARRAY(wxString, wxBaseArrayStringBase) +_WX_DEFINE_BASEARRAY(wxString, wxBaseArrayStringBase); // some compilers (Sun CC being the only known example) distinguish between // extern "C" functions and the functions with C++ linkage and ptr_fun and diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 9ce6de4432..c1055e99e3 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -870,7 +870,7 @@ wxPluralFormsCalculator* wxPluralFormsCalculator::make(const char* s) // This is a "low-level" class and is used only by wxMsgCatalog // ---------------------------------------------------------------------------- -WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxString, wxMessagesHash) +WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxString, wxMessagesHash); class wxMsgCatalogFile { diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 0e3eb81df9..3508ac1c8b 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -2525,7 +2525,7 @@ void wxCSConv::SetName(const wxChar *charset) #include "wx/hashmap.h" WX_DECLARE_HASH_MAP( wxFontEncoding, wxString, wxIntegerHash, wxIntegerEqual, - wxEncodingNameCache ) + wxEncodingNameCache ); static wxEncodingNameCache gs_nameCache; #endif diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index da656a3744..fa4767ac83 100644 --- a/src/common/xpmdecod.cpp +++ b/src/common/xpmdecod.cpp @@ -653,7 +653,7 @@ struct wxXPMColourMapData { unsigned char R,G,B; }; -WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap) +WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap); wxImage wxXPMDecoder::ReadData(const char **xpm_data) { diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp index 93bbef9f88..b7ab20d7b7 100644 --- a/src/common/zipstrm.cpp +++ b/src/common/zipstrm.cpp @@ -604,7 +604,7 @@ static void Unique(wxZipMemory*& zm, size_t size) // Collection of weak references to entries WX_DECLARE_HASH_MAP(long, wxZipEntry*, wxIntegerHash, - wxIntegerEqual, wx__OffsetZipEntryMap) + wxIntegerEqual, wx__OffsetZipEntryMap); class wxZipWeakLinks { diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index f33908fc4e..d69720c31d 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -96,7 +96,7 @@ static void DDELogError(const wxString& s, UINT error = DMLERR_NO_ERROR); // global variables // ---------------------------------------------------------------------------- -WX_DECLARE_STRING_HASH_MAP( HSZ, wxAtomMap ) +WX_DECLARE_STRING_HASH_MAP( HSZ, wxAtomMap ); static DWORD DDEIdInst = 0L; static wxDDEConnection *DDECurrentlyConnecting = NULL; diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 13926d36db..5b3312796e 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -109,7 +109,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule) #endif #include "wx/hashset.h" -WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet) +WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet); #ifdef POP_WARNINGS #pragma warning(pop) diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 1c94d7de49..d93588c637 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -40,7 +40,7 @@ // define a hash containing all the timers: it is indexed by timer id and // contains the corresponding timer WX_DECLARE_HASH_MAP(unsigned long, wxTimer *, wxIntegerHash, wxIntegerEqual, - wxTimerMap) + wxTimerMap); // instead of using a global here, wrap it in a static function as otherwise it // could have been used before being initialized if a timer object were created