Revert "Fix: Listbox was sometimes sending EGET_LISTBOX_SELECTED_AGAIN instead of...

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

diff --git a/source/Irrlicht/CGUITabControl.h b/source/Irrlicht/CGUITabControl.h
index ffc31f216a064cd71513e728e596bc8a61ab7d68..4c2a0549712ae9da9d0aa1151f6038fb9c4bece2 100644 (file)
--- a/source/Irrlicht/CGUITabControl.h
+++ b/source/Irrlicht/CGUITabControl.h
@@ -5,9 +5,6 @@
 #ifndef __C_GUI_TAB_CONTROL_H_INCLUDED__\r
 #define __C_GUI_TAB_CONTROL_H_INCLUDED__\r
 \r
-#include "IrrCompileConfig.h"\r
-#ifdef _IRR_COMPILE_WITH_GUI_\r
-\r
 #include "IGUITabControl.h"\r
 #include "irrArray.h"\r
 #include "IGUISkin.h"\r
@@ -153,8 +150,11 @@ namespace gui
 \r
                void scrollLeft();\r
                void scrollRight();\r
-               bool needScrollControl( s32 startIndex=0, bool withScrollControl=false );\r
-               s32 calcTabWidth(s32 pos, IGUIFont* font, const wchar_t* text, bool withScrollControl ) const;\r
+               //! Indicates whether the tabs overflow in X direction\r
+               bool needScrollControl( s32 startIndex=0, bool withScrollControl=false, s32 *pos_rightmost=nullptr );\r
+               //! Left index calculation based on the selected tab\r
+               s32 calculateScrollIndexFromActive();\r
+               s32 calcTabWidth(IGUIFont* font, const wchar_t* text) const;\r
                core::rect<s32> calcTabPos();\r
                void setVisibleTab(s32 idx);\r
                void removeTabButNotChild(s32 idx);\r
@@ -181,7 +181,4 @@ namespace gui
 } // end namespace gui\r
 } // end namespace irr\r
 \r
-#endif // _IRR_COMPILE_WITH_GUI_\r
-\r
 #endif\r
-\r