X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1de8d512b7c844d67b2dab36addc89868e68c9b6..a552d1201fd615730d7c0662a65df306fe18c274:/include/wx/gdicmn.h?ds=sidebyside diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index b1e5d72c18..0c27e93a9b 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -20,7 +20,6 @@ #include "wx/list.h" #include "wx/string.h" #include "wx/fontenc.h" -#include "wx/hashmap.h" #include "wx/math.h" // --------------------------------------------------------------------------- @@ -37,6 +36,7 @@ class WXDLLIMPEXP_CORE wxPalette; class WXDLLIMPEXP_CORE wxPen; class WXDLLIMPEXP_CORE wxRegion; class WXDLLIMPEXP_BASE wxString; +class wxStringToColourHashMap; // --------------------------------------------------------------------------- // constants @@ -494,8 +494,6 @@ public: #endif }; -WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap ); - class WXDLLEXPORT wxColourDatabase { public: @@ -676,9 +674,6 @@ extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[]; extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize; extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition; -// The list of objects which should be deleted -extern WXDLLEXPORT_DATA(wxList) wxPendingDelete; - // --------------------------------------------------------------------------- // global functions // ---------------------------------------------------------------------------