Missing wxUSE_PALETTE markup (#1369489).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: bitmap.h
|
||||
// Name: wx/gtk/bitmap.h
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// RCS-ID: $Id$
|
||||
@@ -40,19 +40,23 @@ class WXDLLIMPEXP_CORE wxMask: public wxObject
|
||||
public:
|
||||
wxMask();
|
||||
wxMask( const wxBitmap& bitmap, const wxColour& colour );
|
||||
#if wxUSE_PALETTE
|
||||
wxMask( const wxBitmap& bitmap, int paletteIndex );
|
||||
#endif // wxUSE_PALETTE
|
||||
wxMask( const wxBitmap& bitmap );
|
||||
~wxMask();
|
||||
|
||||
|
||||
bool Create( const wxBitmap& bitmap, const wxColour& colour );
|
||||
#if wxUSE_PALETTE
|
||||
bool Create( const wxBitmap& bitmap, int paletteIndex );
|
||||
#endif // wxUSE_PALETTE
|
||||
bool Create( const wxBitmap& bitmap );
|
||||
|
||||
// implementation
|
||||
GdkBitmap *m_bitmap;
|
||||
|
||||
|
||||
GdkBitmap *GetBitmap() const;
|
||||
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxMask)
|
||||
};
|
||||
@@ -79,11 +83,11 @@ public:
|
||||
bool Ok() const;
|
||||
|
||||
bool Create(int width, int height, int depth = -1);
|
||||
|
||||
|
||||
int GetHeight() const;
|
||||
int GetWidth() const;
|
||||
int GetDepth() const;
|
||||
|
||||
|
||||
wxImage ConvertToImage() const;
|
||||
|
||||
// copies the contents and mask of the given (colour) icon to the bitmap
|
||||
@@ -91,7 +95,7 @@ public:
|
||||
|
||||
wxMask *GetMask() const;
|
||||
void SetMask( wxMask *mask );
|
||||
|
||||
|
||||
wxBitmap GetSubBitmap( const wxRect& rect ) const;
|
||||
|
||||
bool SaveFile(const wxString &name, wxBitmapType type,
|
||||
@@ -125,10 +129,10 @@ public:
|
||||
bool HasPixbuf() const;
|
||||
GdkPixbuf *GetPixbuf() const;
|
||||
#endif
|
||||
|
||||
|
||||
// Basically, this corresponds to Win32 StretchBlt()
|
||||
wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
|
||||
|
||||
|
||||
// raw bitmap access support functions
|
||||
void *GetRawData(wxPixelDataBase& data, int bpp);
|
||||
void UngetRawData(wxPixelDataBase& data);
|
||||
@@ -161,7 +165,7 @@ private:
|
||||
#endif
|
||||
friend class wxBitmapHandler;
|
||||
|
||||
private:
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxBitmap)
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user