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

compilation fixes for !wxUSE_STREAMS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-30 22:26:15 +00:00
parent 33a201363a
commit aaf46fd6fc
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/image.h
View File

@@ -70,7 +70,7 @@ protected:
wxString m_extension; wxString m_extension;
wxString m_mime; wxString m_mime;
long m_type; long m_type;
private: private:
DECLARE_CLASS(wxImageHandler) DECLARE_CLASS(wxImageHandler)
}; };
@@ -93,9 +93,12 @@ public:
wxImage( int width, int height ); wxImage( int width, int height );
wxImage( int width, int height, unsigned char* data, bool static_data = FALSE ); wxImage( int width, int height, unsigned char* data, bool static_data = FALSE );
wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY ); wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY );
wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
wxImage( const wxString& name, const wxString& mimetype ); wxImage( const wxString& name, const wxString& mimetype );
#if wxUSE_STREAMS
wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
wxImage( wxInputStream& stream, const wxString& mimetype ); wxImage( wxInputStream& stream, const wxString& mimetype );
#endif // wxUSE_STREAMS
wxImage( const wxImage& image ); wxImage( const wxImage& image );
wxImage( const wxImage* image ); wxImage( const wxImage* image );
@@ -116,13 +119,13 @@ public:
// creates an identical copy of the image (the = operator // creates an identical copy of the image (the = operator
// just raises the ref count) // just raises the ref count)
wxImage Copy() const; wxImage Copy() const;
// return the new image with size width*height // return the new image with size width*height
wxImage GetSubImage( const wxRect& ) const; wxImage GetSubImage( const wxRect& ) const;
// pastes image into this instance and takes care of // pastes image into this instance and takes care of
// the mask colour and out of bounds problems // the mask colour and out of bounds problems
void Paste( const wxImage &image, int x, int y ); void Paste( const wxImage &image, int x, int y );
// return the new image with size width*height // return the new image with size width*height
wxImage Scale( int width, int height ) const; wxImage Scale( int width, int height ) const;
@@ -141,7 +144,7 @@ public:
// replace one colour with another // replace one colour with another
void Replace( unsigned char r1, unsigned char g1, unsigned char b1, void Replace( unsigned char r1, unsigned char g1, unsigned char b1,
unsigned char r2, unsigned char g2, unsigned char b2 ); unsigned char r2, unsigned char g2, unsigned char b2 );
// convert to monochrome image (<r,g,b> will be replaced by white, everything else by black) // convert to monochrome image (<r,g,b> will be replaced by white, everything else by black)
wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const; wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const;
@@ -154,10 +157,10 @@ public:
// find first colour that is not used in the image and has higher // find first colour that is not used in the image and has higher
// RGB values than <startR,startG,startB> // RGB values than <startR,startG,startB>
bool FindFirstUnusedColour( unsigned char *r, unsigned char *g, unsigned char *b, bool FindFirstUnusedColour( unsigned char *r, unsigned char *g, unsigned char *b,
unsigned char startR = 1, unsigned char startG = 0, unsigned char startR = 1, unsigned char startG = 0,
unsigned char startB = 0 ); unsigned char startB = 0 );
// Set image's mask to the area of 'mask' that has <r,g,b> colour // Set image's mask to the area of 'mask' that has <r,g,b> colour
bool SetMaskFromImage(const wxImage & mask, bool SetMaskFromImage(const wxImage & mask,
unsigned char mr, unsigned char mg, unsigned char mb); unsigned char mr, unsigned char mg, unsigned char mb);
static bool CanRead( const wxString& name ); static bool CanRead( const wxString& name );