16-bit fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-15 10:20:46 +00:00
parent 392f4b1b14
commit 5dd26b0839
8 changed files with 22 additions and 5 deletions
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -314,8 +314,13 @@ void wxListLineData::CalculateSize( wxDC *dc, int spacing )
                m_bound_all.height = lh;
                if (item->HasImage())
                {
+#ifdef __WIN16__
+                    int w = 0;
+                    int h = 0;
+#else
                    wxCoord w = 0;
                    wxCoord h = 0;
+#endif
                    m_owner->GetImageSize( item->GetImage(), w, h );
                    m_bound_all.width += 4 + w;
                    if (h > m_bound_all.height) m_bound_all.height = h;