show help for the page under mouse when the [?] button is used to request help

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 9b4fc222bb29a4410d846f58379c21eed525bf49..b04bbe39059bd7dece6578feaea42c7ee68a8a4a 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -10,15 +10,17 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #include "wx/bitmap.h"
 #include "wx/bitmap.h"

-#include "wx/palette.h"
-#include "wx/icon.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dcmemory.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+#endif
+

 #include "wx/filefn.h"
 #include "wx/image.h"
 #include "wx/filefn.h"
 #include "wx/image.h"

-#include "wx/dcmemory.h"
-#include "wx/app.h"

 
 #include "wx/rawbmp.h"
     // need this to get gdk_image_new_bitmap()
 
 #include "wx/rawbmp.h"
     // need this to get gdk_image_new_bitmap()


@@ -82,7 +84,7 @@ wxMask::wxMask( const wxBitmap& bitmap )
 wxMask::~wxMask()
 {
     if (m_bitmap)
 wxMask::~wxMask()
 {
     if (m_bitmap)

-        gdk_bitmap_unref( m_bitmap );
+        g_object_unref (m_bitmap);

 }
 
 bool wxMask::Create( const wxBitmap& bitmap,
 }
 
 bool wxMask::Create( const wxBitmap& bitmap,


@@ -90,7 +92,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
 {
     if (m_bitmap)
     {
 {
     if (m_bitmap)
     {

-        gdk_bitmap_unref( m_bitmap );
+        g_object_unref (m_bitmap);

         m_bitmap = (GdkBitmap*) NULL;
     }
 
         m_bitmap = (GdkBitmap*) NULL;
     }
 


@@ -173,7 +175,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
             gdk_draw_line( m_bitmap, gc, start_x, j, i, j );
     }
 
             gdk_draw_line( m_bitmap, gc, start_x, j, i, j );
     }
 

-    gdk_gc_unref( gc );
+    g_object_unref (gc);

 
     return true;
 }
 
     return true;
 }


@@ -196,7 +198,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
 {
     if (m_bitmap)
     {
 {
     if (m_bitmap)
     {

-        gdk_bitmap_unref( m_bitmap );
+        g_object_unref (m_bitmap);

         m_bitmap = (GdkBitmap*) NULL;
     }
 
         m_bitmap = (GdkBitmap*) NULL;
     }
 


@@ -212,7 +214,7 @@ bool wxMask::Create( const wxBitmap& bitmap )
 
     gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
 
 
     gdk_wx_draw_bitmap( m_bitmap, gc, bitmap.GetBitmap(), 0, 0, 0, 0, bitmap.GetWidth(), bitmap.GetHeight() );
 

-    gdk_gc_unref( gc );
+    g_object_unref (gc);

 
     return true;
 }
 
     return true;
 }


@@ -257,11 +259,11 @@ wxBitmapRefData::wxBitmapRefData()
 wxBitmapRefData::~wxBitmapRefData()
 {
     if (m_pixmap)
 wxBitmapRefData::~wxBitmapRefData()
 {
     if (m_pixmap)

-        gdk_pixmap_unref( m_pixmap );
+        g_object_unref (m_pixmap);

     if (m_bitmap)
     if (m_bitmap)

-        gdk_bitmap_unref( m_bitmap );
+        g_object_unref (m_bitmap);

     if (m_pixbuf)
     if (m_pixbuf)

-        gdk_pixbuf_unref( m_pixbuf );
+        g_object_unref (m_pixbuf);

     delete m_mask;
 #if wxUSE_PALETTE
     delete m_palette;
     delete m_mask;
 #if wxUSE_PALETTE
     delete m_palette;


@@ -346,7 +348,7 @@ bool wxBitmap::CreateFromXpm( const char **bits )
         M_BMPDATA->m_mask->m_bitmap = mask;
     }
 
         M_BMPDATA->m_mask->m_bitmap = mask;
     }
 

-    gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+    gdk_drawable_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );

 
     M_BMPDATA->m_bpp = visual->depth;  // Can we get a different depth from create_from_xpm_d() ?
 
 
     M_BMPDATA->m_bpp = visual->depth;  // Can we get a different depth from create_from_xpm_d() ?
 


@@ -484,8 +486,8 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
                 dst[h*dstbyteperline+width/8] = outbyte;
         }
 
                 dst[h*dstbyteperline+width/8] = outbyte;
         }
 

-        gdk_image_destroy( img );
-        if (gc) gdk_gc_unref( gc );
+        g_object_unref (img);
+        if (gc) g_object_unref (gc);

 
         if ( dst )
         {
 
         if ( dst )
         {


@@ -543,7 +545,7 @@ wxBitmap wxBitmap::Rescale( int clipx, int clipy, int clipwidth, int clipheight,
             bmp.SetMask(mask);
 
             free( dst );
             bmp.SetMask(mask);
 
             free( dst );

-            gdk_image_destroy( img );
+            g_object_unref (img);

         }
 
         free( tablex );
         }
 
         free( tablex );


@@ -660,8 +662,8 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
 
     gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
 
 
     gdk_draw_image( GetBitmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
 

-    gdk_image_destroy( data_image );
-    gdk_gc_unref( data_gc );
+    g_object_unref (data_image);
+    g_object_unref (data_gc);

 
     // Blit mask
 
 
     // Blit mask
 


@@ -671,8 +673,8 @@ bool wxBitmap::CreateFromImageAsBitmap(const wxImage& img)
 
         gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
 
 
         gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
 

-        gdk_image_destroy( mask_image );
-        gdk_gc_unref( mask_gc );
+        g_object_unref (mask_image);
+        g_object_unref (mask_gc);

     }
 
     return true;
     }
 
     return true;


@@ -731,7 +733,7 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img)
                             image.GetData(),
                             width*3 );
 
                             image.GetData(),
                             width*3 );
 

-        gdk_gc_unref( gc );
+        g_object_unref (gc);

         return true;
     }
 
         return true;
     }
 


@@ -900,8 +902,8 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img)
 
     gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
 
 
     gdk_draw_image( GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
 

-    gdk_image_destroy( data_image );
-    gdk_gc_unref( data_gc );
+    g_object_unref (data_image);
+    g_object_unref (data_gc);

 
     // Blit mask
 
 
     // Blit mask
 


@@ -911,8 +913,8 @@ bool wxBitmap::CreateFromImageAsPixmap(const wxImage& img)
 
         gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
 
 
         gdk_draw_image( GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
 

-        gdk_image_destroy( mask_image );
-        gdk_gc_unref( mask_gc );
+        g_object_unref (mask_image);
+        g_object_unref (mask_gc);

     }
 
     return true;
     }
 
     return true;


@@ -1136,8 +1138,8 @@ wxImage wxBitmap::ConvertToImage() const
             }
         }
 
             }
         }
 

-        gdk_image_destroy( gdk_image );
-        if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
+        g_object_unref (gdk_image);
+        if (gdk_image_mask) g_object_unref (gdk_image_mask);

     }
 
     return image;
     }
 
     return image;


@@ -1261,8 +1263,8 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         if (ret.GetPixmap())
         {
             GdkGC *gc = gdk_gc_new( ret.GetPixmap() );
         if (ret.GetPixmap())
         {
             GdkGC *gc = gdk_gc_new( ret.GetPixmap() );

-            gdk_draw_pixmap( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
-            gdk_gc_destroy( gc );
+            gdk_draw_drawable( ret.GetPixmap(), gc, GetPixmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
+            g_object_unref (gc);

         }
         else
         {
         }
         else
         {


@@ -1273,7 +1275,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
             col.pixel = 0;
             gdk_gc_set_background( gc, &col );
             gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );
             col.pixel = 0;
             gdk_gc_set_background( gc, &col );
             gdk_wx_draw_bitmap( ret.GetBitmap(), gc, GetBitmap(), rect.x, rect.y, 0, 0, rect.width, rect.height );

-            gdk_gc_destroy( gc );
+            g_object_unref (gc);

         }
     }
 
         }
     }
 


@@ -1289,7 +1291,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
         col.pixel = 0;
         gdk_gc_set_background( gc, &col );
         gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height );
         col.pixel = 0;
         gdk_gc_set_background( gc, &col );
         gdk_wx_draw_bitmap( mask->m_bitmap, gc, M_BMPDATA->m_mask->m_bitmap, rect.x, rect.y, 0, 0, rect.width, rect.height );

-        gdk_gc_destroy( gc );
+        g_object_unref (gc);

 
         ret.SetMask( mask );
     }
 
         ret.SetMask( mask );
     }


@@ -1339,7 +1341,7 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
            M_BMPDATA->m_mask->m_bitmap = mask;
         }
 
            M_BMPDATA->m_mask->m_bitmap = mask;
         }
 

-        gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
+        gdk_drawable_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );

 
         M_BMPDATA->m_bpp = visual->depth;
     }
 
         M_BMPDATA->m_bpp = visual->depth;
     }


@@ -1485,7 +1487,7 @@ GdkPixbuf *wxBitmap::GetPixbuf() const
                     }
                 }
 
                     }
                 }
 

-                gdk_pixbuf_unref(pmask);
+                g_object_unref (pmask);

             }
         }
     }
             }
         }
     }


@@ -1513,12 +1515,12 @@ void wxBitmap::PurgeOtherRepresentations(wxBitmap::Representation keep)
 {
     if (keep == Pixmap && HasPixbuf())
     {
 {
     if (keep == Pixmap && HasPixbuf())
     {

-        gdk_pixbuf_unref( M_BMPDATA->m_pixbuf );
+        g_object_unref (M_BMPDATA->m_pixbuf);

         M_BMPDATA->m_pixbuf = NULL;
     }
     if (keep == Pixbuf && HasPixmap())
     {
         M_BMPDATA->m_pixbuf = NULL;
     }
     if (keep == Pixbuf && HasPixmap())
     {

-        gdk_pixmap_unref( M_BMPDATA->m_pixmap );
+        g_object_unref (M_BMPDATA->m_pixmap);

         M_BMPDATA->m_pixmap = NULL;
     }
 }
         M_BMPDATA->m_pixmap = NULL;
     }
 }