From e44fed2cb2401f5139c47e19884be85320fcdad2 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 10 Jul 2000 19:02:24 +0000
Subject: [PATCH] Added missing consts to wxSize operators. Corrected #ifdef
 for BC++/OLE automation class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/generic.rsp | 1 +
 include/wx/gdicmn.h     | 4 ++--
 src/msw/ole/automtn.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 8acd566e60..1c0ee6d7ca 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -1075,6 +1075,7 @@ demos/life/*.def
 demos/life/*.ico
 demos/life/*.xpm
 demos/life/*.txt
+demos/life/*.lif
 demos/life/bitmaps/*.xpm
 demos/life/bitmaps/*.bmp
 
diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 457c2da1e0..4336002d1b 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -197,8 +197,8 @@ public:
     bool operator==(const wxSize& sz) const { return x == sz.x && y == sz.y; }
 
     // FIXME are these really useful? If they're, we should have += &c as well
-    wxSize operator+(const wxSize& sz) { return wxSize(x + sz.x, y + sz.y); }
-    wxSize operator-(const wxSize& sz) { return wxSize(x - sz.x, y - sz.y); }
+    wxSize operator+(const wxSize& sz) const { return wxSize(x + sz.x, y + sz.y); }
+    wxSize operator-(const wxSize& sz) const { return wxSize(x - sz.x, y - sz.y); }
 
     // accessors
     void Set(int xx, int yy) { x = xx; y = yy; }
diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index d20c519a67..9ea5f213aa 100644
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -24,7 +24,7 @@
 
 // Watcom C++ gives a linker error if this is compiled in.
 // With Borland C++, all samples crash if this is compiled in.
-#if !defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
+#if !defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520))
 
 #include "wx/log.h"
 #include "wx/msw/ole/automtn.h"