Fixed DoShowModal again, to check that the oldFocus object isn't dead.
Added integer handling for wxTextCtrls in wxGenericValidator. Added virtual function to wxGenericDragImage so it can do _really_ smooth dragging under app control. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -258,11 +258,18 @@ bool wxGenericValidator::TransferToWindow(void)
|
||||
if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
|
||||
{
|
||||
wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
|
||||
if (m_pString)
|
||||
{
|
||||
pControl->SetValue(*m_pString) ;
|
||||
return TRUE;
|
||||
}
|
||||
if (m_pString)
|
||||
{
|
||||
pControl->SetValue(*m_pString) ;
|
||||
return TRUE;
|
||||
}
|
||||
else if (m_pInt)
|
||||
{
|
||||
wxString str;
|
||||
str.Printf("%d", *m_pInt);
|
||||
pControl->SetValue(str);
|
||||
return TRUE;
|
||||
}
|
||||
} else
|
||||
#if wxUSE_CHECKLISTBOX
|
||||
#ifndef __WIN16__
|
||||
@@ -474,6 +481,11 @@ bool wxGenericValidator::TransferFromWindow(void)
|
||||
*m_pString = pControl->GetValue() ;
|
||||
return TRUE;
|
||||
}
|
||||
else if (m_pInt)
|
||||
{
|
||||
*m_pInt = atoi(pControl->GetValue());
|
||||
return TRUE;
|
||||
}
|
||||
} else
|
||||
#if wxUSE_CHECKLISTBOX
|
||||
#ifndef __WIN16__
|
||||
|
Reference in New Issue
Block a user