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

remove never-implemented palette support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2010-01-05 17:53:37 +00:00
parent 22909aef2d
commit b2bf3ac658
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/bitmap.cpp
View File

@@ -14,7 +14,6 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/app.h" #include "wx/app.h"
#include "wx/palette.h"
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/math.h" #include "wx/math.h"
#include "wx/image.h" #include "wx/image.h"
@@ -178,9 +177,6 @@ public:
int m_width; int m_width;
int m_height; int m_height;
int m_bpp; int m_bpp;
#if wxUSE_PALETTE
wxPalette *m_palette;
#endif // wxUSE_PALETTE
}; };
wxBitmapRefData::wxBitmapRefData() wxBitmapRefData::wxBitmapRefData()
@@ -191,9 +187,6 @@ wxBitmapRefData::wxBitmapRefData()
m_width = 0; m_width = 0;
m_height = 0; m_height = 0;
m_bpp = 0; m_bpp = 0;
#if wxUSE_PALETTE
m_palette = NULL;
#endif // wxUSE_PALETTE
} }
wxBitmapRefData::~wxBitmapRefData() wxBitmapRefData::~wxBitmapRefData()
@@ -203,9 +196,6 @@ wxBitmapRefData::~wxBitmapRefData()
if (m_pixbuf) if (m_pixbuf)
g_object_unref (m_pixbuf); g_object_unref (m_pixbuf);
delete m_mask; delete m_mask;
#if wxUSE_PALETTE
delete m_palette;
#endif // wxUSE_PALETTE
} }
@@ -666,9 +656,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
#if wxUSE_PALETTE #if wxUSE_PALETTE
wxPalette *wxBitmap::GetPalette() const wxPalette *wxBitmap::GetPalette() const
{ {
wxCHECK_MSG(IsOk(), NULL, wxT("invalid bitmap")); return NULL;
return M_BMPDATA->m_palette;
} }
void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette)) void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
@@ -900,10 +888,6 @@ wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
gdk_draw_drawable(newRef->m_mask->m_bitmap, gdk_draw_drawable(newRef->m_mask->m_bitmap,
gc, oldRef->m_mask->m_bitmap, 0, 0, 0, 0, -1, -1); gc, oldRef->m_mask->m_bitmap, 0, 0, 0, 0, -1, -1);
} }
#if wxUSE_PALETTE
// implement this if SetPalette is ever implemented
wxASSERT(oldRef->m_palette == NULL);
#endif
return newRef; return newRef;
} }