Make IsOfClass out-of-line to defend against gcc 3.4.[56] bug:

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 6d3faf11f71f5fc4cc4b715e0f23bc966a2b99ae..617a8d344baef341cfa985fdaf16147284a9e7d7 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -26,13 +26,11 @@
     #include "wx/icon.h"
     #include "wx/cursor.h"
     #include "wx/settings.h"
     #include "wx/icon.h"
     #include "wx/cursor.h"
     #include "wx/settings.h"

+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+    #include "wx/font.h"

 #endif
 
 #endif
 

-#include "wx/colour.h"
-#include "wx/bitmap.h"
-#include "wx/font.h"
-#include "wx/hashmap.h"
-

 WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
 WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;
 WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;
 WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
 WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;
 WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;


@@ -50,8 +48,6 @@ WXDLLIMPEXP_DATA_CORE(wxPen)     wxNullPen;
 WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette;
 #endif
 
 WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette;
 #endif
 

-WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);
-

 const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
 const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);
 
 const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
 const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);