Various code improvements

[dragonfireclient.git] / src / gui / guiEditBoxWithScrollbar.h

diff --git a/src/gui/guiEditBoxWithScrollbar.h b/src/gui/guiEditBoxWithScrollbar.h
index 5ae58b9349fb37498aadbd9f084a2370e7c37230..3f7450dcb7d7edde8a38f3bea6fbf4414b131316 100644 (file)
--- a/src/gui/guiEditBoxWithScrollbar.h
+++ b/src/gui/guiEditBoxWithScrollbar.h
@@ -6,7 +6,6 @@
 #define GUIEDITBOXWITHSCROLLBAR_HEADER
 
 #include "guiEditBox.h"
-#include <vector>
 
 class GUIEditBoxWithScrollBar : public GUIEditBox
 {
@@ -18,54 +17,17 @@ class GUIEditBoxWithScrollBar : public GUIEditBox
                bool writable = true, bool has_vscrollbar = true);
 
        //! destructor
-       virtual ~GUIEditBoxWithScrollBar();
+       virtual ~GUIEditBoxWithScrollBar() {}
 
        //! Sets whether to draw the background
        virtual void setDrawBackground(bool draw);
 
-       //! Turns the border on or off
-       virtual void setDrawBorder(bool border);
-
-
-
-       //! Gets the size area of the text in the edit box
-       //! \return Returns the size in pixels of the text
-       virtual core::dimension2du getTextDimension();
-
-       //! Sets text justification
-       virtual void setTextAlignment(EGUI_ALIGNMENT horizontal, EGUI_ALIGNMENT vertical);
-
-       //! called if an event happened.
-       virtual bool OnEvent(const SEvent& event);
-
        //! draws the element and its children
        virtual void draw();
 
-       //! Sets the new caption of this element.
-       virtual void setText(const wchar_t* text);
-
-       //! 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);
-
-       //! Returns maximum amount of characters, previously set by setMax();
-       virtual u32 getMax() const;
-
-       //! 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'*');
-
-       //! Returns true if the edit box is currently a password box.
-       virtual bool isPasswordBox() const;
-
        //! Updates the absolute position, splits text if required
        virtual void updateAbsolutePosition();
 
-       virtual void setWritable(bool writable);
-
        //! Change the background color
        virtual void setBackgroundColor(const video::SColor &bg_color);
 
@@ -86,56 +48,18 @@ class GUIEditBoxWithScrollBar : public GUIEditBox
        //! Breaks the single text line.
        virtual 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);
+       virtual void setTextRect(s32 line);
        //! calculates the current scroll position
        void calculateScrollPos();
        //! calculated the FrameRect
        void calculateFrameRect();
-       //! send some gui event to parent
-       void sendGuiEvent(EGUI_EVENT_TYPE type);
-       //! set text markers
-       void setTextMarkers(s32 begin, s32 end);
        //! create a Vertical ScrollBar
        void createVScrollBar();
-       //! update the vertical scrollBar (visibilty & position)
-       void updateVScrollBar();
 
-       bool processKey(const SEvent& event);
-       bool processMouse(const SEvent& event);
        s32 getCursorPos(s32 x, s32 y);
 
-       bool m_mouse_marking;
-       bool m_border;
        bool m_background;
 
-       s32 m_mark_begin;
-       s32 m_mark_end;
-
-       gui::IGUIFont *m_last_break_font;
-       IOSOperator* m_operator;
-
-       u32 m_blink_start_time;
-       s32 m_cursor_pos;
-       s32 m_hscroll_pos, m_vscroll_pos; // scroll position in characters
-       u32 m_max;
-
-       bool m_passwordbox;
-       wchar_t m_passwordchar;
-       EGUI_ALIGNMENT m_halign, m_valign;
-
-       std::vector<core::stringw> m_broken_text;
-       std::vector<s32> m_broken_text_positions;
-
-       core::rect<s32> m_current_text_rect, m_frame_rect; // temporary values
-
-       u32 m_scrollbar_width;
-       GUIScrollBar *m_vscrollbar;
-       bool m_writable;
-
        bool m_bg_color_used;
        video::SColor m_bg_color;
 };