don't set minimal column width, it should be possible to set it even to 0 if desired...

[wxWidgets.git] / src / gtk / bitmap.cpp

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 28c472572b8da94257959d8cc2a3ac05880f9bf9..46ffd4b0ca898f3fc39ebd7a26d3a29e560d3ae1 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.cpp
+// Name:        src/gtk/bitmap.cpp
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
@@ -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"
 
@@ -23,9 +19,9 @@
 #include "wx/image.h"
 #include "wx/dcmemory.h"
 #include "wx/app.h"
-#include "wx/rawbmp.h"
 
 #ifdef __WXGTK20__
+#include "wx/rawbmp.h"
     // need this to get gdk_image_new_bitmap()
     #define GDK_ENABLE_BROKEN
 #endif
@@ -75,11 +71,13 @@ wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
     Create( bitmap, colour );
 }
 
+#if wxUSE_PALETTE
 wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
 {
     m_bitmap = (GdkBitmap *) NULL;
     Create( bitmap, paletteIndex );
 }
+#endif // wxUSE_PALETTE
 
 wxMask::wxMask( const wxBitmap& bitmap )
 {
@@ -186,6 +184,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
     return true;
 }
 
+#if wxUSE_PALETTE
 bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
 {
     unsigned char r,g,b;
@@ -197,6 +196,7 @@ bool wxMask::Create( const wxBitmap& bitmap, int paletteIndex )
 
     return Create(bitmap, wxColour(r, g, b));
 }
+#endif // wxUSE_PALETTE
 
 bool wxMask::Create( const wxBitmap& bitmap )
 {
@@ -275,7 +275,9 @@ wxBitmapRefData::~wxBitmapRefData()
         gdk_pixbuf_unref( m_pixbuf );
 #endif
     delete m_mask;
+#if wxUSE_PALETTE
     delete m_palette;
+#endif // wxUSE_PALETTE
 }
 
 //-----------------------------------------------------------------------------
@@ -474,7 +476,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 +539,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 +1288,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,
@@ -1392,6 +1394,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
     return true;
 }
 
+#if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {
     if (!Ok())
@@ -1404,6 +1407,7 @@ void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
 {
     // TODO
 }
+#endif // wxUSE_PALETTE
 
 void wxBitmap::SetHeight( int height )
 {
@@ -1594,7 +1598,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 #endif
 }
 
-void wxBitmap::UngetRawData(wxPixelDataBase& data)
+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data))
 {
 }
 
@@ -1625,19 +1629,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;
 }
 
@@ -1645,5 +1666,3 @@ bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int
 {
     // TODO: Insert handler based on GdkPixbufs handler later
 }
-
-