CHANGED: #1471 CCtrlTooltip is now in the NELGUI library and is under NLGUI namespace.

code/nel/include/nel/gui/ctrl_tooltip.h

@@ -25,31 +25,34 @@
 namespace NLGUI
 {
 	class CEventDescriptor;
+
+
+	/**
+	 * \author Matthieu 'Mr TRAP' Besson
+	 * \author Nevrax France
+	 * \date 2003
+	 */
+	class CCtrlToolTip : public CCtrlBase
+	{
+	public:
+		DECLARE_UI_CLASS(CCtrlToolTip)
+		/// Constructor
+		CCtrlToolTip(const TCtorParam &param) : CCtrlBase(param) {}
+
+		virtual bool handleEvent (const NLGUI::CEventDescriptor& eventDesc);
+		virtual void draw();
+		virtual bool		parse (xmlNodePtr cur, CInterfaceGroup *parentGroup);
+		// Can do nothing with tooltip (but display it :) )
+		virtual	bool		isCapturable() const {return false;}
+		virtual void        serial(NLMISC::IStream &f);
+	public:
+
+	};
+
+
 }
 
-/**
- * \author Matthieu 'Mr TRAP' Besson
- * \author Nevrax France
- * \date 2003
- */
-class CCtrlToolTip : public CCtrlBase
-{
-public:
-	DECLARE_UI_CLASS(CCtrlToolTip)
-	/// Constructor
-	CCtrlToolTip(const TCtorParam &param) : CCtrlBase(param) {}
-
-	virtual bool handleEvent (const NLGUI::CEventDescriptor& eventDesc);
-	virtual void draw();
-	virtual bool		parse (xmlNodePtr cur, CInterfaceGroup *parentGroup);
-	// Can do nothing with tooltip (but display it :) )
-	virtual	bool		isCapturable() const {return false;}
-	virtual void        serial(NLMISC::IStream &f);
-public:
-
-};
-
-
 #endif // RZ_CTRL_TOOLTIP_H
 
 /* End of ctrl_tooltip.h */
+

code/nel/src/gui/ctrl_tooltip.cpp

@@ -17,7 +17,7 @@
 
 
 // ----------------------------------------------------------------------------
-#include "ctrl_tooltip.h"
+#include "nel/gui/ctrl_tooltip.h"
 #include "nel/misc/xml_auto_ptr.h"
 
 // ----------------------------------------------------------------------------
@@ -29,27 +29,33 @@ NLMISC_REGISTER_OBJECT(CViewBase, CCtrlToolTip, std::string, "tooltip");
 
 REGISTER_UI_CLASS(CCtrlToolTip)
 
-// ----------------------------------------------------------------------------
-void CCtrlToolTip::draw ()
+namespace NLGUI
 {
+
+	// ----------------------------------------------------------------------------
+	void CCtrlToolTip::draw ()
+	{
+	}
+
+	// ----------------------------------------------------------------------------
+	bool CCtrlToolTip::handleEvent (const NLGUI::CEventDescriptor& event)
+	{
+		if (CCtrlBase::handleEvent(event)) return true;
+		return false;
+	}
+
+	// ----------------------------------------------------------------------------
+	bool CCtrlToolTip::parse(xmlNodePtr cur, CInterfaceGroup *parentGroup)
+	{
+		if (!CCtrlBase::parse(cur, parentGroup)) return false;
+		return true;
+	}
+
+	// ----------------------------------------------------------------------------
+	void CCtrlToolTip::serial(NLMISC::IStream &f)
+	{
+		CCtrlBase::serial(f);
+	}
+
 }
 
-// ----------------------------------------------------------------------------
-bool CCtrlToolTip::handleEvent (const NLGUI::CEventDescriptor& event)
-{
-	if (CCtrlBase::handleEvent(event)) return true;
-	return false;
-}
-
-// ----------------------------------------------------------------------------
-bool CCtrlToolTip::parse(xmlNodePtr cur, CInterfaceGroup *parentGroup)
-{
-	if (!CCtrlBase::parse(cur, parentGroup)) return false;
-	return true;
-}
-
-// ----------------------------------------------------------------------------
-void CCtrlToolTip::serial(NLMISC::IStream &f)
-{
-	CCtrlBase::serial(f);
-}

code/ryzom/client/src/interface_v3/interface_parser.cpp

@@ -55,7 +55,7 @@
 #include "nel/gui/ctrl_scroll.h"
 #include "nel/gui/ctrl_button.h"
 #include "nel/gui/ctrl_col_pick.h"
-#include "ctrl_tooltip.h"
+#include "nel/gui/ctrl_tooltip.h"
 #include "ctrl_text_button.h"
 #include "group_paragraph.h" // For CCtrlLink
 // DBCtrl

code/ryzom/client/src/interface_v3/view_text.cpp

@@ -24,7 +24,7 @@
 #include "view_text.h"
 #include "interface_manager.h"
 #include "group_container.h" // CCtrlResizer
-#include "ctrl_tooltip.h"
+#include "nel/gui/ctrl_tooltip.h"
 
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/lua_ihm.h"

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

@@ -23,7 +23,11 @@
 #include "../misc.h"
 #include "nel/3d/u_text_context.h"
 
-class CCtrlToolTip;
+namespace NLGUI
+{
+	class CCtrlToolTip;
+}
+
 
 /**
  * class implementing a text view