X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5696ebb3755e246bcba78ddbef798a07e2cf4141..a8cb1a4947bbbf5e18ce52448f4c3bb4cff4daee:/src/gtk/bitmap.cpp diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 6bbf68cd47..1a4c20bb62 100644 --- a/src/gtk/bitmap.cpp +++ b/src/gtk/bitmap.cpp @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "bitmap.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -474,7 +470,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, if (!pixval) { char bit=1; - char shift = bit << w % 8; + char shift = bit << (w % 8); outbyte |= shift; } @@ -537,7 +533,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight, if (pixval) { char bit=1; - char shift = bit << w % 8; + char shift = bit << (w % 8); outbyte |= shift; } @@ -1286,7 +1282,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const { GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, gdk_pixbuf_get_has_alpha(GetPixbuf()), - 8, GetWidth(), GetHeight()); + 8, rect.width, rect.height); ret.SetPixbuf(pixbuf); gdk_pixbuf_copy_area(GetPixbuf(), rect.x, rect.y, rect.width, rect.height, @@ -1594,7 +1590,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) #endif } -void wxBitmap::UngetRawData(wxPixelDataBase& data) +void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data)) { } @@ -1625,19 +1621,36 @@ wxBitmapHandler::~wxBitmapHandler() { } -bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth) +bool wxBitmapHandler::Create(wxBitmap * WXUNUSED(bitmap), + void * WXUNUSED(data), + long WXUNUSED(type), + int WXUNUSED(width), + int WXUNUSED(height), + int WXUNUSED(depth)) { + wxFAIL_MSG( _T("not implemented") ); + return false; } -bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) +bool wxBitmapHandler::LoadFile(wxBitmap * WXUNUSED(bitmap), + const wxString& WXUNUSED(name), + long WXUNUSED(flags), + int WXUNUSED(desiredWidth), + int WXUNUSED(desiredHeight)) { + wxFAIL_MSG( _T("not implemented") ); + return false; } -bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette) +bool wxBitmapHandler::SaveFile(const wxBitmap * WXUNUSED(bitmap), + const wxString& WXUNUSED(name), + int WXUNUSED(type), + const wxPalette * WXUNUSED(palette)) { + wxFAIL_MSG( _T("not implemented") ); + return false; }