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

build fixes for wxUSE_VALIDATORS==0

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/combog.cpp
View File

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

4
src/mac/carbon/checkbox.cpp
View File

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

5
src/mac/carbon/treectrl.cpp
View File

@@ -29,14 +29,17 @@ wxTreeCtrl::wxTreeCtrl()
bool wxTreeCtrl::Create(wxWindow *parent, bool wxTreeCtrl::Create(wxWindow *parent,
wxWindowID id, const wxPoint& pos, const wxSize& size, 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_imageListNormal = NULL;
m_imageListState = NULL; m_imageListState = NULL;
m_textCtrl = NULL; m_textCtrl = NULL;
SetName(name); SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator); SetValidator(validator);
#endif
SetParent(parent); SetParent(parent);
m_windowStyle = style; m_windowStyle = style;