Merge branch 'master' into master

1 files changed, 153 insertions, 153 deletions

diff --git a/src/gui/intlGUIEditBox.h b/src/gui/intlGUIEditBox.h
index 7b5f015fd..9d643495e 100644
--- a/src/gui/intlGUIEditBox.h
+++ b/src/gui/intlGUIEditBox.h
@@ -16,193 +16,193 @@ namespace irr
 {
 namespace gui
 {
-class intlGUIEditBox : public IGUIEditBox
-{
-public:
-	//! constructor
-	intlGUIEditBox(const wchar_t *text, bool border, IGUIEnvironment *environment,
-			IGUIElement *parent, s32 id, const core::rect<s32> &rectangle,
+	class intlGUIEditBox : public IGUIEditBox
+	{
+	public:
+
+		//! constructor
+		intlGUIEditBox(const wchar_t* text, bool border, IGUIEnvironment* environment,
+			IGUIElement* parent, s32 id, const core::rect<s32>& rectangle,
 			bool writable = true, bool has_vscrollbar = false);
 
-	//! destructor
-	virtual ~intlGUIEditBox();
+		//! destructor
+		virtual ~intlGUIEditBox();
+
+		//! Sets another skin independent font.
+		virtual void setOverrideFont(IGUIFont* font=0);
+
+		//! Gets the override font (if any)
+		/** \return The override font (may be 0) */
+		virtual IGUIFont* getOverrideFont() const;
+
+		//! Get the font which is used right now for drawing
+		/** Currently this is the override font when one is set and the
+		font of the active skin otherwise */
+		virtual IGUIFont* getActiveFont() const;
+
+		//! Sets another color for the text.
+		virtual void setOverrideColor(video::SColor color);
+
+		//! Gets the override color
+		virtual video::SColor getOverrideColor() const;
+
+		//! Sets if the text should use the overide color or the
+		//! color in the gui skin.
+		virtual void enableOverrideColor(bool enable);
+
+		//! Checks if an override color is enabled
+		/** \return true if the override color is enabled, false otherwise */
+		virtual bool isOverrideColorEnabled(void) const;
+
+		//! Sets whether to draw the background
+		virtual void setDrawBackground(bool draw);
+
+		virtual bool isDrawBackgroundEnabled() const { return true; }
+
+		//! Turns the border on or off
+		virtual void setDrawBorder(bool border);
+
+		virtual bool isDrawBorderEnabled() const { return Border; }
+
+		//! Enables or disables word wrap for using the edit box as multiline text editor.
+		virtual void setWordWrap(bool enable);
+
+		//! Checks if word wrap is enabled
+		//! \return true if word wrap is enabled, false otherwise
+		virtual bool isWordWrapEnabled() const;
+
+		//! Enables or disables newlines.
+		/** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired,
+		instead a newline character will be inserted. */
+		virtual void setMultiLine(bool enable);
 
-	//! Sets another skin independent font.
-	virtual void setOverrideFont(IGUIFont *font = 0);
+		//! Checks if multi line editing is enabled
+		//! \return true if mult-line is enabled, false otherwise
+		virtual bool isMultiLineEnabled() const;
 
-	//! Gets the override font (if any)
-	/** \return The override font (may be 0) */
-	virtual IGUIFont *getOverrideFont() const;
+		//! Enables or disables automatic scrolling with cursor position
+		//! \param enable: If set to true, the text will move around with the cursor position
+		virtual void setAutoScroll(bool enable);
 
-	//! Get the font which is used right now for drawing
-	/** Currently this is the override font when one is set and the
-	font of the active skin otherwise */
-	virtual IGUIFont *getActiveFont() const;
+		//! Checks to see if automatic scrolling is enabled
+		//! \return true if automatic scrolling is enabled, false if not
+		virtual bool isAutoScrollEnabled() const;
 
-	//! Sets another color for the text.
-	virtual void setOverrideColor(video::SColor color);
+		//! Gets the size area of the text in the edit box
+		//! \return Returns the size in pixels of the text
+		virtual core::dimension2du getTextDimension();
 
-	//! Gets the override color
-	virtual video::SColor getOverrideColor() const;
+		//! Sets text justification
+		virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical);
 
-	//! Sets if the text should use the overide color or the
-	//! color in the gui skin.
-	virtual void enableOverrideColor(bool enable);
+		//! called if an event happened.
+		virtual bool OnEvent(const SEvent& event);
 
-	//! Checks if an override color is enabled
-	/** \return true if the override color is enabled, false otherwise */
-	virtual bool isOverrideColorEnabled(void) const;
+		//! draws the element and its children
+		virtual void draw();
 
-	//! Sets whether to draw the background
-	virtual void setDrawBackground(bool draw);
+		//! Sets the new caption of this element.
+		virtual void setText(const wchar_t* text);
 
-	virtual bool isDrawBackgroundEnabled() const { return true; }
+		//! Sets the maximum amount of characters which may be entered in the box.
+		//! \param max: Maximum amount of characters. If 0, the character amount is
+		//! infinity.
+		virtual void setMax(u32 max);
 
-	//! Turns the border on or off
-	virtual void setDrawBorder(bool border);
+		//! Returns maximum amount of characters, previously set by setMax();
+		virtual u32 getMax() const;
 
-	virtual bool isDrawBorderEnabled() const { return Border; }
+		//! Sets whether the edit box is a password box. Setting this to true will
+		/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
+		\param passwordBox: true to enable password, false to disable
+		\param passwordChar: the character that is displayed instead of letters */
+		virtual void setPasswordBox(bool passwordBox, wchar_t passwordChar = L'*');
 
-	//! Enables or disables word wrap for using the edit box as multiline text editor.
-	virtual void setWordWrap(bool enable);
+		//! Returns true if the edit box is currently a password box.
+		virtual bool isPasswordBox() const;
 
-	//! Checks if word wrap is enabled
-	//! \return true if word wrap is enabled, false otherwise
-	virtual bool isWordWrapEnabled() const;
+		//! Updates the absolute position, splits text if required
+		virtual void updateAbsolutePosition();
 
-	//! Enables or disables newlines.
-	/** \param enable: If set to true, the EGET_EDITBOX_ENTER event will not be fired,
-	instead a newline character will be inserted. */
-	virtual void setMultiLine(bool enable);
+		//! set true if this EditBox is writable
+		virtual void setWritable(bool can_write_text);
 
-	//! Checks if multi line editing is enabled
-	//! \return true if mult-line is enabled, false otherwise
-	virtual bool isMultiLineEnabled() const;
+		//! Writes attributes of the element.
+		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;
 
-	//! Enables or disables automatic scrolling with cursor position
-	//! \param enable: If set to true, the text will move around with the cursor
-	//! position
-	virtual void setAutoScroll(bool enable);
+		//! Reads attributes of the element
+		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options);
 
-	//! Checks to see if automatic scrolling is enabled
-	//! \return true if automatic scrolling is enabled, false if not
-	virtual bool isAutoScrollEnabled() const;
+		virtual void setCursorChar(const wchar_t cursorChar) {}
 
-	//! Gets the size area of the text in the edit box
-	//! \return Returns the size in pixels of the text
-	virtual core::dimension2du getTextDimension();
+		virtual wchar_t getCursorChar() const { return L'|'; }
 
-	//! Sets text justification
-	virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical);
+		virtual void setCursorBlinkTime(u32 timeMs) {}
 
-	//! called if an event happened.
-	virtual bool OnEvent(const SEvent &event);
+		virtual u32 getCursorBlinkTime() const { return 500; }
 
-	//! draws the element and its children
-	virtual void draw();
+	protected:
+		//! Breaks the single text line.
+		void breakText();
+		//! sets the area of the given line
+		void setTextRect(s32 line);
+		//! returns the line number that the cursor is on
+		s32 getLineFromPos(s32 pos);
+		//! adds a letter to the edit box
+		void inputChar(wchar_t c);
+		//! calculates the current scroll position
+		void calculateScrollPos();
+		//! send some gui event to parent
+		void sendGuiEvent(EGUI_EVENT_TYPE type);
+		//! set text markers
+		void setTextMarkers(s32 begin, s32 end);
 
-	//! Sets the new caption of this element.
-	virtual void setText(const wchar_t *text);
+		bool processKey(const SEvent& event);
+		bool processMouse(const SEvent& event);
+		s32 getCursorPos(s32 x, s32 y);
 
-	//! Sets the maximum amount of characters which may be entered in the box.
-	//! \param max: Maximum amount of characters. If 0, the character amount is
-	//! infinity.
-	virtual void setMax(u32 max);
+		//! Create a vertical scrollbar
+		void createVScrollBar();
 
-	//! Returns maximum amount of characters, previously set by setMax();
-	virtual u32 getMax() const;
+		//! Update the vertical scrollbar (visibilty & scroll position)
+		void updateVScrollBar();
 
-	//! Sets whether the edit box is a password box. Setting this to true will
-	/** disable MultiLine, WordWrap and the ability to copy with ctrl+c or ctrl+x
-	\param passwordBox: true to enable password, false to disable
-	\param passwordChar: the character that is displayed instead of letters */
-	virtual void setPasswordBox(bool passwordBox, wchar_t passwordChar = L'*');
+		bool MouseMarking = false;
+		bool Border;
+		bool OverrideColorEnabled = false;
+		s32 MarkBegin = 0;
+		s32 MarkEnd = 0;
 
-	//! Returns true if the edit box is currently a password box.
-	virtual bool isPasswordBox() const;
+		video::SColor OverrideColor = video::SColor(101,255,255,255);
+		gui::IGUIFont *OverrideFont = nullptr;
+		gui::IGUIFont *LastBreakFont = nullptr;
+		IOSOperator *Operator = nullptr;
 
-	//! Updates the absolute position, splits text if required
-	virtual void updateAbsolutePosition();
+		u64 BlinkStartTime = 0;
+		s32 CursorPos = 0;
+		s32 HScrollPos = 0;
+		s32 VScrollPos = 0; // scroll position in characters
+		u32 Max = 0;
 
-	//! set true if this EditBox is writable
-	virtual void setWritable(bool can_write_text);
+		bool WordWrap = false;
+		bool MultiLine = false;
+		bool AutoScroll = true;
+		bool PasswordBox = false;
+		wchar_t PasswordChar = L'*';
+		EGUI_ALIGNMENT HAlign = EGUIA_UPPERLEFT;
+		EGUI_ALIGNMENT VAlign = EGUIA_CENTER;
 
-	//! Writes attributes of the element.
-	virtual void serializeAttributes(io::IAttributes *out,
-			io::SAttributeReadWriteOptions *options) const;
-
-	//! Reads attributes of the element
-	virtual void deserializeAttributes(
-			io::IAttributes *in, io::SAttributeReadWriteOptions *options);
-
-	virtual void setCursorChar(const wchar_t cursorChar) {}
+		core::array<core::stringw> BrokenText;
+		core::array<s32> BrokenTextPositions;
 
-	virtual wchar_t getCursorChar() const { return L'|'; }
+		core::rect<s32> CurrentTextRect = core::rect<s32>(0,0,1,1);
+		core::rect<s32> FrameRect; // temporary values
+		u32 m_scrollbar_width;
+		GUIScrollBar *m_vscrollbar;
+		bool m_writable;
 
-	virtual void setCursorBlinkTime(u32 timeMs) {}
+	};
 
-	virtual u32 getCursorBlinkTime() const { return 500; }
-
-protected:
-	//! Breaks the single text line.
-	void breakText();
-	//! sets the area of the given line
-	void setTextRect(s32 line);
-	//! returns the line number that the cursor is on
-	s32 getLineFromPos(s32 pos);
-	//! adds a letter to the edit box
-	void inputChar(wchar_t c);
-	//! calculates the current scroll position
-	void calculateScrollPos();
-	//! send some gui event to parent
-	void sendGuiEvent(EGUI_EVENT_TYPE type);
-	//! set text markers
-	void setTextMarkers(s32 begin, s32 end);
-
-	bool processKey(const SEvent &event);
-	bool processMouse(const SEvent &event);
-	s32 getCursorPos(s32 x, s32 y);
-
-	//! Create a vertical scrollbar
-	void createVScrollBar();
-
-	//! Update the vertical scrollbar (visibilty & scroll position)
-	void updateVScrollBar();
-
-	bool MouseMarking = false;
-	bool Border;
-	bool OverrideColorEnabled = false;
-	s32 MarkBegin = 0;
-	s32 MarkEnd = 0;
-
-	video::SColor OverrideColor = video::SColor(101, 255, 255, 255);
-	gui::IGUIFont *OverrideFont = nullptr;
-	gui::IGUIFont *LastBreakFont = nullptr;
-	IOSOperator *Operator = nullptr;
-
-	u64 BlinkStartTime = 0;
-	s32 CursorPos = 0;
-	s32 HScrollPos = 0;
-	s32 VScrollPos = 0; // scroll position in characters
-	u32 Max = 0;
-
-	bool WordWrap = false;
-	bool MultiLine = false;
-	bool AutoScroll = true;
-	bool PasswordBox = false;
-	wchar_t PasswordChar = L'*';
-	EGUI_ALIGNMENT HAlign = EGUIA_UPPERLEFT;
-	EGUI_ALIGNMENT VAlign = EGUIA_CENTER;
-
-	core::array<core::stringw> BrokenText;
-	core::array<s32> BrokenTextPositions;
-
-	core::rect<s32> CurrentTextRect = core::rect<s32>(0, 0, 1, 1);
-	core::rect<s32> FrameRect; // temporary values
-	u32 m_scrollbar_width;
-	GUIScrollBar *m_vscrollbar;
-	bool m_writable;
-};
 
 } // end namespace gui
 } // end namespace irr