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

1. more warnings fixes in gtk/region.cpp and common/tbarsmpl.cpp

Browse Source 
2. wxWindow::Create() always takes a wxValidator parameter, even if
   !wxUSE_VALIDATORS - it is just ignored then, tons of #if wxUSE_VALIDATORS
   removed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-06 16:47:48 +00:00
parent a6fc8ae3c2
commit 674ac8b919
21 changed files with 71 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/generic/listctrl.cpp
View File

@@ -1027,13 +1027,18 @@ BEGIN_EVENT_TABLE(wxListTextCtrl,wxTextCtrl)
EVT_KILL_FOCUS (wxListTextCtrl::OnKillFocus)
END_EVENT_TABLE()
wxListTextCtrl::wxListTextCtrl( wxWindow *parent, const wxWindowID id,
bool *accept, wxString *res, wxListMainWindow *owner,
const wxString &value, const wxPoint &pos, const wxSize &size,
#if wxUSE_VALIDATORS
int style, const wxValidator& validator, const wxString &name ) :
#endif
wxTextCtrl( parent, id, value, pos, size, style, validator, name )
wxListTextCtrl::wxListTextCtrl( wxWindow *parent,
const wxWindowID id,
bool *accept,
wxString *res,
wxListMainWindow *owner,
const wxString &value,
const wxPoint &pos,
const wxSize &size,
int style,
const wxValidator& validator,
const wxString &name )
: wxTextCtrl( parent, id, value, pos, size, style, validator, name )
{
m_res = res;
m_accept = accept;
@@ -2679,9 +2684,7 @@ bool wxListCtrl::Create(wxWindow *parent,
const wxPoint &pos,
const wxSize &size,
long style,
#if wxUSE_VALIDATORS
const wxValidator &validator,
#endif
const wxString &name)
{
m_imageListNormal = (wxImageList *) NULL;
@@ -2695,19 +2698,7 @@ bool wxListCtrl::Create(wxWindow *parent,
style = style | wxLC_LIST;
}
bool ret = wxControl::Create( parent,
id,
pos,
size,
style,
#if wxUSE_VALIDATORS
validator,
#endif
name );
#if wxUSE_VALIDATORS
SetValidator( validator );
#endif
bool ret = wxControl::Create( parent, id, pos, size, style, validator, name );
if (style & wxSUNKEN_BORDER)
style -= wxSUNKEN_BORDER;