mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-10-13 15:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing PS_RESULT errors from GUI, return values still need work

Browse Source 
Affects Ticket #128

This was SVN commit r7145.
This commit is contained in:
sluzky
2009-09-23 21:16:55 +00:00
parent f118acf979
commit 90f6641c1d
8 changed files with 110 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/IGUIObject.cpp
+4 -4
View File
@@ -147,11 +147,11 @@ void IGUIObject::AddToPointersMap(map_pObjects &ObjectMap)
// (i.e. being the base object)
if (m_Name.empty())
{
throw PS_NEEDS_NAME;
throw PSERROR_GUI_ObjectNeedsName();
}
if (ObjectMap.count(m_Name) > 0)
{
throw PS_NAME_AMBIGUITY;
throw PSERROR_GUI_NameAmbiguity();
}
else
{
@@ -195,7 +195,7 @@ void IGUIObject::AddSetting(const EGUISettingType &Type, const CStr& Name)
bool IGUIObject::MouseOver()
{
if(!GetGUI())
throw PS_NEEDS_PGUI;
throw PSERROR_GUI_OperationNeedsGUIObject();
return m_CachedActualSize.PointInside(GetMousePos());
}
@@ -282,7 +282,7 @@ PS_RESULT IGUIObject::SetSetting(const CStr& Setting, const CStr& Value, const b
PS_RESULT IGUIObject::GetSettingType(const CStr& Setting, EGUISettingType &Type) const
{
if (!SettingExists(Setting))
return PS_SETTING_FAIL;
throw PSERROR_GUI_InvalidSetting();
if (m_Settings.find(Setting) == m_Settings.end())
return PS_FAIL;