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@62042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-09-23 16:32:32 +00:00
parent 95e74456a2
commit b4bde7a74b
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/validate.h
View File

@@ -87,7 +87,7 @@ extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
// a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS" // a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
// everywhere // everywhere
class WXDLLIMPEXP_FWD_CORE wxValidator; class WXDLLIMPEXP_FWD_CORE wxValidator;
#define wxDefaultValidator (*(NULL)) #define wxDefaultValidator (*reinterpret_cast<wxValidator*>(NULL))
// this macro allows to avoid warnings about unused parameters when // this macro allows to avoid warnings about unused parameters when
// wxUSE_VALIDATORS == 0 // wxUSE_VALIDATORS == 0

2
src/msw/bmpbuttn.cpp
View File

@@ -127,7 +127,7 @@ bool wxBitmapButton::Create(wxWindow *parent,
const wxBitmap& bitmap, const wxBitmap& bitmap,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, long style, const wxSize& size, long style,
const wxValidator& wxVALIDATOR_PARAM(validator), const wxValidator& validator,
const wxString& name) const wxString& name)
{ {
if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style, if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style,

5
src/propgrid/advprops.cpp
View File

@@ -276,11 +276,12 @@ wxPGWindowList wxPGSpinCtrlEditor::CreateControls( wxPropertyGrid* propgrid, wxP
wnd2->SetRange( INT_MIN, INT_MAX ); wnd2->SetRange( INT_MIN, INT_MAX );
wnd2->SetValue( 0 ); wnd2->SetValue( 0 );
wxWindow* wnd1 = wxPGTextCtrlEditor::CreateControls(propgrid, property, pos, tcSz).m_primary;
#if wxUSE_VALIDATORS
// Let's add validator to make sure only numbers can be entered // Let's add validator to make sure only numbers can be entered
wxTextValidator validator(wxFILTER_NUMERIC, &m_tempString); wxTextValidator validator(wxFILTER_NUMERIC, &m_tempString);
wxTextCtrl* wnd1 = (wxTextCtrl*) wxPGTextCtrlEditor::CreateControls( propgrid, property, pos, tcSz ).m_primary;
wnd1->SetValidator(validator); wnd1->SetValidator(validator);
#endif
return wxPGWindowList(wnd1, wnd2); return wxPGWindowList(wnd1, wnd2);
} }

2
src/propgrid/props.cpp
View File

@@ -2120,12 +2120,14 @@ bool wxArrayEditorDialog::Create( wxWindow *parent,
wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL );
m_edValue = new wxTextCtrl(this,21,wxEmptyString, m_edValue = new wxTextCtrl(this,21,wxEmptyString,
wxDefaultPosition,wxDefaultSize,wxTE_PROCESS_ENTER); wxDefaultPosition,wxDefaultSize,wxTE_PROCESS_ENTER);
#if wxUSE_VALIDATORS
wxValidator* validator = GetTextCtrlValidator(); wxValidator* validator = GetTextCtrlValidator();
if ( validator ) if ( validator )
{ {
m_edValue->SetValidator( *validator ); m_edValue->SetValidator( *validator );
delete validator; delete validator;
} }
#endif
rowsizer->Add( m_edValue, rowsizer->Add( m_edValue,
1, wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxALL, spacing ); 1, wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxALL, spacing );