From df32d0e99b8fdb8751469eab31c35593102a2418 Mon Sep 17 00:00:00 2001 From: twanvl Date: Fri, 21 Jan 2011 14:55:42 +0000 Subject: [PATCH] make console panel compile correctly in vc7.1, wx2.6 git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1632 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/gui/set/console_panel.cpp | 2 +- src/mse.vc71.vcproj | 6 ++++++ src/util/prec.hpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gui/set/console_panel.cpp b/src/gui/set/console_panel.cpp index 0e2a65a9..d4d6f690 100644 --- a/src/gui/set/console_panel.cpp +++ b/src/gui/set/console_panel.cpp @@ -99,7 +99,7 @@ class MessageCtrl : public wxScrolledWindow { Refresh(false); } - int find_point(int y) { + size_t find_point(int y) { // TODO: could do a binary search here for (size_t i = 0 ; i < messages.size() ; ++i) { if (y >= messages[i]->top && y < messages[i]->bottom()) return i; diff --git a/src/mse.vc71.vcproj b/src/mse.vc71.vcproj index 93bfbf71..115f3549 100644 --- a/src/mse.vc71.vcproj +++ b/src/mse.vc71.vcproj @@ -576,6 +576,12 @@ + + + + diff --git a/src/util/prec.hpp b/src/util/prec.hpp index e4e72a4c..5cebd0d3 100644 --- a/src/util/prec.hpp +++ b/src/util/prec.hpp @@ -74,7 +74,7 @@ typedef wxOutputStream OutputStream; typedef wxEvent wxMouseCaptureLostEvent; #define EVT_MOUSE_CAPTURE_LOST(handler) // ignore #define wxEVT_MOUSE_CAPTURE_LOST 12345678 // not an actual event type - #define wxAutoBufferedPaintDCBase wxBufferedPaintDC + #define wxAutoBufferedPaintDC wxBufferedPaintDC #endif // ----------------------------------------------------------------------------- : Other aliasses