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

another blind fix for wxX11 compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-04-28 02:08:57 +00:00
parent 1d2f48b681
commit 6298b8d0b2
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/wx/x11/bitmap.h
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: bitmap.h // Name: x11/bitmap.h
// Purpose: wxBitmap class // Purpose: wxBitmap class
// Author: Julian Smart, Robert Roebling // Author: Julian Smart, Robert Roebling
// Modified by: // Modified by:
// Created: 17/09/98 // Created: 17/09/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart, Robert Roebling // Copyright: (c) Julian Smart, Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BITMAP_H_ #ifndef _WX_BITMAP_H_
@@ -42,7 +42,7 @@ public:
wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap, int paletteIndex );
wxMask( const wxBitmap& bitmap ); wxMask( const wxBitmap& bitmap );
~wxMask(); ~wxMask();
bool Create( const wxBitmap& bitmap, const wxColour& colour ); bool Create( const wxBitmap& bitmap, const wxColour& colour );
bool Create( const wxBitmap& bitmap, int paletteIndex ); bool Create( const wxBitmap& bitmap, int paletteIndex );
bool Create( const wxBitmap& bitmap ); bool Create( const wxBitmap& bitmap );
@@ -50,14 +50,14 @@ public:
// implementation // implementation
WXPixmap GetBitmap() const { return m_bitmap; } WXPixmap GetBitmap() const { return m_bitmap; }
void SetBitmap( WXPixmap bitmap ) { m_bitmap = bitmap; } void SetBitmap( WXPixmap bitmap ) { m_bitmap = bitmap; }
WXDisplay *GetDisplay() const { return m_display; } WXDisplay *GetDisplay() const { return m_display; }
void SetDisplay( WXDisplay *display ) { m_display = display; } void SetDisplay( WXDisplay *display ) { m_display = display; }
private: private:
WXPixmap m_bitmap; WXPixmap m_bitmap;
WXDisplay *m_display; WXDisplay *m_display;
private: private:
DECLARE_DYNAMIC_CLASS(wxMask) DECLARE_DYNAMIC_CLASS(wxMask)
}; };
@@ -84,8 +84,8 @@ public:
wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); } wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
wxBitmap( const wxBitmap& bmp ); wxBitmap( const wxBitmap& bmp );
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } virtual ~wxBitmap();
~wxBitmap();
wxBitmap& operator = ( const wxBitmap& bmp ); wxBitmap& operator = ( const wxBitmap& bmp );
bool operator == ( const wxBitmap& bmp ) const; bool operator == ( const wxBitmap& bmp ) const;
bool operator != ( const wxBitmap& bmp ) const; bool operator != ( const wxBitmap& bmp ) const;
@@ -100,15 +100,19 @@ public:
int GetHeight() const; int GetHeight() const;
int GetWidth() const; int GetWidth() const;
int GetDepth() const; int GetDepth() const;
#if wxUSE_IMAGE
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
wxImage ConvertToImage() const; wxImage ConvertToImage() const;
bool CreateFromImage(const wxImage& image, int depth = -1);
#endif // wxUSE_IMAGE
// copies the contents and mask of the given (colour) icon to the bitmap // copies the contents and mask of the given (colour) icon to the bitmap
virtual bool CopyFromIcon(const wxIcon& icon); virtual bool CopyFromIcon(const wxIcon& icon);
wxMask *GetMask() const; wxMask *GetMask() const;
void SetMask( wxMask *mask ); void SetMask( wxMask *mask );
wxBitmap GetSubBitmap( const wxRect& rect ) const; wxBitmap GetSubBitmap( const wxRect& rect ) const;
bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL ) const; bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL ) const;
@@ -134,10 +138,9 @@ public:
WXPixmap GetDrawable() const; WXPixmap GetDrawable() const;
WXDisplay *GetDisplay() const; WXDisplay *GetDisplay() const;
protected: protected:
bool CreateFromXpm(const char **bits); bool CreateFromXpm(const char **bits);
bool CreateFromImage(const wxImage& image, int depth = -1);
private: private:
DECLARE_DYNAMIC_CLASS(wxBitmap) DECLARE_DYNAMIC_CLASS(wxBitmap)