dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added "&" to some function pointers that was being complained at by GCC

Browse source 
This was SVN commit r116.
This commit is contained in:
Gee 2003-11-27 19:08:03 +00:00
parent 5ebe6d053e
commit 1e33ef7eb2
4 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/gui/CButton.cpp
View file

@ -135,13 +135,10 @@ void CButton::Draw()
// Do this
glBegin(GL_QUADS);
//glBegin(GL_TRIANGLES);
//CRect ca = GetBaseSettings().m_Size.GetClientArea(CRect(0, 0, g_xres, g_yres));
CRect ca = m_CachedActualSize;
glVertex2i(ca.right, ca.bottom);
glVertex2i(ca.left, ca.bottom);
glVertex2i(ca.left, ca.top);
glVertex2i(ca.right, ca.top);
glVertex2i(m_CachedActualSize.right, m_CachedActualSize.bottom);
glVertex2i(m_CachedActualSize.left, m_CachedActualSize.bottom);
glVertex2i(m_CachedActualSize.left, m_CachedActualSize.top);
glVertex2i(m_CachedActualSize.right, m_CachedActualSize.top);
/* glVertex2i(GetBaseSettings().m_Size.right, GetBaseSettings().m_Size.bottom);
glVertex2i(GetBaseSettings().m_Size.left, GetBaseSettings().m_Size.bottom);

3
source/gui/CGUI.cpp
View file

@ -603,7 +603,8 @@ void CGUI::Xerces_ReadObject(DOMElement *pElement, IGUIObject *pParent)
// Text is only okay if it's the first element i.e. <object>caption ... </object>
if (i==0)
{
// GeeTODO !!!!! CROP STRING!
// Thank you CStr =)
caption.Trim(PS_TRIM_BOTH);
// Set the setting caption to this
GUI<CStr>::SetSetting(object, "caption", caption);

2
source/gui/IGUIObject.cpp
View file

@ -314,9 +314,7 @@ void IGUIObject::UpdateCachedSize()
// use its cached size instead of the screen. Notice
// it must have just been cached for it to work.
if (m_BaseSettings.m_Absolute == false && m_pParent)
{
m_CachedActualSize = m_BaseSettings.m_Size.GetClientArea( m_pParent->m_CachedActualSize );
}
else
m_CachedActualSize = m_BaseSettings.m_Size.GetClientArea( CRect(0, 0, g_xres, g_yres) );
}

1
source/gui/IGUIObject.h
View file

@ -86,7 +86,6 @@ struct SGUIBaseSettings
bool m_Hidden;
bool m_Enabled;
bool m_Absolute;
// CRect m_Size2;
CClientArea m_Size;
CStr m_Style;
float m_Z;