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

first pass of wxUniv merge - nothing works, most parts don't even compile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/common/valgen.cpp
View File

@@ -272,28 +272,30 @@ bool wxGenericValidator::TransferToWindow(void)
return TRUE;
}
} else
// array controls
#if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
// array controls
// NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
// MUST come first:
if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
{
wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
if (m_pArrayInt)
// NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
{
// clear all selections
int i;
for (i = 0 ; i < pControl->Number(); ++i)
pControl->Check(i, FALSE);
// select each item in our array
unsigned u;
for (u = 0; u < m_pArrayInt->Count(); ++u)
pControl->Check(m_pArrayInt->Item(u));
return TRUE;
}
wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
if (m_pArrayInt)
{
// clear all selections
size_t i,
count = pControl->GetCount();
for ( i = 0 ; i < count; i++ )
pControl->Check(i, FALSE);
// select each item in our array
count = m_pArrayInt->GetCount();
for ( i = 0 ; i < count; i++ )
pControl->Check(m_pArrayInt->Item(i));
return TRUE;
}
else
return FALSE;
} else
return FALSE;
} else
#endif
#if wxUSE_LISTBOX
if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
@@ -302,13 +304,16 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_pArrayInt)
{
// clear all selections
int i;
for (i = 0 ; i < pControl->Number(); ++i)
size_t i,
count = pControl->GetCount();
for ( i = 0 ; i < count; i++ )
pControl->Deselect(i);
// select each item in our array
unsigned u;
for (u = 0; u < m_pArrayInt->Count(); ++u)
pControl->SetSelection(m_pArrayInt->Item(u));
count = m_pArrayInt->GetCount();
for ( i = 0 ; i < count; i++ )
pControl->SetSelection(m_pArrayInt->Item(i));
return TRUE;
}
} else
@@ -481,27 +486,31 @@ bool wxGenericValidator::TransferFromWindow(void)
return TRUE;
}
} else
// array controls
#if wxUSE_CHECKLISTBOX
#ifndef __WIN16__
// array controls
// NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
// MUST come first:
// NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:
if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
{
wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
if (m_pArrayInt)
if (m_pArrayInt)
{
// clear our array
m_pArrayInt->Clear();
// add each selected item to our array
int i;
for (i = 0 ; i < pControl->Number(); ++i)
size_t i,
count = pControl->GetCount();
for ( i = 0; i < count; i++ )
{
if (pControl->IsChecked(i))
m_pArrayInt->Add(i);
}
return TRUE;
}
else
return FALSE;
else
return FALSE;
} else
#endif
#endif
@@ -513,11 +522,16 @@ bool wxGenericValidator::TransferFromWindow(void)
{
// clear our array
m_pArrayInt->Clear();
// add each selected item to our array
int i;
for (i = 0 ; i < pControl->Number(); ++i)
size_t i,
count = pControl->GetCount();
for ( i = 0; i < count; i++ )
{
if (pControl->Selected(i))
m_pArrayInt->Add(i);
}
return TRUE;
}
} else