From b220b1a2c8aeb6cf8f74ea7b3c354241b0a4f222 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 17 Oct 2005 17:57:04 +0000 Subject: [PATCH] Warning fix (instead of silencing int->short with typecast, have the same type internally as in interface). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/treectrl.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h index dd2782f4ca..2abdade711 100644 --- a/include/wx/treectrl.h +++ b/include/wx/treectrl.h @@ -12,6 +12,14 @@ #ifndef _WX_TREECTRL_H_BASE_ #define _WX_TREECTRL_H_BASE_ +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + +#include "wx/defs.h" + +#if wxUSE_TREECTRL + #include "wx/control.h" #include "wx/treebase.h" #include "wx/textctrl.h" // wxTextCtrl::ms_classinfo used through CLASSINFO macro @@ -391,7 +399,7 @@ protected: m_ownsImageListState; // spacing between left border and the text - unsigned short m_spacing; + unsigned int m_spacing; DECLARE_NO_COPY_CLASS(wxTreeCtrlBase) @@ -404,9 +412,9 @@ protected: #if defined(__WXUNIVERSAL__) #include "wx/generic/treectlg.h" #elif defined(__WXPALMOS__) - #include "wx/palmos/treectrl.h" + #include "wx/palmos/treectrl.h" #elif defined(__WXMSW__) - #include "wx/msw/treectrl.h" + #include "wx/msw/treectrl.h" #elif defined(__WXMOTIF__) #include "wx/generic/treectlg.h" #elif defined(__WXGTK__) @@ -419,5 +427,6 @@ protected: #include "wx/generic/treectlg.h" #endif -#endif // _WX_TREECTRL_H_BASE_ +#endif // wxUSE_TREECTRL +#endif // _WX_TREECTRL_H_BASE_ -- 2.45.2