CHANGED: #1471 CCtrlBaseButton is now part of the NLGUI namespace.

--HG--
branch : gui-refactoring

code/nel/include/nel/gui/ctrl_base_button.h

@@ -22,6 +22,8 @@
 #include "nel/gui/ctrl_base.h"
 #include "nel/gui/action_handler.h"
 
+namespace NLGUI
+{
 
 	// ***************************************************************************
 	/**
@@ -248,6 +250,7 @@ protected:
 		virtual	void elementCaptured(CCtrlBase *capturedElement);
 	};
 
+}
 
 #endif // NL_CTRL_BASE_BUTTON_H
 

code/nel/src/gui/ctrl_base_button.cpp

@@ -26,11 +26,14 @@
 using namespace std;
 using namespace NLMISC;
 
+namespace
+{
+	const uint KEY_REPEAT_MIN = 100;
+	const uint KEY_REPEAT_MAX = 750;
+}
 
-// ***************************************************************************
+namespace NLGUI
-static const uint KEY_REPEAT_MIN = 100;
+{
-static const uint KEY_REPEAT_MAX = 750;
-
 
 	sint64 CCtrlBaseButton::_LastLeftClickDate = 0;
 	NLMISC::CRefPtr<CCtrlBaseButton> CCtrlBaseButton::_LastLeftClickButton;
@@ -513,3 +516,5 @@ int CCtrlBaseButton::luaRunLeftClickAction(CLuaState &ls)
 		return 0;
 	}
 
+}
+

code/ryzom/client/src/interface_v3/dbgroup_build_phrase.h

@@ -26,9 +26,14 @@
 #include "game_share/skills.h"
 
 
+namespace NLGUI
+{
+	class CCtrlBaseButton;
+}
+
+
 // ***************************************************************************
 class	CDBCtrlSheet;
-class	CCtrlBaseButton;
 class	CSBrickSheet;
 class	CViewBitmap;
 class	CViewText;

code/ryzom/client/src/interface_v3/dbgroup_combo_box.h

@@ -22,11 +22,13 @@
 #include "nel/misc/types_nl.h"
 #include "nel/gui/interface_group.h"
 
-
+namespace NLGUI
+{
+	class CCtrlBaseButton;
+}
 
 // ***************************************************************************
 class	CViewText;
-class	CCtrlBaseButton;
 class	CGroupMenu;
 
 // ***************************************************************************

code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h

@@ -23,9 +23,12 @@
 #include "list_sheet_base.h"
 #include "dbctrl_sheet.h"
 
+namespace NLGUI
+{
+	class CCtrlBaseButton;
+}
 
 // ***************************************************************************
-class	CCtrlBaseButton;
 class	CCtrlScroll;
 class CGroupContainer;
 

code/ryzom/client/src/interface_v3/dbgroup_select_number.h

@@ -23,11 +23,15 @@
 #include "nel/gui/interface_group.h"
 
 
+namespace NLGUI
+{
+	class CCtrlBaseButton;
+}
+
 
 // ***************************************************************************
 class	CViewBitmap;
 class	CViewText;
-class	CCtrlBaseButton;
 
 
 // ***************************************************************************

code/ryzom/client/src/interface_v3/group_scrolltext.h

@@ -23,9 +23,13 @@
 #include "nel/misc/types_nl.h"
 #include "nel/gui/interface_group.h"
 
+namespace NLGUI
+{
+	class CCtrlBaseButton;
+}
+
 class CGroupList;
 class CCtrlScroll;
-class CCtrlBaseButton;
 
 // Can be used to build a chat window or anything that displays sequences of strings
 /**

code/ryzom/client/src/interface_v3/interface_pointer.h

@@ -25,6 +25,7 @@ namespace NLGUI
 {
 	class CInterfaceElement;
 	class CCtrlBase;
+	class CCtrlBaseButton;
 	class CInterfaceGroup;
 }
 
@@ -62,7 +63,7 @@ typedef CInterfacePtr<class CCtrlTextButton>::TInterfacePtr		CCtrlTextButtonPtr;
 typedef CInterfacePtr<class CViewText>::TInterfacePtr			CViewTextPtr;
 typedef CInterfacePtr<class CViewTextMenu>::TInterfacePtr		CViewTextMenuPtr;
 typedef CInterfacePtr<CCtrlBase>::TInterfacePtr			CCtrlBasePtr;
-typedef CInterfacePtr<class CCtrlBaseButton>::TInterfacePtr		CCtrlBaseButtonPtr;
+typedef CInterfacePtr<CCtrlBaseButton>::TInterfacePtr		CCtrlBaseButtonPtr;
 typedef CInterfacePtr<class CGroupContainer>::TInterfacePtr		CGroupContainerPtr;
 
 #endif // NL_INTERFACE_POINTER_H

code/ryzom/client/src/libwww.h

@@ -25,9 +25,13 @@ extern "C"
 #include "WWWInit.h"
 }
 
+namespace NLGUI
+{
+	class CCtrlBaseButton;
+}
+
 class CGroupList;
 class CCtrlScroll;
-class CCtrlBaseButton;
 
 // ***************************************************************************