Improved selection mode handling in wxGrid::SelectBlock

[wxWidgets.git] / src / common / image.cpp

diff --git a/src/common/image.cpp b/src/common/image.cpp
index ee63a318c45ad5ec572d73ad124c8823022390d3..5f61154db289e9d03f7353f94bb75dea0a67356f 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -127,6 +127,8 @@ wxImage::wxImage( const wxImage* image )
 
 void wxImage::Create( int width, int height )
 {
 
 void wxImage::Create( int width, int height )
 {

+    UnRef();
+

     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );
     m_refData = new wxImageRefData();
 
     M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );


@@ -1943,23 +1945,14 @@ wxBitmap wxImage::ConvertToBitmap() const
 
     bitmap.Create( width, height, bpp );
 
 
     bitmap.Create( width, height, bpp );
 

-    /*

     // Create mask
 
     // Create mask
 

-      GdkImage *mask_image = (GdkImage*) NULL;
-
-        if (HasMask())
-        {
-        unsigned char *mask_data = (unsigned char*)malloc( ((width >> 3)+8) * height );
-
-          mask_image =  gdk_image_new_bitmap( gdk_visual_get_system(), mask_data, width, height );
-
-            wxMask *mask = new wxMask();
-            mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
-
-              bitmap.SetMask( mask );
-              }
-    */
+    XImage *mask_image = (XImage*) NULL;
+    if (HasMask())
+    {
+        mask_image = XCreateImage( dpy, vis, 1, ZPixmap, 0, 0, width, height, 32, 0 );
+        mask_image->data = (char*) malloc( mask_image->bytes_per_line * mask_image->height );
+    }

 
     // Retrieve depth info
 
 
     // Retrieve depth info
 


@@ -1995,11 +1988,9 @@ wxBitmap wxImage::ConvertToBitmap() const
         else if ((vi->green_mask > vi->blue_mask) && (vi->blue_mask > vi->red_mask))  b_o = GBR;
     }
 
         else if ((vi->green_mask > vi->blue_mask) && (vi->blue_mask > vi->red_mask))  b_o = GBR;
     }
 

-    /*

     int r_mask = GetMaskRed();
     int g_mask = GetMaskGreen();
     int b_mask = GetMaskBlue();
     int r_mask = GetMaskRed();
     int g_mask = GetMaskGreen();
     int b_mask = GetMaskBlue();

-    */

 
     XColor colors[256];
     if (bpp == 8)
 
     XColor colors[256];
     if (bpp == 8)


@@ -2013,6 +2004,8 @@ wxBitmap wxImage::ConvertToBitmap() const
     wxSearchColor scolor( 256, colors );
     unsigned char* data = GetData();
 
     wxSearchColor scolor( 256, colors );
     unsigned char* data = GetData();
 

+    bool hasMask = HasMask();
+

     int index = 0;
     for (int y = 0; y < height; y++)
     {
     int index = 0;
     for (int y = 0; y < height; y++)
     {


@@ -2025,15 +2018,13 @@ wxBitmap wxImage::ConvertToBitmap() const
             int b = data[index];
             index++;
 
             int b = data[index];
             index++;
 

-            /*
-            if (HasMask())
+            if (hasMask)

             {
             {

-            if ((r == r_mask) && (b == b_mask) && (g == g_mask))
-            gdk_image_put_pixel( mask_image, x, y, 1 );
-            else
-            gdk_image_put_pixel( mask_image, x, y, 0 );
+              if ((r == r_mask) && (b == b_mask) && (g == g_mask))
+                XPutPixel( mask_image, x, y, 0 );
+              else
+                XPutPixel( mask_image, x, y, 1 );

             }
             }

-            */

 
             switch (bpp)
             {
 
             switch (bpp)
             {


@@ -2111,19 +2102,24 @@ wxBitmap wxImage::ConvertToBitmap() const
     XDestroyImage( data_image );
     XFreeGC( dpy, gc );
 
     XDestroyImage( data_image );
     XFreeGC( dpy, gc );
 

-    /*

     // Blit mask
     // Blit mask

+    if (HasMask())
+    {
+        wxBitmap maskBitmap(width, height, 1);

 
 

-      if (HasMask())
-      {
-      GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
+        GC gcMask = XCreateGC( dpy, (Pixmap) maskBitmap.GetPixmap(), (XtGCMask) 0, (XGCValues*)NULL );
+        XPutImage( dpy, (Drawable)maskBitmap.GetPixmap(), gcMask, mask_image, 0, 0, 0, 0, width, height );

 
 

-        gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
+        XDestroyImage( mask_image );
+        XFreeGC( dpy, gcMask );

 
 

-          gdk_image_destroy( mask_image );
-          gdk_gc_unref( mask_gc );
-          }
-    */
+        wxMask* mask = new wxMask;
+        mask->SetPixmap(maskBitmap.GetPixmap());
+
+        bitmap.SetMask(mask);
+
+        maskBitmap.SetPixmapNull();
+    }

 
     return bitmap;
 }
 
     return bitmap;
 }


@@ -2787,17 +2783,35 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
             {
                 wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0);
 
             {
                 wxRealPoint src = rotated_point (x + x1, y + y1, cos_angle, -sin_angle, p0);
 

-                if (0 < src.x && src.x < GetWidth() - 1 &&
-                    0 < src.y && src.y < GetHeight() - 1)
+                if (-0.25 < src.x && src.x < GetWidth() - 0.75 &&
+                    -0.25 < src.y && src.y < GetHeight() - 0.75)

                 {
                     // interpolate using the 4 enclosing grid-points.  Those
                     // points can be obtained using floor and ceiling of the
                     // exact coordinates of the point
                 {
                     // interpolate using the 4 enclosing grid-points.  Those
                     // points can be obtained using floor and ceiling of the
                     // exact coordinates of the point

+                        // C.M. 2000-02-17:  when the point is near the border, special care is required.

 
 

-                    const int x1 = wxCint(floor(src.x));
-                    const int y1 = wxCint(floor(src.y));
-                    const int x2 = wxCint(ceil(src.x));
-                    const int y2 = wxCint(ceil(src.y));
+                    int x1, y1, x2, y2;
+
+                    if (0 < src.x && src.x < GetWidth() - 1)
+                    {
+                        x1 = wxCint(floor(src.x));
+                        x2 = wxCint(ceil(src.x));
+                    }
+                    else    // else means that x is near one of the borders (0 or width-1)
+                    {
+                        x1 = x2 = wxCint (src.x);
+                    }
+
+                    if (0 < src.y && src.y < GetHeight() - 1)
+                    {
+                        y1 = wxCint(floor(src.y));
+                        y2 = wxCint(ceil(src.y));
+                    }
+                    else
+                    {
+                        y1 = y2 = wxCint (src.y);
+                    }

 
                     // get four points and the distances (square of the distance,
                     // for efficiency reasons) for the interpolation formula
 
                     // get four points and the distances (square of the distance,
                     // for efficiency reasons) for the interpolation formula