Reduce IrrCompileConfig usage to files that actually need it

[irrlicht.git] / source / Irrlicht / CGUIFont.h

diff --git a/source/Irrlicht/CGUIFont.h b/source/Irrlicht/CGUIFont.h
index 238e301411217b6b6f66c95c76524ca82289894d..449df086ea71b3bcb718597ae8b6abe241ca8aa5 100644 (file)
--- a/source/Irrlicht/CGUIFont.h
+++ b/source/Irrlicht/CGUIFont.h
@@ -5,14 +5,11 @@
 #ifndef __C_GUI_FONT_H_INCLUDED__\r
 #define __C_GUI_FONT_H_INCLUDED__\r
 \r
-#include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUIFontBitmap.h"\r
 #include "irrString.h"\r
-#include "irrMap.h"\r
 #include "IReadFile.h"\r
 #include "irrArray.h"\r
+#include <map>\r
 \r
 namespace irr\r
 {\r
@@ -47,32 +44,32 @@ public:
        //! draws an text and clips it to the specified rectangle if wanted\r
        virtual void draw(const core::stringw& text, const core::rect<s32>& position,\r
                        video::SColor color, bool hcenter=false,\r
-                       bool vcenter=false, const core::rect<s32>* clip=0) _IRR_OVERRIDE_;\r
+                       bool vcenter=false, const core::rect<s32>* clip=0) override;\r
 \r
        //! returns the dimension of a text\r
-       virtual core::dimension2d<u32> getDimension(const wchar_t* text) const _IRR_OVERRIDE_;\r
+       core::dimension2d<u32> getDimension(const wchar_t* text) const override;\r
 \r
        //! Calculates the index of the character in the text which is on a specific position.\r
-       virtual s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const _IRR_OVERRIDE_;\r
+       s32 getCharacterFromPos(const wchar_t* text, s32 pixel_x) const override;\r
 \r
        //! Returns the type of this font\r
-       virtual EGUI_FONT_TYPE getType() const _IRR_OVERRIDE_ { return EGFT_BITMAP; }\r
+       EGUI_FONT_TYPE getType() const override { return EGFT_BITMAP; }\r
 \r
        //! set an Pixel Offset on Drawing ( scale position on width )\r
-       virtual void setKerningWidth (s32 kerning) _IRR_OVERRIDE_;\r
-       virtual void setKerningHeight (s32 kerning) _IRR_OVERRIDE_;\r
+       void setKerningWidth (s32 kerning) override;\r
+       void setKerningHeight (s32 kerning) override;\r
 \r
        //! set an Pixel Offset on Drawing ( scale position on width )\r
-       virtual s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const _IRR_OVERRIDE_;\r
-       virtual s32 getKerningHeight() const _IRR_OVERRIDE_;\r
+       s32 getKerningWidth(const wchar_t* thisLetter=0, const wchar_t* previousLetter=0) const override;\r
+       s32 getKerningHeight() const override;\r
 \r
        //! gets the sprite bank\r
-       virtual IGUISpriteBank* getSpriteBank() const _IRR_OVERRIDE_;\r
+       IGUISpriteBank* getSpriteBank() const override;\r
 \r
        //! returns the sprite number from a given character\r
-       virtual u32 getSpriteNoFromChar(const wchar_t *c) const _IRR_OVERRIDE_;\r
+       u32 getSpriteNoFromChar(const wchar_t *c) const override;\r
 \r
-       virtual void setInvisibleCharacters( const wchar_t *s ) _IRR_OVERRIDE_;\r
+       void setInvisibleCharacters( const wchar_t *s ) override;\r
 \r
 private:\r
 \r
@@ -97,7 +94,7 @@ private:
        void popTextureCreationFlags(const bool(&flags)[3]);\r
 \r
        core::array<SFontArea>          Areas;\r
-       core::map<wchar_t, s32>         CharacterMap;\r
+       std::map<wchar_t, s32>          CharacterMap;\r
        video::IVideoDriver*            Driver;\r
        IGUISpriteBank*                 SpriteBank;\r
        IGUIEnvironment*                Environment;\r
@@ -111,7 +108,4 @@ private:
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif // __C_GUI_FONT_H_INCLUDED__\r
-\r