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:
		| @@ -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) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user