diff options
author | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
commit | 959831f4ef5a3e797f576c3de08cd65032c997ad (patch) | |
tree | e7351908be5995f0b325b2ebeaa02d5a34b82583 /libraries/irrlicht-1.8/source/Irrlicht/CGUIToolBar.h | |
parent | Add info about changes to Irrlicht. (diff) | |
download | SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.zip SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.gz SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.bz2 SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.xz |
Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.
Diffstat (limited to '')
-rw-r--r-- | libraries/irrlicht-1.8/source/Irrlicht/CGUIToolBar.h | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CGUIToolBar.h b/libraries/irrlicht-1.8/source/Irrlicht/CGUIToolBar.h index 3f419e7..52c0229 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CGUIToolBar.h +++ b/libraries/irrlicht-1.8/source/Irrlicht/CGUIToolBar.h | |||
@@ -1,52 +1,52 @@ | |||
1 | // Copyright (C) 2002-2012 Nikolaus Gebhardt | 1 | // Copyright (C) 2002-2012 Nikolaus Gebhardt |
2 | // This file is part of the "Irrlicht Engine". | 2 | // This file is part of the "Irrlicht Engine". |
3 | // For conditions of distribution and use, see copyright notice in irrlicht.h | 3 | // For conditions of distribution and use, see copyright notice in irrlicht.h |
4 | 4 | ||
5 | #ifndef __C_GUI_TOOL_BAR_H_INCLUDED__ | 5 | #ifndef __C_GUI_TOOL_BAR_H_INCLUDED__ |
6 | #define __C_GUI_TOOL_BAR_H_INCLUDED__ | 6 | #define __C_GUI_TOOL_BAR_H_INCLUDED__ |
7 | 7 | ||
8 | #include "IrrCompileConfig.h" | 8 | #include "IrrCompileConfig.h" |
9 | #ifdef _IRR_COMPILE_WITH_GUI_ | 9 | #ifdef _IRR_COMPILE_WITH_GUI_ |
10 | 10 | ||
11 | #include "IGUIToolbar.h" | 11 | #include "IGUIToolbar.h" |
12 | 12 | ||
13 | namespace irr | 13 | namespace irr |
14 | { | 14 | { |
15 | namespace gui | 15 | namespace gui |
16 | { | 16 | { |
17 | 17 | ||
18 | //! Stays at the top of its parent like the menu bar and contains tool buttons | 18 | //! Stays at the top of its parent like the menu bar and contains tool buttons |
19 | class CGUIToolBar : public IGUIToolBar | 19 | class CGUIToolBar : public IGUIToolBar |
20 | { | 20 | { |
21 | public: | 21 | public: |
22 | 22 | ||
23 | //! constructor | 23 | //! constructor |
24 | CGUIToolBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle); | 24 | CGUIToolBar(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle); |
25 | 25 | ||
26 | //! called if an event happened. | 26 | //! called if an event happened. |
27 | virtual bool OnEvent(const SEvent& event); | 27 | virtual bool OnEvent(const SEvent& event); |
28 | 28 | ||
29 | //! draws the element and its children | 29 | //! draws the element and its children |
30 | virtual void draw(); | 30 | virtual void draw(); |
31 | 31 | ||
32 | //! Updates the absolute position. | 32 | //! Updates the absolute position. |
33 | virtual void updateAbsolutePosition(); | 33 | virtual void updateAbsolutePosition(); |
34 | 34 | ||
35 | //! Adds a button to the tool bar | 35 | //! Adds a button to the tool bar |
36 | virtual IGUIButton* addButton(s32 id=-1, const wchar_t* text=0,const wchar_t* tooltiptext=0, | 36 | virtual IGUIButton* addButton(s32 id=-1, const wchar_t* text=0,const wchar_t* tooltiptext=0, |
37 | video::ITexture* img=0, video::ITexture* pressed=0, | 37 | video::ITexture* img=0, video::ITexture* pressed=0, |
38 | bool isPushButton=false, bool useAlphaChannel=false); | 38 | bool isPushButton=false, bool useAlphaChannel=false); |
39 | 39 | ||
40 | private: | 40 | private: |
41 | 41 | ||
42 | s32 ButtonX; | 42 | s32 ButtonX; |
43 | }; | 43 | }; |
44 | 44 | ||
45 | 45 | ||
46 | } // end namespace gui | 46 | } // end namespace gui |
47 | } // end namespace irr | 47 | } // end namespace irr |
48 | 48 | ||
49 | #endif // _IRR_COMPILE_WITH_GUI_ | 49 | #endif // _IRR_COMPILE_WITH_GUI_ |
50 | 50 | ||
51 | #endif | 51 | #endif |
52 | 52 | ||