aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-25 16:26:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
dfighter1985 2012-06-16 04:16:12 +02:00
parent db38a00135
commit a0b411d35c
5 changed files with 61 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/ryzom/client/src/interface_v3/ctrl_tooltip.h → code/nel/include/nel/gui/ctrl_tooltip.h
View file

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

38
code/ryzom/client/src/interface_v3/ctrl_tooltip.cpp → code/nel/src/gui/ctrl_tooltip.cpp
View file

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

2
code/ryzom/client/src/interface_v3/interface_parser.cpp
View file

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

2
code/ryzom/client/src/interface_v3/view_text.cpp
View file

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

6
code/ryzom/client/src/interface_v3/view_text.h
View file

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