forked from AuroraMiddleware/gtk
quartz: Remove all mentions of visuals
This commit is contained in:
parent
ec06a717ce
commit
31a0933fe9
@ -46,7 +46,6 @@ libgdk_quartz_la_SOURCES = \
|
||||
gdkselection-quartz.c \
|
||||
gdktestutils-quartz.c \
|
||||
gdkutils-quartz.c \
|
||||
gdkvisual-quartz.c \
|
||||
gdkwindow-quartz.c \
|
||||
gdkwindow-quartz.h \
|
||||
xcursors.h
|
||||
@ -64,7 +63,6 @@ libgdkquartzinclude_HEADERS = \
|
||||
gdkquartzkeys.h \
|
||||
gdkquartzscreen.h \
|
||||
gdkquartzutils.h \
|
||||
gdkquartzvisual.h \
|
||||
gdkquartzwindow.h
|
||||
|
||||
|
||||
|
@ -69,7 +69,6 @@ _gdk_quartz_display_open (const gchar *display_name)
|
||||
_gdk_display->device_manager = _gdk_device_manager_new (_gdk_display);
|
||||
|
||||
_gdk_screen = g_object_new (gdk_quartz_screen_get_type (), NULL);
|
||||
_gdk_quartz_screen_init_visuals (_gdk_screen);
|
||||
|
||||
_gdk_quartz_window_init_windowing (_gdk_display, _gdk_screen);
|
||||
|
||||
|
@ -24,7 +24,6 @@
|
||||
#define __GDK_QUARTZ_GL_CONTEXT__
|
||||
|
||||
#include "gdkglcontextprivate.h"
|
||||
#include "gdkvisual.h"
|
||||
#include "gdkwindow.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkmain.h"
|
||||
|
@ -161,9 +161,6 @@ gchar * _gdk_quartz_display_utf8_to_string_target (GdkDisplay *disp
|
||||
GdkScreen *_gdk_quartz_screen_new (void);
|
||||
void _gdk_quartz_screen_update_window_sizes (GdkScreen *screen);
|
||||
|
||||
/* Screen methods - visual */
|
||||
void _gdk_quartz_screen_init_visuals (GdkScreen *screen);
|
||||
|
||||
/* Screen methods - events */
|
||||
gboolean _gdk_quartz_screen_get_setting (GdkScreen *screen,
|
||||
const gchar *name,
|
||||
|
@ -73,7 +73,6 @@ G_END_DECLS
|
||||
#include <gdk/quartz/gdkquartzkeys.h>
|
||||
#include <gdk/quartz/gdkquartzscreen.h>
|
||||
#include <gdk/quartz/gdkquartzutils.h>
|
||||
#include <gdk/quartz/gdkquartzvisual.h>
|
||||
#include <gdk/quartz/gdkquartzwindow.h>
|
||||
|
||||
#undef __GDKQUARTZ_H_INSIDE__
|
||||
|
@ -1,51 +0,0 @@
|
||||
/* gdkquartzvisual.h
|
||||
*
|
||||
* Copyright (C) 2005 Imendio AB
|
||||
* Copyright (C) 2010 Kristian Rietveld <kris@gtk.org>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef __GDK_QUARTZ_VISUAL_H__
|
||||
#define __GDK_QUARTZ_VISUAL_H__
|
||||
|
||||
#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
|
||||
#error "Only <gdk/gdkquartz.h> can be included directly."
|
||||
#endif
|
||||
|
||||
#include <gdk/gdk.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define GDK_TYPE_QUARTZ_VISUAL (gdk_quartz_visual_get_type ())
|
||||
#define GDK_QUARTZ_VISUAL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_QUARTZ_VISUAL, GdkQuartzVisual))
|
||||
#define GDK_QUARTZ_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_QUARTZ_VISUAL, GdkQuartzVisualClass))
|
||||
#define GDK_IS_QUARTZ_VISUAL(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_QUARTZ_VISUAL))
|
||||
#define GDK_IS_QUARTZ_VISUAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_VISUAL))
|
||||
#define GDK_QUARTZ_VISUAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_VISUAL, GdkQuartzVisualClass))
|
||||
|
||||
#ifdef GDK_COMPILATION
|
||||
typedef struct _GdkQuartzVisual GdkQuartzVisual;
|
||||
#else
|
||||
typedef GdkVisual GdkQuartzVisual;
|
||||
#endif
|
||||
typedef struct _GdkQuartzVisualClass GdkQuartzVisualClass;
|
||||
|
||||
|
||||
GDK_AVAILABLE_IN_ALL
|
||||
GType gdk_quartz_visual_get_type (void);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GDK_QUARTZ_VISUAL_H__ */
|
@ -1,98 +0,0 @@
|
||||
/* gdkvisual-quartz.c
|
||||
*
|
||||
* Copyright (C) 2005 Imendio AB
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "gdkvisualprivate.h"
|
||||
#include "gdkquartzvisual.h"
|
||||
#include "gdkprivate-quartz.h"
|
||||
|
||||
|
||||
struct _GdkQuartzVisual
|
||||
{
|
||||
GdkVisual visual;
|
||||
};
|
||||
|
||||
struct _GdkQuartzVisualClass
|
||||
{
|
||||
GdkVisualClass visual_class;
|
||||
};
|
||||
|
||||
|
||||
static GdkVisual *system_visual;
|
||||
static GdkVisual *rgba_visual;
|
||||
static GdkVisual *gray_visual;
|
||||
|
||||
static GdkVisual *
|
||||
create_standard_visual (GdkScreen *screen,
|
||||
gint depth)
|
||||
{
|
||||
GdkVisual *visual = g_object_new (GDK_TYPE_QUARTZ_VISUAL, NULL);
|
||||
|
||||
visual->screen = screen;
|
||||
|
||||
visual->depth = depth;
|
||||
visual->byte_order = GDK_MSB_FIRST; /* FIXME: Should this be different on intel macs? */
|
||||
visual->colormap_size = 0;
|
||||
|
||||
visual->type = GDK_VISUAL_TRUE_COLOR;
|
||||
|
||||
visual->red_mask = 0xff0000;
|
||||
visual->green_mask = 0xff00;
|
||||
visual->blue_mask = 0xff;
|
||||
|
||||
return visual;
|
||||
}
|
||||
|
||||
static GdkVisual *
|
||||
create_gray_visual (GdkScreen *screen)
|
||||
{
|
||||
GdkVisual *visual = g_object_new (GDK_TYPE_QUARTZ_VISUAL, NULL);
|
||||
|
||||
visual->screen = screen;
|
||||
|
||||
visual->depth = 1;
|
||||
visual->byte_order = GDK_MSB_FIRST;
|
||||
visual->colormap_size = 0;
|
||||
|
||||
visual->type = GDK_VISUAL_STATIC_GRAY;
|
||||
|
||||
return visual;
|
||||
}
|
||||
|
||||
|
||||
G_DEFINE_TYPE (GdkQuartzVisual, gdk_quartz_visual, GDK_TYPE_VISUAL)
|
||||
|
||||
static void
|
||||
gdk_quartz_visual_init (GdkQuartzVisual *quartz_visual)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
gdk_quartz_visual_class_init (GdkQuartzVisualClass *class)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
_gdk_quartz_screen_init_visuals (GdkScreen *screen)
|
||||
{
|
||||
system_visual = create_standard_visual (screen, 24);
|
||||
rgba_visual = create_standard_visual (screen, 32);
|
||||
gray_visual = create_gray_visual (screen);
|
||||
}
|
||||
|
@ -940,7 +940,6 @@ _gdk_quartz_window_init_windowing (GdkDisplay *display,
|
||||
|
||||
_gdk_root->impl = g_object_new (_gdk_root_window_impl_quartz_get_type (), NULL);
|
||||
_gdk_root->impl_window = _gdk_root;
|
||||
_gdk_root->visual = gdk_screen_get_system_visual (screen);
|
||||
|
||||
impl = GDK_WINDOW_IMPL_QUARTZ (_gdk_root->impl);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user