From: Vadim Zeitlin Date: Thu, 6 Jan 2000 16:47:48 +0000 (+0000) Subject: 1. more warnings fixes in gtk/region.cpp and common/tbarsmpl.cpp X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/674ac8b919eecbc201b5f23b470a567cd0565e10 1. more warnings fixes in gtk/region.cpp and common/tbarsmpl.cpp 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 --- diff --git a/include/wx/control.h b/include/wx/control.h index 6f5999c7bc..79adf0144f 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -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(); }; diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 91f74cd9c9..e6e931b290 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -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 ); diff --git a/include/wx/generic/treectrl.h b/include/wx/generic/treectrl.h index 0b0f137571..8b9b85dff8 100644 --- a/include/wx/generic/treectrl.h +++ b/include/wx/generic/treectrl.h @@ -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 diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index 2a5227180e..085e5e8cfc 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -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 diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h index 2a5227180e..085e5e8cfc 100644 --- a/include/wx/gtk1/control.h +++ b/include/wx/gtk1/control.h @@ -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 diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h index 9662c06ad1..a1928d0a09 100644 --- a/include/wx/motif/control.h +++ b/include/wx/motif/control.h @@ -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 diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index 0819a8a478..f1ce9942e1 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -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(); diff --git a/include/wx/validate.h b/include/wx/validate.h index 25a4c5894a..0cd221045c 100644 --- a/include/wx/validate.h +++ b/include/wx/validate.h @@ -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; diff --git a/include/wx/window.h b/include/wx/window.h index 6c9022850f..b554906d5d 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -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(); diff --git a/include/wx/wx.h b/include/wx/wx.h index ce3c1c2605..2d40e924ec 100644 --- a/include/wx/wx.h +++ b/include/wx/wx.h @@ -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 diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp index dec9f63a0c..8e99dd0b17 100644 --- a/src/common/ctrlcmn.cpp +++ b/src/common/ctrlcmn.cpp @@ -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, diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 39fae1d525..60ed7b7025 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -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; } diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 6e5f13c902..22f0a54fcd 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -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; diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp index d439947bb5..88f45ba452 100644 --- a/src/generic/tbarsmpl.cpp +++ b/src/generic/tbarsmpl.cpp @@ -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; } diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index 30e26b9930..af2d4cf2e3 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -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(); diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index dee6ebb691..a167406a88 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -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); diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index 1b6cdf892e..edb6b766d9 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -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 diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp index dee6ebb691..a167406a88 100644 --- a/src/gtk1/control.cpp +++ b/src/gtk1/control.cpp @@ -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); diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index 1b6cdf892e..edb6b766d9 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -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 diff --git a/src/motif/control.cpp b/src/motif/control.cpp index 94f43a746b..4eb2e47f0a 100644 --- a/src/motif/control.cpp +++ b/src/motif/control.cpp @@ -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() { diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 0a177e8d69..ea72d9e9f3 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -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);