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

Missing wxUSE_PALETTE markup (#1369489).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-11-30 07:58:37 +00:00
parent 7e04489676
commit 0b04c4e0bd
6 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/gtk/bitmap.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: bitmap.h // Name: wx/gtk/bitmap.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// RCS-ID: $Id$ // RCS-ID: $Id$
@@ -40,19 +40,23 @@ class WXDLLIMPEXP_CORE wxMask: public wxObject
public: public:
wxMask(); wxMask();
wxMask( const wxBitmap& bitmap, const wxColour& colour ); wxMask( const wxBitmap& bitmap, const wxColour& colour );
#if wxUSE_PALETTE
wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap, int paletteIndex );
#endif // wxUSE_PALETTE
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 );
#if wxUSE_PALETTE
bool Create( const wxBitmap& bitmap, int paletteIndex ); bool Create( const wxBitmap& bitmap, int paletteIndex );
#endif // wxUSE_PALETTE
bool Create( const wxBitmap& bitmap ); bool Create( const wxBitmap& bitmap );
// implementation // implementation
GdkBitmap *m_bitmap; GdkBitmap *m_bitmap;
GdkBitmap *GetBitmap() const; GdkBitmap *GetBitmap() const;
private: private:
DECLARE_DYNAMIC_CLASS(wxMask) DECLARE_DYNAMIC_CLASS(wxMask)
}; };
@@ -79,11 +83,11 @@ public:
bool Ok() const; bool Ok() const;
bool Create(int width, int height, int depth = -1); bool Create(int width, int height, int depth = -1);
int GetHeight() const; int GetHeight() const;
int GetWidth() const; int GetWidth() const;
int GetDepth() const; int GetDepth() const;
wxImage ConvertToImage() const; wxImage ConvertToImage() const;
// 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
@@ -91,7 +95,7 @@ public:
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, bool SaveFile(const wxString &name, wxBitmapType type,
@@ -125,10 +129,10 @@ public:
bool HasPixbuf() const; bool HasPixbuf() const;
GdkPixbuf *GetPixbuf() const; GdkPixbuf *GetPixbuf() const;
#endif #endif
// Basically, this corresponds to Win32 StretchBlt() // Basically, this corresponds to Win32 StretchBlt()
wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height ); wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
// raw bitmap access support functions // raw bitmap access support functions
void *GetRawData(wxPixelDataBase& data, int bpp); void *GetRawData(wxPixelDataBase& data, int bpp);
void UngetRawData(wxPixelDataBase& data); void UngetRawData(wxPixelDataBase& data);
@@ -161,7 +165,7 @@ private:
#endif #endif
friend class wxBitmapHandler; friend class wxBitmapHandler;
private: private:
DECLARE_DYNAMIC_CLASS(wxBitmap) DECLARE_DYNAMIC_CLASS(wxBitmap)
}; };

4
include/wx/gtk/dc.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dc.h // Name: wx/gtk/dc.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@@ -41,7 +41,9 @@ public:
wxDC(); wxDC();
~wxDC() { } ~wxDC() { }
#if wxUSE_PALETTE
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
#endif // wxUSE_PALETTE
// Resolution in pixels per logical inch // Resolution in pixels per logical inch
virtual wxSize GetPPI() const; virtual wxSize GetPPI() const;

24
include/wx/gtk1/bitmap.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: bitmap.h // Name: wx/gtk/bitmap.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// RCS-ID: $Id$ // RCS-ID: $Id$
@@ -40,19 +40,23 @@ class WXDLLIMPEXP_CORE wxMask: public wxObject
public: public:
wxMask(); wxMask();
wxMask( const wxBitmap& bitmap, const wxColour& colour ); wxMask( const wxBitmap& bitmap, const wxColour& colour );
#if wxUSE_PALETTE
wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap, int paletteIndex );
#endif // wxUSE_PALETTE
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 );
#if wxUSE_PALETTE
bool Create( const wxBitmap& bitmap, int paletteIndex ); bool Create( const wxBitmap& bitmap, int paletteIndex );
#endif // wxUSE_PALETTE
bool Create( const wxBitmap& bitmap ); bool Create( const wxBitmap& bitmap );
// implementation // implementation
GdkBitmap *m_bitmap; GdkBitmap *m_bitmap;
GdkBitmap *GetBitmap() const; GdkBitmap *GetBitmap() const;
private: private:
DECLARE_DYNAMIC_CLASS(wxMask) DECLARE_DYNAMIC_CLASS(wxMask)
}; };
@@ -79,11 +83,11 @@ public:
bool Ok() const; bool Ok() const;
bool Create(int width, int height, int depth = -1); bool Create(int width, int height, int depth = -1);
int GetHeight() const; int GetHeight() const;
int GetWidth() const; int GetWidth() const;
int GetDepth() const; int GetDepth() const;
wxImage ConvertToImage() const; wxImage ConvertToImage() const;
// 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
@@ -91,7 +95,7 @@ public:
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, bool SaveFile(const wxString &name, wxBitmapType type,
@@ -125,10 +129,10 @@ public:
bool HasPixbuf() const; bool HasPixbuf() const;
GdkPixbuf *GetPixbuf() const; GdkPixbuf *GetPixbuf() const;
#endif #endif
// Basically, this corresponds to Win32 StretchBlt() // Basically, this corresponds to Win32 StretchBlt()
wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height ); wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height );
// raw bitmap access support functions // raw bitmap access support functions
void *GetRawData(wxPixelDataBase& data, int bpp); void *GetRawData(wxPixelDataBase& data, int bpp);
void UngetRawData(wxPixelDataBase& data); void UngetRawData(wxPixelDataBase& data);
@@ -161,7 +165,7 @@ private:
#endif #endif
friend class wxBitmapHandler; friend class wxBitmapHandler;
private: private:
DECLARE_DYNAMIC_CLASS(wxBitmap) DECLARE_DYNAMIC_CLASS(wxBitmap)
}; };

4
include/wx/gtk1/dc.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dc.h // Name: wx/gtk/dc.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@@ -41,7 +41,9 @@ public:
wxDC(); wxDC();
~wxDC() { } ~wxDC() { }
#if wxUSE_PALETTE
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
#endif // wxUSE_PALETTE
// Resolution in pixels per logical inch // Resolution in pixels per logical inch
virtual wxSize GetPPI() const; virtual wxSize GetPPI() const;

12
src/gtk/bitmap.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: bitmap.cpp // Name: src/gtk/bitmap.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// RCS-ID: $Id$ // RCS-ID: $Id$
@@ -71,11 +71,13 @@ wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
Create( bitmap, colour ); Create( bitmap, colour );
} }
#if wxUSE_PALETTE
wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex ) wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
{ {
m_bitmap = (GdkBitmap *) NULL; m_bitmap = (GdkBitmap *) NULL;
Create( bitmap, paletteIndex ); Create( bitmap, paletteIndex );
} }
#endif // wxUSE_PALETTE
wxMask::wxMask( const wxBitmap& bitmap ) wxMask::wxMask( const wxBitmap& bitmap )
{ {
@@ -182,6 +184,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
return true; return true;
} }
#if wxUSE_PALETTE
bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex ) bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
{ {
unsigned char r,g,b; unsigned char r,g,b;
@@ -193,6 +196,7 @@ bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
return Create(bitmap, wxColour(r, g, b)); return Create(bitmap, wxColour(r, g, b));
} }
#endif // wxUSE_PALETTE
bool wxMask::Create( const wxBitmap& bitmap ) bool wxMask::Create( const wxBitmap& bitmap )
{ {
@@ -271,7 +275,9 @@ wxBitmapRefData::~wxBitmapRefData()
gdk_pixbuf_unref( m_pixbuf ); gdk_pixbuf_unref( m_pixbuf );
#endif #endif
delete m_mask; delete m_mask;
#if wxUSE_PALETTE
delete m_palette; delete m_palette;
#endif // wxUSE_PALETTE
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1388,6 +1394,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
return true; return true;
} }
#if wxUSE_PALETTE
wxPalette *wxBitmap::GetPalette() const wxPalette *wxBitmap::GetPalette() const
{ {
if (!Ok()) if (!Ok())
@@ -1400,6 +1407,7 @@ void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
{ {
// TODO // TODO
} }
#endif // wxUSE_PALETTE
void wxBitmap::SetHeight( int height ) void wxBitmap::SetHeight( int height )
{ {
@@ -1658,5 +1666,3 @@ bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap),
{ {
// TODO: Insert handler based on GdkPixbufs handler later // TODO: Insert handler based on GdkPixbufs handler later
} }

12
src/gtk1/bitmap.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: bitmap.cpp // Name: src/gtk/bitmap.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// RCS-ID: $Id$ // RCS-ID: $Id$
@@ -71,11 +71,13 @@ wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
Create( bitmap, colour ); Create( bitmap, colour );
} }
#if wxUSE_PALETTE
wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex ) wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
{ {
m_bitmap = (GdkBitmap *) NULL; m_bitmap = (GdkBitmap *) NULL;
Create( bitmap, paletteIndex ); Create( bitmap, paletteIndex );
} }
#endif // wxUSE_PALETTE
wxMask::wxMask( const wxBitmap& bitmap ) wxMask::wxMask( const wxBitmap& bitmap )
{ {
@@ -182,6 +184,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
return true; return true;
} }
#if wxUSE_PALETTE
bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex ) bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
{ {
unsigned char r,g,b; unsigned char r,g,b;
@@ -193,6 +196,7 @@ bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
return Create(bitmap, wxColour(r, g, b)); return Create(bitmap, wxColour(r, g, b));
} }
#endif // wxUSE_PALETTE
bool wxMask::Create( const wxBitmap& bitmap ) bool wxMask::Create( const wxBitmap& bitmap )
{ {
@@ -271,7 +275,9 @@ wxBitmapRefData::~wxBitmapRefData()
gdk_pixbuf_unref( m_pixbuf ); gdk_pixbuf_unref( m_pixbuf );
#endif #endif
delete m_mask; delete m_mask;
#if wxUSE_PALETTE
delete m_palette; delete m_palette;
#endif // wxUSE_PALETTE
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1388,6 +1394,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
return true; return true;
} }
#if wxUSE_PALETTE
wxPalette *wxBitmap::GetPalette() const wxPalette *wxBitmap::GetPalette() const
{ {
if (!Ok()) if (!Ok())
@@ -1400,6 +1407,7 @@ void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
{ {
// TODO // TODO
} }
#endif // wxUSE_PALETTE
void wxBitmap::SetHeight( int height ) void wxBitmap::SetHeight( int height )
{ {
@@ -1658,5 +1666,3 @@ bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap),
{ {
// TODO: Insert handler based on GdkPixbufs handler later // TODO: Insert handler based on GdkPixbufs handler later
} }