X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c74fc1e130e8abc1a1b4a91255b17f657cd372dd..bba3f9b5bcea0f00077a7962878cbb4c10852d23:/src/gtk/bitmap.cpp

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 0f7ab2e9ef..88d5a0d6d8 100644
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -23,6 +23,8 @@
 
 #include "wx/rawbmp.h"
 
+#include "wx/gtk/private/object.h"
+
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
@@ -164,10 +166,9 @@ bool wxMask::Create( const wxBitmap& bitmap )
 
     if (!m_bitmap) return false;
 
-    GdkGC *gc = gdk_gc_new( m_bitmap );
+    wxGtkObject<GdkGC> gc(gdk_gc_new( m_bitmap ));
     gdk_gc_set_function(gc, GDK_COPY_INVERT);
     gdk_draw_drawable(m_bitmap, gc, bitmap.GetPixmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight());
-    g_object_unref (gc);
 
     return true;
 }
@@ -300,19 +301,18 @@ bool wxBitmap::Create( int width, int height, int depth )
     return Ok();
 }
 
-wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight, int newx, int newy) const
+wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
+                           int width, int height) const
 {
     wxBitmap bmp;
 
     wxCHECK_MSG(Ok(), bmp, wxT("invalid bitmap"));
 
-    int width = wxMax(newx, 1);
-    int height = wxMax(newy, 1);
-    width = wxMin(width, clipwidth);
-    height = wxMin(height, clipheight);
+    width = wxMax(width, 1);
+    height = wxMax(height, 1);
 
-    const double scale_x = double(newx) / M_BMPDATA->m_width;
-    const double scale_y = double(newy) / M_BMPDATA->m_height;
+    const double scale_x = double(width) / clipwidth;
+    const double scale_y = double(height) / clipheight;
 
     // Converting to pixbuf, scaling with gdk_pixbuf_scale, and converting
     // back, is faster than scaling pixmap ourselves.
@@ -335,7 +335,7 @@ wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
     // images, but the only one which preserves sharp edges
     gdk_pixbuf_scale(
         pixbuf, pixbuf_scaled,
-        0, 0, width, height, -clipx, -clipy, scale_x, scale_y,
+        0, 0, width, height, -clipx*scale_x, -clipy*scale_y, scale_x, scale_y,
         GDK_INTERP_NEAREST);
 
     g_object_unref(pixbuf);
@@ -414,12 +414,11 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& image, int depth)
     else
     {
         SetPixmap(gdk_pixmap_new(wxGetRootWindow()->window, w, h, depth));
-        GdkGC* gc = gdk_gc_new(M_BMPDATA->m_pixmap);
+        wxGtkObject<GdkGC> gc(gdk_gc_new(M_BMPDATA->m_pixmap));
         gdk_draw_rgb_image(
             M_BMPDATA->m_pixmap, gc,
             0, 0, w, h,
             GDK_RGB_DITHER_NONE, image.GetData(), w * 3);
-        g_object_unref(gc);
     }
 
     const wxByte* alpha = image.GetAlpha();
@@ -542,10 +541,9 @@ wxImage wxBitmap::ConvertToImage() const
         {
             // mono bitmaps are inverted, i.e. 0 is white
             pixmap_invert = gdk_pixmap_new(pixmap, w, h, 1);
-            GdkGC* gc = gdk_gc_new(pixmap_invert);
+            wxGtkObject<GdkGC> gc(gdk_gc_new(pixmap_invert));
             gdk_gc_set_function(gc, GDK_COPY_INVERT);
             gdk_draw_drawable(pixmap_invert, gc, pixmap, 0, 0, 0, 0, w, h);
-            g_object_unref(gc);
             pixmap = pixmap_invert;
         }
         // create a pixbuf which shares data with the wxImage
@@ -665,9 +663,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
     else
     {
         ret.Create(rect.width, rect.height, M_BMPDATA->m_bpp);
-        GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
+        wxGtkObject<GdkGC> gc(gdk_gc_new( ret.GetPixmap() ));
         gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
-        g_object_unref (gc);
     }
     // make mask, unless there is already alpha
     if (GetMask() && !HasAlpha())
@@ -675,9 +672,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         wxMask *mask = new wxMask;
         mask->m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, rect.width, rect.height, 1 );
 
-        GdkGC *gc = gdk_gc_new( mask->m_bitmap );
+        wxGtkObject<GdkGC> gc(gdk_gc_new( mask->m_bitmap ));
         gdk_draw_drawable(mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height);
-        g_object_unref (gc);
 
         ret.SetMask( mask );
     }
@@ -939,10 +935,9 @@ wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
             oldRef->m_pixmap, oldRef->m_width, oldRef->m_height,
             // use pixmap depth, m_bpp may not match
             gdk_drawable_get_depth(oldRef->m_pixmap));
-        GdkGC* gc = gdk_gc_new(newRef->m_pixmap);
+        wxGtkObject<GdkGC> gc(gdk_gc_new(newRef->m_pixmap));
         gdk_draw_drawable(
             newRef->m_pixmap, gc, oldRef->m_pixmap, 0, 0, 0, 0, -1, -1);
-        g_object_unref(gc);
     }
     if (oldRef->m_pixbuf != NULL)
     {
@@ -953,10 +948,9 @@ wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
         newRef->m_mask = new wxMask;
         newRef->m_mask->m_bitmap = gdk_pixmap_new(
             oldRef->m_mask->m_bitmap, oldRef->m_width, oldRef->m_height, 1);
-        GdkGC* gc = gdk_gc_new(newRef->m_mask->m_bitmap);
+        wxGtkObject<GdkGC> gc(gdk_gc_new(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);
-        g_object_unref(gc);
     }
 #if wxUSE_PALETTE
     // implement this if SetPalette is ever implemented