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

Casting to GdkColormapPrivate is neither possible nor necessary in

Browse Source 
gtk+ 1.3.1.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
2000-07-19 08:50:37 +00:00
parent 2d4dc3a4d0
commit 307fc8d582
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/colour.cpp
View File

@@ -15,6 +15,7 @@
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -180,9 +181,14 @@ void wxColour::CalcPixel( GdkColormap *cmap )
M_COLDATA->FreeColour(); M_COLDATA->FreeColour();
#ifdef __WXGTK20__
if ((cmap->visual->type == GDK_VISUAL_GRAYSCALE) ||
(cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
#else
GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap; GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
(private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
#endif
{ {
GdkColor *colors = cmap->colors; GdkColor *colors = cmap->colors;
int max = 3 * (65536); int max = 3 * (65536);

6
src/gtk1/colour.cpp
View File

@@ -15,6 +15,7 @@
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gdk/gdkprivate.h> #include <gdk/gdkprivate.h>
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -180,9 +181,14 @@ void wxColour::CalcPixel( GdkColormap *cmap )
M_COLDATA->FreeColour(); M_COLDATA->FreeColour();
#ifdef __WXGTK20__
if ((cmap->visual->type == GDK_VISUAL_GRAYSCALE) ||
(cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
#else
GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap; GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
(private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
#endif
{ {
GdkColor *colors = cmap->colors; GdkColor *colors = cmap->colors;
int max = 3 * (65536); int max = 3 * (65536);