build fixes for wxUSE_VALIDATORS==0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-04-03 02:44:32 +00:00
parent c91922129f
commit 43147cef6c
3 changed files with 9 additions and 2 deletions

View File

@@ -392,6 +392,7 @@ void wxGenericComboCtrl::SetCustomPaintWidth( int width )
tc->RemoveEventHandler(m_textEvtHandler);
delete m_textEvtHandler;
#if wxUSE_VALIDATORS
wxValidator* pValidator = tc->GetValidator();
if ( pValidator )
{
@@ -400,6 +401,7 @@ void wxGenericComboCtrl::SetCustomPaintWidth( int width )
delete pValidator;
}
else
#endif
{
CreateTextCtrl( tcCreateStyle, wxDefaultValidator );
}

View File

@@ -136,11 +136,13 @@ bool wxBitmapCheckBox::Create(wxWindow *parent,
const wxPoint& pos,
const wxSize& size,
long style,
const wxValidator& validator,
const wxValidator& wxVALIDATOR_PARAM(validator),
const wxString& name)
{
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
m_windowStyle = style;
if (parent)

View File

@@ -29,14 +29,17 @@ wxTreeCtrl::wxTreeCtrl()
bool wxTreeCtrl::Create(wxWindow *parent,
wxWindowID id, const wxPoint& pos, const wxSize& size,
long style, const wxValidator& validator, const wxString& name)
long style, const wxValidator& wxVALIDATOR_PARAM(validator),
const wxString& name)
{
m_imageListNormal = NULL;
m_imageListState = NULL;
m_textCtrl = NULL;
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif
SetParent(parent);
m_windowStyle = style;