Removed usage of GdkImlib
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:
100
src/gtk/app.cpp
100
src/gtk/app.cpp
@@ -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();
|
||||
|
||||
|
Reference in New Issue
Block a user