Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added missing consts to wxSize operators.

Browse Source 
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
This commit is contained in:
Julian Smart
2000-07-10 19:02:24 +00:00
parent 8598648fd1
commit e44fed2cb2
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distrib/msw/generic.rsp
View File

@@ -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

4
include/wx/gdicmn.h
View File

@@ -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; }

2
src/msw/ole/automtn.cpp
View File

@@ -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"