CHANGED: #1471 CCtrlButton is now under the NLGUI namespace.
--HG-- branch : gui-refactoring
This commit is contained in:
parent
aca24ff510
commit
a90445fa03
6 changed files with 352 additions and 337 deletions
|
@ -25,7 +25,6 @@
|
||||||
namespace NLGUI
|
namespace NLGUI
|
||||||
{
|
{
|
||||||
class CEventDescriptor;
|
class CEventDescriptor;
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <Class description>
|
* <Class description>
|
||||||
|
@ -96,6 +95,7 @@ private:
|
||||||
sint32 _Align; /// 1st bit - Left/Right (0/1) 2nd bit - Bottom/Top (0/1)
|
sint32 _Align; /// 1st bit - Left/Right (0/1) 2nd bit - Bottom/Top (0/1)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
#endif // RZ_CTRL_BUTTON_H
|
#endif // RZ_CTRL_BUTTON_H
|
||||||
|
|
||||||
|
|
|
@ -14,9 +14,6 @@
|
||||||
// You should have received a copy of the GNU Affero General Public License
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include "nel/gui/ctrl_button.h"
|
#include "nel/gui/ctrl_button.h"
|
||||||
#include "nel/misc/xml_auto_ptr.h"
|
#include "nel/misc/xml_auto_ptr.h"
|
||||||
#include "nel/gui/widget_manager.h"
|
#include "nel/gui/widget_manager.h"
|
||||||
|
@ -29,6 +26,9 @@ using namespace NL3D;
|
||||||
|
|
||||||
NLMISC_REGISTER_OBJECT(CViewBase, CCtrlButton, std::string, "button");
|
NLMISC_REGISTER_OBJECT(CViewBase, CCtrlButton, std::string, "button");
|
||||||
|
|
||||||
|
namespace NLGUI
|
||||||
|
{
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
bool CCtrlButton::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
|
bool CCtrlButton::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
|
||||||
{
|
{
|
||||||
|
@ -345,3 +345,6 @@ bool CCtrlButton::getMouseOverShape(string &texName, uint8 &rot, CRGBA &col)
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,9 +27,13 @@
|
||||||
#include "dbctrl_sheet.h"
|
#include "dbctrl_sheet.h"
|
||||||
#include "view_text.h"
|
#include "view_text.h"
|
||||||
|
|
||||||
|
namespace NLGUI
|
||||||
|
{
|
||||||
|
class CCtrlButton;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
class CCtrlButton;
|
|
||||||
class CCtrlScroll;
|
class CCtrlScroll;
|
||||||
class CHandlerListSheetTradeSelect;
|
class CHandlerListSheetTradeSelect;
|
||||||
class CHandlerListSheetTradeRightClick;
|
class CHandlerListSheetTradeRightClick;
|
||||||
|
|
|
@ -23,9 +23,13 @@
|
||||||
#include "dbgroup_list_sheet_text.h"
|
#include "dbgroup_list_sheet_text.h"
|
||||||
#include "game_share/bot_chat_types.h"
|
#include "game_share/bot_chat_types.h"
|
||||||
|
|
||||||
|
namespace NLGUI
|
||||||
|
{
|
||||||
|
class CCtrlButton;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// ***************************************************************************
|
// ***************************************************************************
|
||||||
class CCtrlButton;
|
|
||||||
class CCtrlScroll;
|
class CCtrlScroll;
|
||||||
class CHandlerListSheetTradeSelect;
|
class CHandlerListSheetTradeSelect;
|
||||||
class CHandlerListSheetTradeRightClick;
|
class CHandlerListSheetTradeRightClick;
|
||||||
|
|
|
@ -26,10 +26,10 @@
|
||||||
namespace NLGUI
|
namespace NLGUI
|
||||||
{
|
{
|
||||||
class CEventDescriptorLocalised;
|
class CEventDescriptorLocalised;
|
||||||
|
class CCtrlButton;
|
||||||
}
|
}
|
||||||
|
|
||||||
class CInterfaceList;
|
class CInterfaceList;
|
||||||
class CCtrlButton;
|
|
||||||
class CCtrlScroll;
|
class CCtrlScroll;
|
||||||
class CViewText;
|
class CViewText;
|
||||||
class COptionsContainerInsertion;
|
class COptionsContainerInsertion;
|
||||||
|
|
|
@ -37,9 +37,13 @@ extern "C"
|
||||||
#include "WWWInit.h"
|
#include "WWWInit.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
namespace NLGUI
|
||||||
|
{
|
||||||
|
class CCtrlButton;
|
||||||
|
}
|
||||||
|
|
||||||
class CGroupList;
|
class CGroupList;
|
||||||
class CCtrlScroll;
|
class CCtrlScroll;
|
||||||
class CCtrlButton;
|
|
||||||
class CDBGroupComboBox;
|
class CDBGroupComboBox;
|
||||||
class CGroupParagraph;
|
class CGroupParagraph;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue