paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Avoid calling unnecessary inline functions, to work around GCC visibility issues (see #281)

Browse Source 
This was SVN commit r7030.
This commit is contained in:
Ykkrosh 2009-07-22 16:37:40 +00:00
parent 05d73edd2f
commit 21b3d13c64
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/tools/atlas/AtlasUI/ColourTester/ColourTesterColourCtrl.cpp
View File

@ -66,7 +66,7 @@ public:
void OnButton(wxCommandEvent& WXUNUSED(event)) void OnButton(wxCommandEvent& WXUNUSED(event))
{ {
wxColour c = wxGetColourFromUser(this, m_Colour); wxColour c = wxGetColourFromUser(this, m_Colour);
if (c.Ok()) if (c.IsOk())
{ {
m_Colour = c; m_Colour = c;
m_ImageCtrl->SetColour(m_Colour); m_ImageCtrl->SetColour(m_Colour);

2
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/FieldEditCtrl.cpp
View File

@ -70,7 +70,7 @@ void FieldEditCtrl_Colour::StartEdit(wxWindow* parent, wxRect WXUNUSED(rect), lo
wxColour newColour = wxGetColourFromUser(parent, oldColour); wxColour newColour = wxGetColourFromUser(parent, oldColour);
if (newColour.Ok()) // test whether the user cancelled the selection if (newColour.IsOk()) // test whether the user cancelled the selection
{ {
wxString newColourStr = wxString::Format(_T("%d %d %d"), newColour.Red(), newColour.Green(), newColour.Blue()); wxString newColourStr = wxString::Format(_T("%d %d %d"), newColour.Red(), newColour.Green(), newColour.Blue());
AtlasWindowCommandProc::GetFromParentFrame(editCtrl)->Submit( AtlasWindowCommandProc::GetFromParentFrame(editCtrl)->Submit(