Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed usage of GdkImlib

Browse Source 
Added platform independent wxImage class
  Changed wxBitmap and wxImageList accordingly
  Correctted header text


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-10-24 17:12:05 +00:00
parent 0ab4b99cdf
commit 01111366c9
81 changed files with 1935 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/gtk1/app.cpp
View File

@@ -2,9 +2,8 @@
// Name: app.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -24,10 +23,6 @@
#include "unistd.h"
#ifdef wxUSE_GDK_IMLIB
#include "../gdk_imlib/gdk_imlib.h"
#endif
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
@@ -38,6 +33,74 @@ wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
extern wxList wxPendingDelete;
extern wxResourceCache *wxTheResourceCache;
unsigned char g_palette[64*3] =
{
0x0, 0x0, 0x0,
0xff, 0xff, 0xff,
0xff, 0x0, 0x0,
0xff, 0xff, 0x0,
0x0, 0xff, 0x0,
0x0, 0x0, 0xff,
0x0, 0xff, 0xff,
0x99, 0x99, 0x99,
0xff, 0x88, 0x0,
0x88, 0x0, 0x0,
0x0, 0x88, 0x88,
0x88, 0x88, 0x0,
0xff, 0xcc, 0x97,
0xbb, 0xbb, 0xbb,
0x9f, 0x6b, 0x42,
0x55, 0x55, 0x55,
0xdd, 0xdd, 0xdd,
0x77, 0x77, 0x77,
0x33, 0x33, 0x33,
0xcc, 0x0, 0x0,
0xff, 0x44, 0x0,
0xff, 0xcc, 0x0,
0xcc, 0xcc, 0x0,
0x60, 0x60, 0x0,
0x0, 0x43, 0x0,
0x0, 0x7f, 0x0,
0x0, 0xcc, 0x0,
0x0, 0x44, 0x44,
0x0, 0x0, 0x44,
0x0, 0x0, 0x88,
0xef, 0xb1, 0x7b,
0xdf, 0x98, 0x5f,
0xbf, 0x87, 0x56,
0x7f, 0x57, 0x26,
0x5f, 0x39, 0xc,
0x3f, 0x1c, 0x0,
0x21, 0x0, 0x0,
0x0, 0x43, 0x87,
0x2d, 0x70, 0xaf,
0x5a, 0x9e, 0xd7,
0x87, 0xcc, 0xff,
0xff, 0xe0, 0xba,
0x21, 0x43, 0xf,
0x3d, 0x5d, 0x25,
0x59, 0x78, 0x3a,
0x75, 0x93, 0x4f,
0x91, 0xae, 0x64,
0xad, 0xc8, 0x7a,
0xf0, 0xa8, 0xef,
0xd0, 0x88, 0xd0,
0xaf, 0x66, 0xaf,
0x8e, 0x44, 0x8e,
0x6d, 0x22, 0x6d,
0x4b, 0x0, 0x4b,
0xff, 0xc0, 0xbc,
0xff, 0x93, 0x91,
0xff, 0x66, 0x67,
0xd8, 0xf2, 0xbf,
0xff, 0xc9, 0x68,
0xff, 0x96, 0x67,
0xa5, 0x60, 0xff,
0x51, 0xff, 0x99,
0x3f, 0xa5, 0x63,
0x98, 0x90, 0x67
};
//-----------------------------------------------------------------------------
// local functions
//-----------------------------------------------------------------------------
@@ -355,15 +418,22 @@ int wxEntry( int argc, char *argv[] )
gtk_init( &argc, &argv );
#ifdef wxUSE_GDK_IMLIB
GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
gdk_imlib_init();
gtk_widget_push_visual(gdk_imlib_get_visual());
gtk_widget_push_colormap(gdk_imlib_get_colormap());
#endif
for (int i = 0; i < 64; i++)
{
GdkColor col;
col.red = g_palette[i*3 + 0] << 8;
col.green = g_palette[i*3 + 1] << 8;
col.blue = g_palette[i*3 + 2] << 8;
col.pixel = 0;
gdk_color_alloc( cmap, &col );
}
gtk_widget_push_colormap( cmap );
gtk_widget_set_default_colormap( cmap );
wxApp::CommonInit();

371
src/gtk1/bitmap.cpp
View File

@@ -2,9 +2,8 @@
// Name: bitmap.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -15,15 +14,7 @@
#include "wx/bitmap.h"
#include "wx/icon.h"
#include "gdk/gdkprivate.h"
#ifdef wxUSE_GDK_IMLIB
#include "../gdk_imlib/gdk_imlib.h"
#include "gdk/gdkx.h" // GDK_DISPLAY
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#endif
#include "gdk/gdkx.h"
//-----------------------------------------------------------------------------
// wxMask
@@ -50,11 +41,7 @@ wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
wxMask::~wxMask(void)
{
#ifdef wxUSE_GDK_IMLIB
// do not delete the mask, gdk_imlib does it for you
#else
if (m_bitmap) gdk_bitmap_unref( m_bitmap );
#endif
}
GdkBitmap *wxMask::GetBitmap(void) const
@@ -66,7 +53,6 @@ GdkBitmap *wxMask::GetBitmap(void) const
// wxBitmap
//-----------------------------------------------------------------------------
// CMB 20/5/98: added m_bitmap for GdkBitmaps
class wxBitmapRefData: public wxObjectRefData
{
public:
@@ -80,9 +66,6 @@ class wxBitmapRefData: public wxObjectRefData
int m_width;
int m_height;
int m_bpp;
#ifdef wxUSE_GDK_IMLIB
GdkImlibImage *m_image;
#endif
wxPalette *m_palette;
};
@@ -95,19 +78,11 @@ wxBitmapRefData::wxBitmapRefData(void)
m_height = 0;
m_bpp = 0;
m_palette = (wxPalette *) NULL;
#ifdef wxUSE_GDK_IMLIB
m_image = (GdkImlibImage *) NULL;
#endif
}
wxBitmapRefData::~wxBitmapRefData(void)
{
#ifdef wxUSE_GDK_IMLIB
if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
if (m_image) gdk_imlib_kill_image( m_image );
#else
if (m_pixmap) gdk_pixmap_unref( m_pixmap );
#endif
if (m_bitmap) gdk_bitmap_unref( m_bitmap );
if (m_mask) delete m_mask;
if (m_palette) delete m_palette;
@@ -141,8 +116,6 @@ wxBitmap::wxBitmap( char **bits )
{
m_refData = new wxBitmapRefData();
#ifndef wxUSE_GDK_IMLIB
GdkBitmap *mask = NULL;
M_BMPDATA->m_pixmap =
@@ -156,13 +129,6 @@ wxBitmap::wxBitmap( char **bits )
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
#else
M_BMPDATA->m_image = gdk_imlib_create_image_from_xpm_data( bits );
Render();
#endif
M_BMPDATA->m_bpp = 24; // ?
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
@@ -189,7 +155,6 @@ wxBitmap::wxBitmap( const wxString &filename, int type )
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
}
// CMB 15/5/98: add constructor for xbm bitmaps
wxBitmap::wxBitmap( const char bits[], int width, int height, int WXUNUSED(depth))
{
m_refData = new wxBitmapRefData();
@@ -315,43 +280,7 @@ void wxBitmap::SetMask( wxMask *mask )
M_BMPDATA->m_mask = mask;
}
void wxBitmap::Resize( int height, int width )
{
if (!Ok())
{
wxFAIL_MSG( "invalid bitmap" );
return;
}
#ifdef wxUSE_GDK_IMLIB
if (M_BMPDATA->m_bitmap)
{
wxFAIL_MSG( "wxBitmap::Resize not supported for mono-bitmaps" );
return;
}
if (!M_BMPDATA->m_image) RecreateImage();
if (M_BMPDATA->m_pixmap) gdk_imlib_free_pixmap( M_BMPDATA->m_pixmap );
if (M_BMPDATA->m_mask) delete M_BMPDATA->m_mask;
GdkImlibImage* image = gdk_imlib_clone_scaled_image( M_BMPDATA->m_image, height, width );
gdk_imlib_destroy_image( M_BMPDATA->m_image );
M_BMPDATA->m_image = image;
M_BMPDATA->m_height = height;
M_BMPDATA->m_width = width;
Render();
#else
wxFAIL_MSG( "wxBitmap::Resize not implemented without GdkImlib" );
#endif
}
bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
bool wxBitmap::SaveFile( const wxString &WXUNUSED(name), int WXUNUSED(type),
wxPalette *WXUNUSED(palette) )
{
if (!Ok())
@@ -360,55 +289,17 @@ bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
return FALSE;
}
#ifdef wxUSE_GDK_IMLIB
if (M_BMPDATA->m_bitmap)
{
wxFAIL_MSG( "wxBitmap::SaveFile not supported for mono-bitmaps" );
return FALSE;
}
if (!M_BMPDATA->m_image) RecreateImage();
return gdk_imlib_save_image( M_BMPDATA->m_image, WXSTRINGCAST name, (GdkImlibSaveInfo *) NULL );
#else
wxFAIL_MSG( "wxBitmap::SaveFile not implemented without GdkImlib" );
#endif
return FALSE;
}
bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
bool wxBitmap::LoadFile( const wxString &WXUNUSED(name), int WXUNUSED(type) )
{
#ifdef wxUSE_GDK_IMLIB
UnRef();
m_refData = new wxBitmapRefData();
M_BMPDATA->m_image = gdk_imlib_load_image( WXSTRINGCAST name );
if (!M_BMPDATA->m_image)
if (!Ok())
{
UnRef();
wxFAIL_MSG( "invalid bitmap" );
return FALSE;
}
Render();
gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
M_BMPDATA->m_bpp = 24; // ?
return TRUE;
#else
wxFAIL_MSG( "wxBitmap::LoadFile not implemented without GdkImlib" );
#endif
return FALSE;
}
@@ -426,8 +317,6 @@ GdkPixmap *wxBitmap::GetPixmap(void) const
return (GdkPixmap *) NULL;
}
// if (!M_BMPDATA->m_image) RecreateImage();
return M_BMPDATA->m_pixmap;
}
@@ -442,118 +331,200 @@ GdkBitmap *wxBitmap::GetBitmap(void) const
return M_BMPDATA->m_bitmap;
}
void wxBitmap::DestroyImage(void)
wxBitmap::wxBitmap( const wxImage &image )
{
if (!Ok())
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
if (!image.Ok()) return;
m_refData = new wxBitmapRefData();
M_BMPDATA->m_height = image.GetHeight();
M_BMPDATA->m_width = image.GetWidth();
int width = image.GetWidth();
int height = image.GetHeight();
// Create picture
GdkImage *data_image =
gdk_image_new( GDK_IMAGE_FASTEST, gdk_visual_get_system(), width, height );
M_BMPDATA->m_pixmap =
gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, -1 );
// Create mask
GdkImage *mask_image = (GdkImage*) NULL;
if (image.HasMask())
{
wxFAIL_MSG( "invalid bitmap" );
return;
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 );
M_BMPDATA->m_mask = new wxMask();
M_BMPDATA->m_mask->m_bitmap = gdk_pixmap_new( (GdkWindow*)&gdk_root_parent, width, height, 1 );
}
if (M_BMPDATA->m_image)
// Retrieve depth
M_BMPDATA->m_bpp = data_image->depth;
int render_depth = 8;
if (M_BMPDATA->m_bpp > 8) render_depth = M_BMPDATA->m_bpp;
// Render
int r_mask = image.GetMaskRed();
int g_mask = image.GetMaskGreen();
int b_mask = image.GetMaskBlue();
unsigned char* data = image.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 (image.HasMask())
{
if ((r == r_mask) && (b = b_mask) && (g = g_mask))
gdk_image_put_pixel( mask_image, x, y, 0 );
else
gdk_image_put_pixel( mask_image, x, y, 1 );
}
switch (render_depth)
{
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 24:
{
break;
}
case 32:
{
break;
}
default: break;
}
}
// Blit picture
GdkGC *data_gc = gdk_gc_new( M_BMPDATA->m_pixmap );
gdk_draw_image( M_BMPDATA->m_pixmap, data_gc, data_image, 0, 0, 0, 0, width, height );
gdk_image_destroy( data_image );
gdk_gc_unref( data_gc );
// Blit mask
if (image.HasMask())
{
gdk_imlib_destroy_image( M_BMPDATA->m_image );
M_BMPDATA->m_image = (GdkImlibImage *) NULL;
GdkGC *mask_gc = gdk_gc_new( M_BMPDATA->m_mask->m_bitmap );
gdk_draw_image( M_BMPDATA->m_mask->m_bitmap, mask_gc, mask_image, 0, 0, 0, 0, width, height );
gdk_image_destroy( mask_image );
gdk_gc_unref( mask_gc );
}
}
void wxBitmap::RecreateImage(void)
wxImage wxBitmap::ConvertToImage() const
{
wxImage image;
if (!Ok())
{
wxFAIL_MSG( "invalid bitmap" );
return;
return image;
}
#ifdef wxUSE_GDK_IMLIB
DestroyImage();
GdkImage *gdk_image = gdk_image_get( M_BMPDATA->m_pixmap, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height );
wxCHECK_RET( M_BMPDATA->m_pixmap != NULL, "invalid bitmap" );
if (!gdk_image) return image;
long size = (long)(M_BMPDATA->m_width)*(long)(M_BMPDATA->m_height)*(long)3;
unsigned char *data = new unsigned char[size];
for (long i = 0; i < size; i++) data[i] = 100;
image.Create( M_BMPDATA->m_width, M_BMPDATA->m_height );
char unsigned *data = image.GetData();
GdkImage *image = gdk_image_get( M_BMPDATA->m_pixmap, 0, 0, M_BMPDATA->m_width, M_BMPDATA->m_height );
int bpp = gdk_image->bpp;
GdkColormap *cmap = gtk_widget_get_default_colormap();
long pos = 0;
for (int j = 0; j < M_BMPDATA->m_height; j++)
{
for (int i = 0; i < M_BMPDATA->m_width; i++)
{
XColor xcol;
xcol.pixel = gdk_image_get_pixel( image, i, j );
Colormap cm = ((GdkColormapPrivate*)gdk_imlib_get_colormap())->xcolormap;
XQueryColor( gdk_display, cm, &xcol );
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 >> 3) & 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;
}
data[pos] = xcol.red;
data[pos+1] = xcol.green;
data[pos+2] = xcol.blue;
pos += 3;
}
}
wxCHECK_RET( M_BMPDATA->m_pixmap != NULL, "invalid bitmap" );
gdk_image_destroy( gdk_image );
M_BMPDATA->m_image = gdk_imlib_create_image_from_data(
data, (unsigned char*)NULL, M_BMPDATA->m_width, M_BMPDATA->m_height );
delete[] data;
gdk_image_destroy( image );
Render();
#else
wxFAIL_MSG( "wxBitmap::RecreateImage not implemented without GdkImlib" );
#endif
}
void wxBitmap::Render(void)
{
if (!Ok())
{
wxFAIL_MSG( "invalid bitmap" );
return;
}
#ifdef wxUSE_GDK_IMLIB
if (!M_BMPDATA->m_image) RecreateImage();
if (M_BMPDATA->m_pixmap)
{
gdk_imlib_free_pixmap( M_BMPDATA->m_pixmap );
M_BMPDATA->m_pixmap = (GdkPixmap*) NULL;
}
if (M_BMPDATA->m_mask)
{
delete M_BMPDATA->m_mask;
M_BMPDATA->m_mask = (wxMask*) NULL;
}
gdk_imlib_render( M_BMPDATA->m_image, M_BMPDATA->m_image->rgb_width, M_BMPDATA->m_image->rgb_height );
M_BMPDATA->m_width = M_BMPDATA->m_image->rgb_width;
M_BMPDATA->m_height = M_BMPDATA->m_image->rgb_height;
M_BMPDATA->m_pixmap = gdk_imlib_move_image( M_BMPDATA->m_image );
wxCHECK_RET( M_BMPDATA->m_pixmap != NULL, "pixmap rendering failed" )
GdkBitmap *mask = gdk_imlib_move_mask( M_BMPDATA->m_image );
if (mask)
{
M_BMPDATA->m_mask = new wxMask();
M_BMPDATA->m_mask->m_bitmap = mask;
}
#else
wxFAIL_MSG( "wxBitmap::Render not implemented without GdkImlib" );
#endif
return image;
}

5
src/gtk1/bmpbuttn.cpp
View File

@@ -2,9 +2,8 @@
// Name: bmpbuttn.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/brush.cpp
View File

@@ -2,9 +2,8 @@
// Name: brush.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/button.cpp
View File

@@ -2,9 +2,8 @@
// Name: button.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/checkbox.cpp
View File

@@ -2,9 +2,8 @@
// Name: checkbox.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/choice.cpp
View File

@@ -2,9 +2,8 @@
// Name: choice.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

39
src/gtk1/colour.cpp
View File

@@ -15,9 +15,7 @@
#include "wx/gdicmn.h"
#ifdef wxUSE_GDK_IMLIB
#include "../gdk_imlib/gdk_imlib.h"
#endif
#include "gdk/gdkprivate.h"
//-----------------------------------------------------------------------------
// wxColour
@@ -186,19 +184,30 @@ void wxColour::CalcPixel( GdkColormap *cmap )
if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
M_COLDATA->FreeColour();
#ifdef wxUSE_GDK_IMLIB
GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
(private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
{
GdkColor *colors = cmap->colors;
int max = 3 * (65536);
int index = -1;
int r = M_COLDATA->m_color.red >> SHIFT;
int g = M_COLDATA->m_color.green >> SHIFT;
int b = M_COLDATA->m_color.blue >> SHIFT;
M_COLDATA->m_hasPixel = TRUE;
M_COLDATA->m_color.pixel = gdk_imlib_best_color_match( &r, &g, &b );
#else
M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
#endif
for (int i = 0; i < cmap->size; i++)
{
int rdiff = (M_COLDATA->m_color.red - colors[i].red);
int gdiff = (M_COLDATA->m_color.green - colors[i].green);
int bdiff = (M_COLDATA->m_color.blue - colors[i].blue);
int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
if (sum < max) { index = i; max = sum; }
}
M_COLDATA->m_hasPixel = TRUE;
M_COLDATA->m_color.pixel = index;
}
else
{
M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
}
M_COLDATA->m_colormap = cmap;
}

5
src/gtk1/combobox.cpp
View File

@@ -2,9 +2,8 @@
// Name: combobox.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/control.cpp
View File

@@ -2,9 +2,8 @@
// Name: control.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/cursor.cpp
View File

@@ -2,9 +2,8 @@
// Name: cursor.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

3
src/gtk1/data.cpp
View File

@@ -2,8 +2,7 @@
// Name: data.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Id: $id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

1
src/gtk1/dc.cpp
View File

@@ -2,7 +2,6 @@
// Name: dc.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence

35
src/gtk1/dcclient.cpp
View File

@@ -2,9 +2,8 @@
// Name: dcclient.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Copyright: (c) 1998 Robert Roebling, Markus Holzem, Chris Breeze
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -138,8 +137,6 @@ void wxPaintDC::DrawLine( long x1, long y1, long x2, long y2 )
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
if (m_pen.GetStyle() != wxTRANSPARENT)
{
gdk_draw_line( m_window, m_penGC,
@@ -151,8 +148,6 @@ void wxPaintDC::CrossHair( long x, long y )
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
if (m_pen.GetStyle() != wxTRANSPARENT)
{
int w = 0;
@@ -171,8 +166,6 @@ void wxPaintDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double y
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
long xx1 = XLOG2DEV(x1);
long yy1 = YLOG2DEV(y1);
long xx2 = XLOG2DEV(x2);
@@ -221,8 +214,6 @@ void wxPaintDC::DrawEllipticArc( long x, long y, long width, long height, double
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
long xx = XLOG2DEV(x);
long yy = YLOG2DEV(y);
long ww = m_signX * XLOG2DEVREL(width);
@@ -245,8 +236,6 @@ void wxPaintDC::DrawPoint( long x, long y )
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
if (m_pen.GetStyle() != wxTRANSPARENT)
gdk_draw_point( m_window, m_penGC, XLOG2DEV(x), YLOG2DEV(y) );
}
@@ -255,8 +244,6 @@ void wxPaintDC::DrawLines( int n, wxPoint points[], long xoffset, long yoffset )
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
if (m_pen.GetStyle() == wxTRANSPARENT) return;
for (int i = 0; i < n-1; i++)
@@ -273,8 +260,6 @@ void wxPaintDC::DrawLines( wxList *points, long xoffset, long yoffset )
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
if (m_pen.GetStyle() == wxTRANSPARENT) return;
wxNode *node = points->First();
@@ -295,8 +280,6 @@ void wxPaintDC::DrawPolygon( int n, wxPoint points[], long xoffset, long yoffset
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
if (!n) return; // Nothing to draw
GdkPoint *gdkpoints = new GdkPoint[n+1];
int i;
@@ -322,8 +305,6 @@ void wxPaintDC::DrawPolygon( wxList *lines, long xoffset, long yoffset, int WXUN
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
int n = lines->Number();
GdkPoint *gdkpoints = new GdkPoint[n];
wxNode *node = lines->First();
@@ -356,8 +337,6 @@ void wxPaintDC::DrawRectangle( long x, long y, long width, long height )
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
long xx = XLOG2DEV(x);
long yy = YLOG2DEV(y);
long ww = m_signX * XLOG2DEVREL(width);
@@ -381,8 +360,6 @@ void wxPaintDC::DrawRoundedRectangle( long x, long y, long width, long height, d
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
if (radius < 0.0) radius = - radius * ((width < height) ? width : height);
long xx = XLOG2DEV(x);
@@ -448,8 +425,6 @@ void wxPaintDC::DrawEllipse( long x, long y, long width, long height )
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
long xx = XLOG2DEV(x);
long yy = YLOG2DEV(y);
long ww = m_signX * XLOG2DEVREL(width);
@@ -477,8 +452,6 @@ void wxPaintDC::DrawIcon( const wxIcon &icon, long x, long y, bool useMask )
if (!icon.Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
int xx = XLOG2DEV(x);
int yy = YLOG2DEV(y);
@@ -506,8 +479,6 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
{
if (!Ok()) return FALSE;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
if (m_isMemDC)
{
wxMemoryDC* srcDC = (wxMemoryDC*)source;
@@ -547,8 +518,6 @@ void wxPaintDC::DrawText( const wxString &text, long x, long y, bool WXUNUSED(us
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
GdkFont *font = m_font.GetInternalFont( m_scaleY );
x = XLOG2DEV(x);
@@ -618,8 +587,6 @@ void wxPaintDC::Clear(void)
{
if (!Ok()) return;
if (m_isMemDC) ((wxMemoryDC*)this)->m_selected.DestroyImage();
if (!m_isMemDC)
{
gdk_window_clear( m_window );

19
src/gtk1/dcmemory.cpp
View File

@@ -2,9 +2,8 @@
// Name: dcmemory.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -14,10 +13,6 @@
#include "wx/dcmemory.h"
#ifdef wxUSE_GDK_IMLIB
#include "../gdk_imlib/gdk_imlib.h"
#endif
//-----------------------------------------------------------------------------
// wxMemoryDC
//-----------------------------------------------------------------------------
@@ -28,22 +23,14 @@ wxMemoryDC::wxMemoryDC(void)
{
m_ok = FALSE;
#ifdef wxUSE_GDK_IMLIB
m_cmap = gdk_imlib_get_colormap();
#else
m_cmap = gdk_colormap_get_system();
#endif
m_cmap = gtk_widget_get_default_colormap();
}
wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
{
m_ok = FALSE;
#ifdef wxUSE_GDK_IMLIB
m_cmap = gdk_imlib_get_colormap();
#else
m_cmap = gdk_colormap_get_system();
#endif
m_cmap = gtk_widget_get_default_colormap();
}
wxMemoryDC::~wxMemoryDC(void)

5
src/gtk1/dcscreen.cpp
View File

@@ -2,9 +2,8 @@
// Name: dcscreen.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/dialog.cpp
View File

@@ -2,9 +2,8 @@
// Name: dialog.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/dnd.cpp
View File

@@ -2,8 +2,9 @@
// Name: dnd.cpp
// Purpose: wxDropTarget class
// Author: Robert Roebling
// Copyright: Robert Roebling
// Licence: wxWindows license
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__

5
src/gtk1/filedlg.cpp
View File

@@ -2,9 +2,8 @@
// Name: filedlg.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

3
src/gtk1/font.cpp
View File

@@ -2,8 +2,7 @@
// Name: font.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Id: $id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/frame.cpp
View File

@@ -2,9 +2,8 @@
// Name: frame.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/gauge.cpp
View File

@@ -2,9 +2,8 @@
// Name: gauge.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/notebook.cpp
View File

@@ -2,9 +2,8 @@
// Name: notebook.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

5
src/gtk1/timer.cpp
View File

@@ -2,9 +2,8 @@
// Name: timer.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

1
src/gtk1/utilsgtk.cpp
View File

@@ -2,7 +2,6 @@
// Name: utils.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence

7
src/gtk1/win_gtk.c
View File

@@ -1,10 +1,9 @@
/* ///////////////////////////////////////////////////////////////////////////
// Name: wx_gtk.h
// Purpose:
// Purpose: native GTK+ widget for wxWindows
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////// */

5
src/gtk1/window.cpp
View File

@@ -2,9 +2,8 @@
// Name: window.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////