modules/engines/ms-windows/msw_style.h Include gtk.h.

2008-05-30  Tor Lillqvist  <tml@novell.com>

	* modules/engines/ms-windows/msw_style.h
	* modules/engines/ms-windows/msw_rc_style.h: Include gtk.h.


svn path=/trunk/; revision=20258
This commit is contained in:
Tor Lillqvist
2008-05-30 12:31:45 +00:00
committed by Tor Lillqvist
parent bd2b0d30a8
commit cbdc3e990c
3 changed files with 114 additions and 109 deletions

View File

@ -1,3 +1,8 @@
2008-05-30 Tor Lillqvist <tml@novell.com>
* modules/engines/ms-windows/msw_style.h
* modules/engines/ms-windows/msw_rc_style.h: Include gtk.h.
2008-05-30 Michael Natterer <mitch@imendio.com> 2008-05-30 Michael Natterer <mitch@imendio.com>
* gtk/gtkmenu.c (get_attach_info): cast attach_info_free() to * gtk/gtkmenu.c (get_attach_info): cast attach_info_free() to

View File

@ -1,54 +1,54 @@
/* MS-Windows Engine (aka GTK-Wimp) /* MS-Windows Engine (aka GTK-Wimp)
* *
* Copyright (C) 2003, 2004 Raymond Penners <raymond@dotsphinx.com> * Copyright (C) 2003, 2004 Raymond Penners <raymond@dotsphinx.com>
* Includes code adapted from redmond95 by Owen Taylor, and * Includes code adapted from redmond95 by Owen Taylor, and
* gtk-nativewin by Evan Martin * gtk-nativewin by Evan Martin
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details. * Library General Public License for more details.
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef MSW_RC_STYLE_H #ifndef MSW_RC_STYLE_H
#define MSW_RC_STYLE_H #define MSW_RC_STYLE_H
#include "gtk/gtkrc.h" #include "gtk/gtk.h"
typedef struct _MswRcStyle MswRcStyle; typedef struct _MswRcStyle MswRcStyle;
typedef struct _MswRcStyleClass MswRcStyleClass; typedef struct _MswRcStyleClass MswRcStyleClass;
extern GType msw_type_rc_style; extern GType msw_type_rc_style;
#define MSW_TYPE_RC_STYLE msw_type_rc_style #define MSW_TYPE_RC_STYLE msw_type_rc_style
#define MSW_RC_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), MSW_TYPE_RC_STYLE, MswRcStyle)) #define MSW_RC_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), MSW_TYPE_RC_STYLE, MswRcStyle))
#define MSW_RC_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MSW_TYPE_RC_STYLE, MswRcStyleClass)) #define MSW_RC_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MSW_TYPE_RC_STYLE, MswRcStyleClass))
#define MSW_IS_RC_STYLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), MSW_TYPE_RC_STYLE)) #define MSW_IS_RC_STYLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), MSW_TYPE_RC_STYLE))
#define MSW_IS_RC_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MSW_TYPE_RC_STYLE)) #define MSW_IS_RC_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MSW_TYPE_RC_STYLE))
#define MSW_RC_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MSW_TYPE_RC_STYLE, MswRcStyleClass)) #define MSW_RC_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MSW_TYPE_RC_STYLE, MswRcStyleClass))
struct _MswRcStyle struct _MswRcStyle
{ {
GtkRcStyle parent_instance; GtkRcStyle parent_instance;
GList *img_list; GList *img_list;
}; };
struct _MswRcStyleClass struct _MswRcStyleClass
{ {
GtkRcStyleClass parent_class; GtkRcStyleClass parent_class;
}; };
void msw_rc_style_register_type (GTypeModule *module); void msw_rc_style_register_type (GTypeModule *module);
#endif /* MSW_TYPE_RC_STYLE */ #endif /* MSW_TYPE_RC_STYLE */

View File

@ -1,55 +1,55 @@
/* MS-Windows Engine (aka GTK-Wimp) /* MS-Windows Engine (aka GTK-Wimp)
* *
* Copyright (C) 2003, 2004 Raymond Penners <raymond@dotsphinx.com> * Copyright (C) 2003, 2004 Raymond Penners <raymond@dotsphinx.com>
* Includes code adapted from redmond95 by Owen Taylor, and * Includes code adapted from redmond95 by Owen Taylor, and
* gtk-nativewin by Evan Martin * gtk-nativewin by Evan Martin
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version. * version 2 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details. * Library General Public License for more details.
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef MSW_STYLE_H #ifndef MSW_STYLE_H
#define MSW_STYLE_H #define MSW_STYLE_H
#include "gtk/gtkstyle.h" #include "gtk/gtk.h"
typedef struct _MswStyle MswStyle; typedef struct _MswStyle MswStyle;
typedef struct _MswStyleClass MswStyleClass; typedef struct _MswStyleClass MswStyleClass;
extern GType msw_type_style; extern GType msw_type_style;
#define MSW_TYPE_STYLE msw_type_style #define MSW_TYPE_STYLE msw_type_style
#define MSW_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), MSW_TYPE_STYLE, MswStyle)) #define MSW_STYLE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), MSW_TYPE_STYLE, MswStyle))
#define MSW_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MSW_TYPE_STYLE, MswStyleClass)) #define MSW_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MSW_TYPE_STYLE, MswStyleClass))
#define MSW_IS_STYLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), MSW_TYPE_STYLE)) #define MSW_IS_STYLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), MSW_TYPE_STYLE))
#define MSW_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MSW_TYPE_STYLE)) #define MSW_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MSW_TYPE_STYLE))
#define MSW_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MSW_TYPE_STYLE, MswStyleClass)) #define MSW_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MSW_TYPE_STYLE, MswStyleClass))
struct _MswStyle struct _MswStyle
{ {
GtkStyle parent_instance; GtkStyle parent_instance;
}; };
struct _MswStyleClass struct _MswStyleClass
{ {
GtkStyleClass parent_class; GtkStyleClass parent_class;
}; };
void msw_style_register_type (GTypeModule *module); void msw_style_register_type (GTypeModule *module);
void msw_style_init (void); void msw_style_init (void);
void msw_style_finalize (void); void msw_style_finalize (void);
void msw_style_setup_system_settings (void); void msw_style_setup_system_settings (void);
#endif /* MSW_TYPE_STYLE */ #endif /* MSW_TYPE_STYLE */