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

Use defs.h (and automatically setup.h and chkconf.h) before first wxUSE_* check (bug #1164141).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-03-16 16:18:31 +00:00
parent 3e275c2d1d
commit 2ecf902bc8
39 changed files with 183 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/image.h
View File

@@ -14,7 +14,7 @@
#pragma interface "image.h"
#endif
#include "wx/setup.h"
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/string.h"
#include "wx/gdicmn.h"
@@ -182,9 +182,9 @@ public:
// Paste the image or part of this image into an image of the given size at the pos
// any newly exposed areas will be filled with the rgb colour
// by default if r = g = b = -1 then fill with this image's mask colour or find and
// by default if r = g = b = -1 then fill with this image's mask colour or find and
// set a suitable mask colour
wxImage Size( const wxSize& size, const wxPoint& pos,
wxImage Size( const wxSize& size, const wxPoint& pos,
int r = -1, int g = -1, int b = -1 ) const;
// pastes image into this instance and takes care of
@@ -200,7 +200,7 @@ public:
wxImage& Rescale( int width, int height ) { return *this = Scale(width, height); }
// 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); }
// Rotates the image about the given point, 'angle' radians.