Moved image code

Corrected clipboard code


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/gtk/bitmap.h

@@ -27,18 +27,6 @@
 class wxMask;
 class wxBitmap;
 
-//-----------------------------------------------------------------------------
-// also implemented here from wxImage
-//-----------------------------------------------------------------------------
-
-/*
-class wxImage : wxGDIObject
-{
-  wxImage( const wxBitmap &bitmap );
-  wxBitmap ConvertToBitmap() const;
-}
-*/
-
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------

include/wx/gtk1/bitmap.h

@@ -27,18 +27,6 @@
 class wxMask;
 class wxBitmap;
 
-//-----------------------------------------------------------------------------
-// also implemented here from wxImage
-//-----------------------------------------------------------------------------
-
-/*
-class wxImage : wxGDIObject
-{
-  wxImage( const wxBitmap &bitmap );
-  wxBitmap ConvertToBitmap() const;
-}
-*/
-
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------

src/common/image.cpp

@@ -19,11 +19,17 @@
 #endif
 
 #include "wx/image.h"
+#include "wx/bitmap.h"
 #include "wx/debug.h"
 #include "wx/log.h"
 #include "../png/png.h"
 #include "wx/filefn.h"
 
+#ifdef __WXGTK__
+#include "gdk/gdkprivate.h"
+#include "gdk/gdkx.h"
+#endif
+
 //-----------------------------------------------------------------------------
 // wxImage
 //-----------------------------------------------------------------------------
@@ -1236,3 +1242,253 @@ wxImage::wxImage( const wxBitmap &bitmap )
 
 #endif
 
+#ifdef __WXGTK__
+
+wxBitmap wxImage::ConvertToBitmap() const
+{
+    wxBitmap bitmap;
+
+    wxCHECK_MSG( Ok(), bitmap, "invalid image" );
+
+    int width = GetWidth();
+    int height = GetHeight();
+
+    bitmap.SetHeight( height );
+    bitmap.SetWidth( width );
+
+    // Create picture
+
+    GdkImage *data_image =
+      gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
+
+    bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) );
+
+    // 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 );
+    }
+
+    // Retrieve depth
+
+    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
+    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
+    int bpp = visual->depth;
+    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+    if (bpp < 8) bpp = 8;
+
+    // Render
+
+    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
+    byte_order b_o = RGB;
+
+    if (bpp >= 24)
+    {
+        GdkVisual *visual = gdk_visual_get_system();
+        if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
+        else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RGB;
+        else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
+        else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
+        else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask))   b_o = GRB;
+        else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask))  b_o = GBR;
+    }
+
+    int r_mask = GetMaskRed();
+    int g_mask = GetMaskGreen();
+    int b_mask = GetMaskBlue();
+
+    unsigned char* data = GetData();
+
+    int index = 0;
+    for (int y = 0; y < height; y++)
+    {
+        for (int x = 0; x < width; x++)
+        {
+            int r = data[index];
+	    index++;
+            int g = data[index];
+	    index++;
+            int b = data[index];
+	    index++;
+
+	    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 );
+	    }
+
+	    switch (bpp)
+	    {
+	        case 8:
+	        {
+	            GdkColormap *cmap = gtk_widget_get_default_colormap();
+                    GdkColor *colors = cmap->colors;
+                    int max = 3 * (65536);
+                    int index = -1;
+
+                    for (int i = 0; i < cmap->size; i++)
+                    {
+                        int rdiff = (r << 8) - colors[i].red;
+                        int gdiff = (g << 8) - colors[i].green;
+                        int bdiff = (b << 8) - colors[i].blue;
+                        int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
+                        if (sum < max) { index = i; max = sum; }
+                    }
+
+	            gdk_image_put_pixel( data_image, x, y, index );
+
+	            break;
+	        }
+	        case 15:
+	        {
+	            guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
+	            gdk_image_put_pixel( data_image, x, y, pixel );
+	            break;
+	        }
+	        case 16:
+	        {
+	            guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
+	            gdk_image_put_pixel( data_image, x, y, pixel );
+	            break;
+	        }
+	        case 32:
+	        case 24:
+	        {
+	            guint32 pixel = 0;
+	            switch (b_o)
+	            {
+	                case RGB: pixel = (r << 16) | (g << 8) | b; break;
+	                case RBG: pixel = (r << 16) | (b << 8) | g; break;
+	                case BRG: pixel = (b << 16) | (r << 8) | g; break;
+	                case BGR: pixel = (b << 16) | (g << 8) | r; break;
+	                case GRB: pixel = (g << 16) | (r << 8) | b; break;
+	                case GBR: pixel = (g << 16) | (b << 8) | r; break;
+	            }
+	            gdk_image_put_pixel( data_image, x, y, pixel );
+	        }
+	        default: break;
+	    }
+        } // for
+    }  // for
+
+    // Blit picture
+
+    GdkGC *data_gc = gdk_gc_new( bitmap.GetPixmap() );
+
+    gdk_draw_image( bitmap.GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
+
+    gdk_image_destroy( data_image );
+    gdk_gc_unref( data_gc );
+
+    // Blit mask
+
+    if (HasMask())
+    {
+        GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
+
+        gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
+
+        gdk_image_destroy( mask_image );
+        gdk_gc_unref( mask_gc );
+    }
+
+    return bitmap;
+}
+
+wxImage::wxImage( const wxBitmap &bitmap )
+{
+    wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
+
+    GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(),
+                                         0, 0,
+					 bitmap.GetWidth(), bitmap.GetHeight() );
+
+    wxCHECK_RET( gdk_image, "couldn't create image" );
+
+    Create( bitmap.GetWidth(), bitmap.GetHeight() );
+    char unsigned *data = GetData();
+
+    if (!data)
+    {
+        gdk_image_destroy( gdk_image );
+        wxFAIL_MSG( "couldn't create image" );
+	return;
+    }
+
+    GdkImage *gdk_image_mask = (GdkImage*) NULL;
+    if (bitmap.GetMask())
+    {
+        gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(),
+	                                0, 0,
+					bitmap.GetWidth(), bitmap.GetHeight() );
+
+	SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
+    }
+
+    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
+    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
+    int bpp = visual->depth;
+    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
+
+    GdkColormap *cmap = gtk_widget_get_default_colormap();
+
+    long pos = 0;
+    for (int j = 0; j < bitmap.GetHeight(); j++)
+    {
+        for (int i = 0; i < bitmap.GetWidth(); i++)
+        {
+            int pixel = gdk_image_get_pixel( gdk_image, i, j );
+            if (bpp <= 8)
+            {
+                data[pos] = cmap->colors[pixel].red >> 8;
+                data[pos+1] = cmap->colors[pixel].green >> 8;
+                data[pos+2] = cmap->colors[pixel].blue >> 8;
+            } else if (bpp == 15)
+            {
+                data[pos] = (pixel >> 7) & 0xf8;
+                data[pos+1] = (pixel >> 2) & 0xf8;
+                data[pos+2] = (pixel << 3) & 0xf8;
+            } else if (bpp == 16)
+            {
+                data[pos] = (pixel >> 8) & 0xf8;
+                data[pos+1] = (pixel >> 3) & 0xfc;
+                data[pos+2] = (pixel << 3) & 0xf8;
+            } else
+            {
+                data[pos] = (pixel >> 16) & 0xff;
+                data[pos+1] = (pixel >> 8) & 0xff;
+                data[pos+2] = pixel & 0xff;
+            }
+
+	    if (gdk_image_mask)
+	    {
+	        int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
+	        if (mask_pixel == 0)
+	        {
+                    data[pos] = 16;
+                    data[pos+1] = 16;
+                    data[pos+2] = 16;
+	       }
+	    }
+
+            pos += 3;
+        }
+    }
+
+    gdk_image_destroy( gdk_image );
+    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
+}
+
+#endif

src/gtk/bitmap.cpp

@@ -364,256 +364,4 @@ GdkBitmap *wxBitmap::GetBitmap(void) const
     return M_BMPDATA->m_bitmap;
 }
 
-//-----------------------------------------------------------------------------
-// wxImage
-//-----------------------------------------------------------------------------
-
-wxBitmap wxImage::ConvertToBitmap() const
-{
-    wxBitmap bitmap;
-
-    wxCHECK_MSG( Ok(), bitmap, "invalid image" );
-
-    int width = GetWidth();
-    int height = GetHeight();
-
-    bitmap.SetHeight( height );
-    bitmap.SetWidth( width );
-
-    // Create picture
-
-    GdkImage *data_image =
-      gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
-
-    bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) );
-
-    // 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 );
-    }
-
-    // Retrieve depth
-
-    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
-    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
-    int bpp = visual->depth;
-    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
-    if (bpp < 8) bpp = 8;
-
-    // Render
-
-    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-    byte_order b_o = RGB;
-
-    if (bpp >= 24)
-    {
-        GdkVisual *visual = gdk_visual_get_system();
-        if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
-        else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RGB;
-        else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
-        else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
-        else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask))   b_o = GRB;
-        else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask))  b_o = GBR;
-    }
-
-    int r_mask = GetMaskRed();
-    int g_mask = GetMaskGreen();
-    int b_mask = GetMaskBlue();
-
-    unsigned char* data = GetData();
-
-    int index = 0;
-    for (int y = 0; y < height; y++)
-    {
-        for (int x = 0; x < width; x++)
-        {
-            int r = data[index];
-	    index++;
-            int g = data[index];
-	    index++;
-            int b = data[index];
-	    index++;
-
-	    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 );
-	    }
-
-	    switch (bpp)
-	    {
-	        case 8:
-	        {
-	            GdkColormap *cmap = gtk_widget_get_default_colormap();
-                    GdkColor *colors = cmap->colors;
-                    int max = 3 * (65536);
-                    int index = -1;
-
-                    for (int i = 0; i < cmap->size; i++)
-                    {
-                        int rdiff = (r << 8) - colors[i].red;
-                        int gdiff = (g << 8) - colors[i].green;
-                        int bdiff = (b << 8) - colors[i].blue;
-                        int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
-                        if (sum < max) { index = i; max = sum; }
-                    }
-
-	            gdk_image_put_pixel( data_image, x, y, index );
-
-	            break;
-	        }
-	        case 15:
-	        {
-	            guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
-	            gdk_image_put_pixel( data_image, x, y, pixel );
-	            break;
-	        }
-	        case 16:
-	        {
-	            guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
-	            gdk_image_put_pixel( data_image, x, y, pixel );
-	            break;
-	        }
-	        case 32:
-	        case 24:
-	        {
-	            guint32 pixel = 0;
-	            switch (b_o)
-	            {
-	                case RGB: pixel = (r << 16) | (g << 8) | b; break;
-	                case RBG: pixel = (r << 16) | (b << 8) | g; break;
-	                case BRG: pixel = (b << 16) | (r << 8) | g; break;
-	                case BGR: pixel = (b << 16) | (g << 8) | r; break;
-	                case GRB: pixel = (g << 16) | (r << 8) | b; break;
-	                case GBR: pixel = (g << 16) | (b << 8) | r; break;
-	            }
-	            gdk_image_put_pixel( data_image, x, y, pixel );
-	        }
-	        default: break;
-	    }
-        } // for
-    }  // for
-
-    // Blit picture
-
-    GdkGC *data_gc = gdk_gc_new( bitmap.GetPixmap() );
-
-    gdk_draw_image( bitmap.GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
-
-    gdk_image_destroy( data_image );
-    gdk_gc_unref( data_gc );
-
-    // Blit mask
-
-    if (HasMask())
-    {
-        GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
-
-        gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
-
-        gdk_image_destroy( mask_image );
-        gdk_gc_unref( mask_gc );
-    }
-
-    return bitmap;
-}
-
-wxImage::wxImage( const wxBitmap &bitmap )
-{
-    wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
-
-    GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(),
-                                         0, 0,
-					 bitmap.GetWidth(), bitmap.GetHeight() );
-
-    wxCHECK_RET( gdk_image, "couldn't create image" );
-
-    Create( bitmap.GetWidth(), bitmap.GetHeight() );
-    char unsigned *data = GetData();
-
-    if (!data)
-    {
-        gdk_image_destroy( gdk_image );
-        wxFAIL_MSG( "couldn't create image" );
-	return;
-    }
-
-    GdkImage *gdk_image_mask = (GdkImage*) NULL;
-    if (bitmap.GetMask())
-    {
-        gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(),
-	                                0, 0,
-					bitmap.GetWidth(), bitmap.GetHeight() );
-
-	SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
-    }
-
-    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
-    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
-    int bpp = visual->depth;
-    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
-
-    GdkColormap *cmap = gtk_widget_get_default_colormap();
-
-    long pos = 0;
-    for (int j = 0; j < bitmap.GetHeight(); j++)
-    {
-        for (int i = 0; i < bitmap.GetWidth(); i++)
-        {
-            int pixel = gdk_image_get_pixel( gdk_image, i, j );
-            if (bpp <= 8)
-            {
-                data[pos] = cmap->colors[pixel].red >> 8;
-                data[pos+1] = cmap->colors[pixel].green >> 8;
-                data[pos+2] = cmap->colors[pixel].blue >> 8;
-            } else if (bpp == 15)
-            {
-                data[pos] = (pixel >> 7) & 0xf8;
-                data[pos+1] = (pixel >> 2) & 0xf8;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else if (bpp == 16)
-            {
-                data[pos] = (pixel >> 8) & 0xf8;
-                data[pos+1] = (pixel >> 3) & 0xfc;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else
-            {
-                data[pos] = (pixel >> 16) & 0xff;
-                data[pos+1] = (pixel >> 8) & 0xff;
-                data[pos+2] = pixel & 0xff;
-            }
-
-	    if (gdk_image_mask)
-	    {
-	        int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
-	        if (mask_pixel == 0)
-	        {
-                    data[pos] = 16;
-                    data[pos+1] = 16;
-                    data[pos+2] = 16;
-	       }
-	    }
-
-            pos += 3;
-        }
-    }
-
-    gdk_image_destroy( gdk_image );
-    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
-}
-
-
 

src/gtk/clipbrd.cpp

@@ -167,6 +167,9 @@ wxClipboard::wxClipboard()
 {
   m_data = (wxDataObject*) NULL;
   
+  m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
+  gtk_widget_realize( m_clipboardWidget );
+
   gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                       "selection_clear_event",
 		      GTK_SIGNAL_FUNC( selection_clear ), 
@@ -233,7 +236,6 @@ void wxClipboard::SetData( wxDataObject *data )
   m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
   gtk_widget_realize( m_clipboardWidget );
 
-
   if (m_data) delete m_data;
   m_data = data;
   if (!m_data) return;

src/gtk1/bitmap.cpp

@@ -364,256 +364,4 @@ GdkBitmap *wxBitmap::GetBitmap(void) const
     return M_BMPDATA->m_bitmap;
 }
 
-//-----------------------------------------------------------------------------
-// wxImage
-//-----------------------------------------------------------------------------
-
-wxBitmap wxImage::ConvertToBitmap() const
-{
-    wxBitmap bitmap;
-
-    wxCHECK_MSG( Ok(), bitmap, "invalid image" );
-
-    int width = GetWidth();
-    int height = GetHeight();
-
-    bitmap.SetHeight( height );
-    bitmap.SetWidth( width );
-
-    // Create picture
-
-    GdkImage *data_image =
-      gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
-
-    bitmap.SetPixmap( gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 ) );
-
-    // 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 );
-    }
-
-    // Retrieve depth
-
-    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
-    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
-    int bpp = visual->depth;
-    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
-    if (bpp < 8) bpp = 8;
-
-    // Render
-
-    enum byte_order { RGB, RBG, BRG, BGR, GRB, GBR };
-    byte_order b_o = RGB;
-
-    if (bpp >= 24)
-    {
-        GdkVisual *visual = gdk_visual_get_system();
-        if ((visual->red_mask > visual->green_mask) && (visual->green_mask > visual->blue_mask))      b_o = RGB;
-        else if ((visual->red_mask > visual->blue_mask) && (visual->blue_mask > visual->green_mask))  b_o = RGB;
-        else if ((visual->blue_mask > visual->red_mask) && (visual->red_mask > visual->green_mask))   b_o = BRG;
-        else if ((visual->blue_mask > visual->green_mask) && (visual->green_mask > visual->red_mask)) b_o = BGR;
-        else if ((visual->green_mask > visual->red_mask) && (visual->red_mask > visual->blue_mask))   b_o = GRB;
-        else if ((visual->green_mask > visual->blue_mask) && (visual->blue_mask > visual->red_mask))  b_o = GBR;
-    }
-
-    int r_mask = GetMaskRed();
-    int g_mask = GetMaskGreen();
-    int b_mask = GetMaskBlue();
-
-    unsigned char* data = GetData();
-
-    int index = 0;
-    for (int y = 0; y < height; y++)
-    {
-        for (int x = 0; x < width; x++)
-        {
-            int r = data[index];
-	    index++;
-            int g = data[index];
-	    index++;
-            int b = data[index];
-	    index++;
-
-	    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 );
-	    }
-
-	    switch (bpp)
-	    {
-	        case 8:
-	        {
-	            GdkColormap *cmap = gtk_widget_get_default_colormap();
-                    GdkColor *colors = cmap->colors;
-                    int max = 3 * (65536);
-                    int index = -1;
-
-                    for (int i = 0; i < cmap->size; i++)
-                    {
-                        int rdiff = (r << 8) - colors[i].red;
-                        int gdiff = (g << 8) - colors[i].green;
-                        int bdiff = (b << 8) - colors[i].blue;
-                        int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
-                        if (sum < max) { index = i; max = sum; }
-                    }
-
-	            gdk_image_put_pixel( data_image, x, y, index );
-
-	            break;
-	        }
-	        case 15:
-	        {
-	            guint32 pixel = ((r & 0xf8) << 7) | ((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
-	            gdk_image_put_pixel( data_image, x, y, pixel );
-	            break;
-	        }
-	        case 16:
-	        {
-	            guint32 pixel = ((r & 0xf8) << 8) | ((g & 0xfc) << 3) | ((b & 0xf8) >> 3);
-	            gdk_image_put_pixel( data_image, x, y, pixel );
-	            break;
-	        }
-	        case 32:
-	        case 24:
-	        {
-	            guint32 pixel = 0;
-	            switch (b_o)
-	            {
-	                case RGB: pixel = (r << 16) | (g << 8) | b; break;
-	                case RBG: pixel = (r << 16) | (b << 8) | g; break;
-	                case BRG: pixel = (b << 16) | (r << 8) | g; break;
-	                case BGR: pixel = (b << 16) | (g << 8) | r; break;
-	                case GRB: pixel = (g << 16) | (r << 8) | b; break;
-	                case GBR: pixel = (g << 16) | (b << 8) | r; break;
-	            }
-	            gdk_image_put_pixel( data_image, x, y, pixel );
-	        }
-	        default: break;
-	    }
-        } // for
-    }  // for
-
-    // Blit picture
-
-    GdkGC *data_gc = gdk_gc_new( bitmap.GetPixmap() );
-
-    gdk_draw_image( bitmap.GetPixmap(), data_gc, data_image, 0, 0, 0, 0, width, height );
-
-    gdk_image_destroy( data_image );
-    gdk_gc_unref( data_gc );
-
-    // Blit mask
-
-    if (HasMask())
-    {
-        GdkGC *mask_gc = gdk_gc_new( bitmap.GetMask()->GetBitmap() );
-
-        gdk_draw_image( bitmap.GetMask()->GetBitmap(), mask_gc, mask_image, 0, 0, 0, 0, width, height );
-
-        gdk_image_destroy( mask_image );
-        gdk_gc_unref( mask_gc );
-    }
-
-    return bitmap;
-}
-
-wxImage::wxImage( const wxBitmap &bitmap )
-{
-    wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
-
-    GdkImage *gdk_image = gdk_image_get( bitmap.GetPixmap(),
-                                         0, 0,
-					 bitmap.GetWidth(), bitmap.GetHeight() );
-
-    wxCHECK_RET( gdk_image, "couldn't create image" );
-
-    Create( bitmap.GetWidth(), bitmap.GetHeight() );
-    char unsigned *data = GetData();
-
-    if (!data)
-    {
-        gdk_image_destroy( gdk_image );
-        wxFAIL_MSG( "couldn't create image" );
-	return;
-    }
-
-    GdkImage *gdk_image_mask = (GdkImage*) NULL;
-    if (bitmap.GetMask())
-    {
-        gdk_image_mask = gdk_image_get( bitmap.GetMask()->GetBitmap(),
-	                                0, 0,
-					bitmap.GetWidth(), bitmap.GetHeight() );
-
-	SetMaskColour( 16, 16, 16 );  // anything unlikely and dividable
-    }
-
-    GdkVisual *visual = gdk_window_get_visual( bitmap.GetPixmap() );
-    if (visual == NULL) visual = gdk_window_get_visual( (GdkWindow*) &gdk_root_parent );
-    int bpp = visual->depth;
-    if ((bpp == 16) && (visual->red_mask != 0xf800)) bpp = 15;
-
-    GdkColormap *cmap = gtk_widget_get_default_colormap();
-
-    long pos = 0;
-    for (int j = 0; j < bitmap.GetHeight(); j++)
-    {
-        for (int i = 0; i < bitmap.GetWidth(); i++)
-        {
-            int pixel = gdk_image_get_pixel( gdk_image, i, j );
-            if (bpp <= 8)
-            {
-                data[pos] = cmap->colors[pixel].red >> 8;
-                data[pos+1] = cmap->colors[pixel].green >> 8;
-                data[pos+2] = cmap->colors[pixel].blue >> 8;
-            } else if (bpp == 15)
-            {
-                data[pos] = (pixel >> 7) & 0xf8;
-                data[pos+1] = (pixel >> 2) & 0xf8;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else if (bpp == 16)
-            {
-                data[pos] = (pixel >> 8) & 0xf8;
-                data[pos+1] = (pixel >> 3) & 0xfc;
-                data[pos+2] = (pixel << 3) & 0xf8;
-            } else
-            {
-                data[pos] = (pixel >> 16) & 0xff;
-                data[pos+1] = (pixel >> 8) & 0xff;
-                data[pos+2] = pixel & 0xff;
-            }
-
-	    if (gdk_image_mask)
-	    {
-	        int mask_pixel = gdk_image_get_pixel( gdk_image_mask, i, j );
-	        if (mask_pixel == 0)
-	        {
-                    data[pos] = 16;
-                    data[pos+1] = 16;
-                    data[pos+2] = 16;
-	       }
-	    }
-
-            pos += 3;
-        }
-    }
-
-    gdk_image_destroy( gdk_image );
-    if (gdk_image_mask) gdk_image_destroy( gdk_image_mask );
-}
-
-
 

src/gtk1/clipbrd.cpp

@@ -167,6 +167,9 @@ wxClipboard::wxClipboard()
 {
   m_data = (wxDataObject*) NULL;
   
+  m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
+  gtk_widget_realize( m_clipboardWidget );
+
   gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                       "selection_clear_event",
 		      GTK_SIGNAL_FUNC( selection_clear ), 
@@ -233,7 +236,6 @@ void wxClipboard::SetData( wxDataObject *data )
   m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
   gtk_widget_realize( m_clipboardWidget );
 
-
   if (m_data) delete m_data;
   m_data = data;
   if (!m_data) return;