AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/control.h
View File

@ -41,23 +41,9 @@ protected:
const wxPoint& pos,
const wxSize& size,
long style,
#if wxUSE_VALIDATORS
const wxValidator& validator,
#endif
const wxString& name);
// an overloaded version for the controls without validators
bool CreateControl(wxWindowBase *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
const wxString& name)
{
return CreateControl(parent, id, pos, size, style,
wxDefaultValidator, name);
}
// inherit colour and font settings from the parent window
void InheritAttributes();
};

28
include/wx/generic/listctrl.h
View File

@ -251,9 +251,7 @@ public:
const wxString &value = "",
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
int style = 0,
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
#endif
const wxString &name = "wxListTextCtrlText" );
void OnChar( wxKeyEvent &event );
void OnKillFocus( wxFocusEvent &event );
@ -379,23 +377,25 @@ class WXDLLEXPORT wxListCtrl: public wxControl
{
public:
wxListCtrl();
wxListCtrl( wxWindow *parent, wxWindowID id = -1,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
#if wxUSE_VALIDATORS
long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
#endif
const wxString &name = "listctrl" )
wxListCtrl( wxWindow *parent,
wxWindowID id = -1,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLC_ICON,
const wxValidator& validator = wxDefaultValidator,
const wxString &name = "listctrl" )
{
Create(parent, id, pos, size, style, validator, name);
}
~wxListCtrl();
bool Create( wxWindow *parent, wxWindowID id = -1,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
#if wxUSE_VALIDATORS
long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
#endif
const wxString &name = "listctrl" );
bool Create( wxWindow *parent,
wxWindowID id = -1,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLC_ICON,
const wxValidator& validator = wxDefaultValidator,
const wxString &name = "listctrl" );
bool GetColumn( int col, wxListItem& item ) const;
bool SetColumn( int col, wxListItem& item );

6
include/wx/generic/treectrl.h
View File

@ -131,9 +131,7 @@ class WXDLLEXPORT wxTreeTextCtrl: public wxTextCtrl
const wxString &value = wxEmptyString,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
int style = 0,
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
#endif
const wxString &name = wxTextCtrlNameStr );
void OnChar( wxKeyEvent &event );
void OnKillFocus( wxFocusEvent &event );
@ -156,9 +154,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
#if wxUSE_VALIDATORS
const wxValidator &validator = wxDefaultValidator,
#endif
const wxString& name = wxTreeCtrlNameStr)
{
Create(parent, id, pos, size, style, validator, name);
@ -170,9 +166,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
#if wxUSE_VALIDATORS
const wxValidator &validator = wxDefaultValidator,
#endif
const wxString& name = wxTreeCtrlNameStr);
// accessors

10
include/wx/gtk/control.h
View File

@ -38,24 +38,16 @@ public:
wxControl(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
#endif
const wxString& name = wxControlNameStr)
{
Create(parent, id, pos, size, style,
#if wxUSE_VALIDATORS
validator,
#endif
name);
Create(parent, id, pos, size, style, validator, name);
}
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
#endif
const wxString& name = wxControlNameStr);
// this function will filter out '&' characters and will put the accelerator

10
include/wx/gtk1/control.h
View File

@ -38,24 +38,16 @@ public:
wxControl(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
#endif
const wxString& name = wxControlNameStr)
{
Create(parent, id, pos, size, style,
#if wxUSE_VALIDATORS
validator,
#endif
name);
Create(parent, id, pos, size, style, validator, name);
}
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
#endif
const wxString& name = wxControlNameStr);
// this function will filter out '&' characters and will put the accelerator

10
include/wx/motif/control.h
View File

@ -29,14 +29,6 @@ class WXDLLEXPORT wxControl: public wxWindow
public:
wxControl();
wxControl( wxWindow *parent,
wxWindowID id,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = 0,
const wxString &name = wxControlNameStr );
#if wxUSE_VALIDATORS
wxControl( wxWindow *parent,
wxWindowID id,
const wxPoint &pos = wxDefaultPosition,
@ -44,7 +36,7 @@ public:
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxControlNameStr );
#endif
~wxControl();
// simulates the event, returns TRUE if the event was processed

4
include/wx/msw/control.h
View File

@ -30,9 +30,7 @@ public:
wxControl(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
#endif
const wxString& name = wxControlNameStr)
{
Create(parent, id, pos, size, style, validator, name);
@ -41,9 +39,7 @@ public:
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
#endif
const wxString& name = wxControlNameStr);
virtual ~wxControl();

9
include/wx/validate.h
View File

@ -16,14 +16,17 @@
#pragma interface "validate.h"
#endif
#include "wx/event.h"
#if defined(wxUSE_VALIDATORS) && !wxUSE_VALIDATORS
// wxWindows is compiled without support for wxValidator
// wxWindows is compiled without support for wxValidator, but we still
// want to be able to pass wxDefaultValidator to the functions which take
// a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
// everywhere
class WXDLLEXPORT wxValidator;
#define wxDefaultValidator (*((wxValidator *)NULL))
#else // wxUSE_VALIDATORS
#include "wx/event.h"
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxWindowBase;

7
include/wx/window.h
View File

@ -30,9 +30,7 @@
#include "wx/region.h"
#include "wx/utils.h"
#if wxUSE_VALIDATORS
#include "wx/validate.h" // defines wxDefaultValidator
#endif // wxUSE_VALIDATORS
#include "wx/validate.h" // for wxDefaultValidator (always include it)
#if wxUSE_ACCEL
#include "wx/accel.h"
@ -121,10 +119,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
#endif // wxUSE_VALIDATORS
const wxString& name = wxPanelNameStr);
virtual ~wxWindowBase();

2
include/wx/wx.h
View File

@ -75,6 +75,8 @@
#include "wx/dirdlg.h"
#include "wx/toolbar.h"
#include "wx/validate.h" // always include, even if !wxUSE_VALIDATORS
#if wxUSE_VALIDATORS
#include "wx/valtext.h"
#endif // wxUSE_VALIDATORS

2
src/common/ctrlcmn.cpp
View File

@ -42,9 +42,7 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
const wxPoint& pos,
const wxSize& size,
long style,
#if wxUSE_VALIDATORS
const wxValidator& validator,
#endif
const wxString& name)
{
// even if it's possible to create controls without parents in some port,

5
src/common/wincmn.cpp
View File

@ -158,9 +158,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
const wxPoint& WXUNUSED(pos),
const wxSize& WXUNUSED(size),
long style,
#if wxUSE_VALIDATORS
const wxValidator& validator,
#endif
const wxString& name)
{
// m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other
@ -174,7 +172,10 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
SetName(name);
SetWindowStyleFlag(style);
SetParent(parent);
#if wxUSE_VALIDATORS
SetValidator(validator);
#endif // wxUSE_VALIDATORS
return TRUE;
}

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;

8
src/generic/tbarsmpl.cpp
View File

@ -303,8 +303,8 @@ bool wxToolBarSimple::Realize()
m_lastX = m_xMargin;
m_lastY += maxToolHeight + m_toolPacking;
}
tool->m_x = (m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
tool->m_y = (m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
m_lastX += maxToolWidth + m_toolPacking;
}
@ -316,8 +316,8 @@ bool wxToolBarSimple::Realize()
m_lastX += (maxToolWidth + m_toolPacking);
m_lastY = m_yMargin;
}
tool->m_x = (m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
tool->m_y = (m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
m_lastY += maxToolHeight + m_toolPacking;
}

25
src/generic/treectrl.cpp
View File

@ -208,13 +208,18 @@ BEGIN_EVENT_TABLE(wxTreeTextCtrl,wxTextCtrl)
EVT_KILL_FOCUS (wxTreeTextCtrl::OnKillFocus)
END_EVENT_TABLE()
wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent, const wxWindowID id,
bool *accept, wxString *res, wxTreeCtrl *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 )
wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent,
const wxWindowID id,
bool *accept,
wxString *res,
wxTreeCtrl *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;
@ -547,10 +552,8 @@ void wxTreeCtrl::Init()
bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style,
#if wxUSE_VALIDATORS
const wxValidator &validator,
#endif
const wxString& name )
const wxValidator &validator,
const wxString& name )
{
Init();

2
src/gtk/control.cpp
View File

@ -31,9 +31,7 @@ bool wxControl::Create( wxWindow *parent,
const wxPoint &pos,
const wxSize &size,
long style,
#if wxUSE_VALIDATORS
const wxValidator& validator,
#endif
const wxString &name )
{
bool ret = wxWindow::Create(parent, id, pos, size, style, name);

8
src/gtk/region.cpp
View File

@ -349,22 +349,22 @@ void wxRegionIterator::Reset( const wxRegion& region )
wxRegionIterator::operator bool () const
{
return m_current < m_region.GetRectList()->Number();
return m_current < (size_t)m_region.GetRectList()->Number();
}
bool wxRegionIterator::HaveRects() const
{
return m_current < m_region.GetRectList()->Number();
return m_current < (size_t)m_region.GetRectList()->Number();
}
void wxRegionIterator::operator ++ ()
{
if (m_current < m_region.GetRectList()->Number()) ++m_current;
if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
}
void wxRegionIterator::operator ++ (int)
{
if (m_current < m_region.GetRectList()->Number()) ++m_current;
if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
}
wxCoord wxRegionIterator::GetX() const

2
src/gtk1/control.cpp
View File

@ -31,9 +31,7 @@ bool wxControl::Create( wxWindow *parent,
const wxPoint &pos,
const wxSize &size,
long style,
#if wxUSE_VALIDATORS
const wxValidator& validator,
#endif
const wxString &name )
{
bool ret = wxWindow::Create(parent, id, pos, size, style, name);

8
src/gtk1/region.cpp
View File

@ -349,22 +349,22 @@ void wxRegionIterator::Reset( const wxRegion& region )
wxRegionIterator::operator bool () const
{
return m_current < m_region.GetRectList()->Number();
return m_current < (size_t)m_region.GetRectList()->Number();
}
bool wxRegionIterator::HaveRects() const
{
return m_current < m_region.GetRectList()->Number();
return m_current < (size_t)m_region.GetRectList()->Number();
}
void wxRegionIterator::operator ++ ()
{
if (m_current < m_region.GetRectList()->Number()) ++m_current;
if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
}
void wxRegionIterator::operator ++ (int)
{
if (m_current < m_region.GetRectList()->Number()) ++m_current;
if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
}
wxCoord wxRegionIterator::GetX() const

15
src/motif/control.cpp
View File

@ -43,17 +43,6 @@ wxControl::wxControl()
m_inSetValue = FALSE;
}
wxControl::wxControl( wxWindow *parent,
wxWindowID id,
const wxPoint &pos,
const wxSize &size,
long style,
const wxString &name )
{
(void)Create(parent, id, pos, size, style, name);
}
#if wxUSE_VALIDATORS
wxControl::wxControl( wxWindow *parent,
wxWindowID id,
const wxPoint &pos,
@ -63,9 +52,11 @@ wxControl::wxControl( wxWindow *parent,
const wxString &name)
{
(void)Create(parent, id, pos, size, style, name);
#if wxUSE_VALIDATORS
SetValidator(validator);
}
#endif
}
wxControl::~wxControl()
{

2
src/msw/control.cpp
View File

@ -60,9 +60,7 @@ wxControl::~wxControl()
bool wxControl::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size, long style,
#if wxUSE_VALIDATORS
const wxValidator& validator,
#endif
const wxString& name)
{
bool rval = wxWindow::Create(parent, id, pos, size, style, name);