Reverted semicolons patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
{
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "wx/hashmap.h"
|
||||
|
||||
|
||||
WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap)
|
||||
WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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_
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -118,7 +118,7 @@ public:
|
||||
|
||||
WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry,
|
||||
wxIntegerHash, wxIntegerEqual,
|
||||
wxImageHistogramBase)
|
||||
wxImageHistogramBase);
|
||||
|
||||
class WXDLLEXPORT wxImageHistogram : public wxImageHistogramBase
|
||||
{
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user