From cbdc3e990c64a9f7295bfd951f87c766efbb82d0 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 30 May 2008 12:31:45 +0000 Subject: [PATCH] modules/engines/ms-windows/msw_style.h Include gtk.h. 2008-05-30 Tor Lillqvist * modules/engines/ms-windows/msw_style.h * modules/engines/ms-windows/msw_rc_style.h: Include gtk.h. svn path=/trunk/; revision=20258 --- ChangeLog | 5 + modules/engines/ms-windows/msw_rc_style.h | 108 ++++++++++----------- modules/engines/ms-windows/msw_style.h | 110 +++++++++++----------- 3 files changed, 114 insertions(+), 109 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5382717a22..b52d43c4e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-30 Tor Lillqvist + + * modules/engines/ms-windows/msw_style.h + * modules/engines/ms-windows/msw_rc_style.h: Include gtk.h. + 2008-05-30 Michael Natterer * gtk/gtkmenu.c (get_attach_info): cast attach_info_free() to diff --git a/modules/engines/ms-windows/msw_rc_style.h b/modules/engines/ms-windows/msw_rc_style.h index ab43f5f85e..0c2d8ad1ac 100755 --- a/modules/engines/ms-windows/msw_rc_style.h +++ b/modules/engines/ms-windows/msw_rc_style.h @@ -1,54 +1,54 @@ -/* MS-Windows Engine (aka GTK-Wimp) - * - * Copyright (C) 2003, 2004 Raymond Penners - * Includes code adapted from redmond95 by Owen Taylor, and - * gtk-nativewin by Evan Martin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MSW_RC_STYLE_H -#define MSW_RC_STYLE_H - -#include "gtk/gtkrc.h" - -typedef struct _MswRcStyle MswRcStyle; -typedef struct _MswRcStyleClass MswRcStyleClass; - -extern GType 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_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_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)) - -struct _MswRcStyle -{ - GtkRcStyle parent_instance; - - GList *img_list; -}; - -struct _MswRcStyleClass -{ - GtkRcStyleClass parent_class; -}; - -void msw_rc_style_register_type (GTypeModule *module); - -#endif /* MSW_TYPE_RC_STYLE */ +/* MS-Windows Engine (aka GTK-Wimp) + * + * Copyright (C) 2003, 2004 Raymond Penners + * Includes code adapted from redmond95 by Owen Taylor, and + * gtk-nativewin by Evan Martin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef MSW_RC_STYLE_H +#define MSW_RC_STYLE_H + +#include "gtk/gtk.h" + +typedef struct _MswRcStyle MswRcStyle; +typedef struct _MswRcStyleClass MswRcStyleClass; + +extern GType 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_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_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)) + +struct _MswRcStyle +{ + GtkRcStyle parent_instance; + + GList *img_list; +}; + +struct _MswRcStyleClass +{ + GtkRcStyleClass parent_class; +}; + +void msw_rc_style_register_type (GTypeModule *module); + +#endif /* MSW_TYPE_RC_STYLE */ diff --git a/modules/engines/ms-windows/msw_style.h b/modules/engines/ms-windows/msw_style.h index 076ec90d89..746fe8bca7 100755 --- a/modules/engines/ms-windows/msw_style.h +++ b/modules/engines/ms-windows/msw_style.h @@ -1,55 +1,55 @@ -/* MS-Windows Engine (aka GTK-Wimp) - * - * Copyright (C) 2003, 2004 Raymond Penners - * Includes code adapted from redmond95 by Owen Taylor, and - * gtk-nativewin by Evan Martin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef MSW_STYLE_H -#define MSW_STYLE_H - -#include "gtk/gtkstyle.h" - -typedef struct _MswStyle MswStyle; -typedef struct _MswStyleClass MswStyleClass; - -extern GType 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_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_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)) - -struct _MswStyle -{ - GtkStyle parent_instance; -}; - -struct _MswStyleClass -{ - GtkStyleClass parent_class; -}; - -void msw_style_register_type (GTypeModule *module); -void msw_style_init (void); -void msw_style_finalize (void); -void msw_style_setup_system_settings (void); - -#endif /* MSW_TYPE_STYLE */ +/* MS-Windows Engine (aka GTK-Wimp) + * + * Copyright (C) 2003, 2004 Raymond Penners + * Includes code adapted from redmond95 by Owen Taylor, and + * gtk-nativewin by Evan Martin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef MSW_STYLE_H +#define MSW_STYLE_H + +#include "gtk/gtk.h" + +typedef struct _MswStyle MswStyle; +typedef struct _MswStyleClass MswStyleClass; + +extern GType 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_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_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)) + +struct _MswStyle +{ + GtkStyle parent_instance; +}; + +struct _MswStyleClass +{ + GtkStyleClass parent_class; +}; + +void msw_style_register_type (GTypeModule *module); +void msw_style_init (void); +void msw_style_finalize (void); +void msw_style_setup_system_settings (void); + +#endif /* MSW_TYPE_STYLE */