wrong move

[wxWidgets.git] / include / wx / gtk / bitmap.h

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index ac0581bd40e2d381faee5eaf332dee368dd0bdfe..0469a707f0746c8fb2ddfafdcde3c73b2add0641 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -57,7 +57,7 @@ public:
 #ifdef wxNEEDS_CHARPP
     // needed for old GCC
     wxBitmap(char** data)
 #ifdef wxNEEDS_CHARPP
     // needed for old GCC
     wxBitmap(char** data)

-    { *this = wxBitmap(wx_const_cast(const char* const*, data)); }
+    { *this = wxBitmap(const_cast<const char* const*>(data)); }

 #endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
 #if wxUSE_IMAGE
 #endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
 #if wxUSE_IMAGE


@@ -110,10 +110,6 @@ public:
     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;
 
     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;
 

-    // Basically, this corresponds to Win32 StretchBlt()
-    wxBitmap Rescale(int clipx, int clipy, int clipwidth, int clipheight,
-                     int width, int height) const;
-

     // raw bitmap access support functions
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);
     // raw bitmap access support functions
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);