Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempts to reduce errors in compile farm for

Browse Source 
unusual combinations of platform/app


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-08-24 10:01:47 +00:00
parent b96a8bdb60
commit 3f2b72b240
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
utils/dialoged/src/winprop.cpp
View File

@@ -1449,7 +1449,12 @@ wxProperty *wxRadioBoxPropertyInfo::GetProperty(wxString& name)
wxRadioBox *radioBox = (wxRadioBox *)m_propertyWindow;
if (name == "numberRowsOrCols")
{
// FIXME: Set/GetNumberOfRowsOrCols only implemented on Motif, MSW and Mac
#if defined(__WXMSW__) || defined(__WXMOTIF__) || defined(__WXMAC__)
return new wxProperty("numberRowsOrCols", (long)radioBox->GetNumberOfRowsOrCols(), "integer");
#else
return new wxProperty("numberRowsOrCols", (long)1, "integer");
#endif
}
if (name == "orientation")
{
@@ -1480,10 +1485,13 @@ bool wxRadioBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
wxRadioBox *radioBox = (wxRadioBox *)m_propertyWindow;
if (name == "numberRowsOrCols")
{
// FIXME: Set/GetNumberOfRowsOrCols only implemented on Motif, MSW and Mac
#if defined(__WXMSW__) || defined(__WXMOTIF__) || defined(__WXMAC__)
wxResourceManager::GetCurrentResourceManager()->DeselectItemIfNecessary(radioBox);
radioBox->SetNumberOfRowsOrCols((int)property->GetValue().IntegerValue());
m_propertyWindow = wxResourceManager::GetCurrentResourceManager()->RecreateWindowFromResource(radioBox, this);
#endif
return TRUE;
}
else if (name == "orientation")
@@ -1587,7 +1595,12 @@ bool wxRadioBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
resource->SetStringValues(slist);
}
*/
// FIXME: Set/GetNumberOfRowsOrCols only implemented on Motif, MSW and Mac
#if defined(__WXMSW__) || defined(__WXMOTIF__) || defined(__WXMAC__)
resource->SetValue1(rbox->GetNumberOfRowsOrCols());
#else
resource->SetValue1(1);
#endif
return wxItemPropertyInfo::InstantiateResource(resource);
}