root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 12.0 no-patch

Browse Source 
Files correlati     : 
Commento            : Aggiornamento codice per passaggio a Visual Studio 2017

git-svn-id: svn://10.65.10.50/branches/R_10_00@24259 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
mtollari 2018-01-09 16:45:05 +00:00
parent 425522aebc
commit 841a2a0d04
1 changed files with 263 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/wx28X/include/wx/image.h
View File

@ -254,7 +254,9 @@ public:
// resizes the image in place // resizes the image in place
wxImage& Resize(const wxSize& size, const wxPoint& pos, wxImage& Resize(const wxSize& size, const wxPoint& pos,
int r = -1, int g = -1, int b = -1 ) { return *this = Size(size, pos, r, g, b); } int r = -1, int g = -1, int b = -1) {
return *this = Size(size, pos, r, g, b);
}
// Rotates the image about the given point, 'angle' radians. // Rotates the image about the given point, 'angle' radians.
// Returns the rotated image, leaving this image intact. // Returns the rotated image, leaving this image intact.
@ -409,6 +411,15 @@ public:
static HSVValue RGBtoHSV(const RGBValue& rgb); static HSVValue RGBtoHSV(const RGBValue& rgb);
static RGBValue HSVtoRGB(const HSVValue& hsv); static RGBValue HSVtoRGB(const HSVValue& hsv);
// Ridefinito causa problemi con VS2017
wxImage& operator=(const wxImage& other)
{
if (this != &other)
{
Ref(other);
}
return *this;
}
protected: protected:
static wxList sm_handlers; static wxList sm_handlers;