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

diff --git a/ChangeLog b/ChangeLog
index 5382717a229e07c308ecc6984049f41c69e636f1..b52d43c4e0228add92ae1c6fdd15b6d720fc14a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * 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 ab43f5f85ef4beb66682a0d6f7b03c32e9fe6f04..0c2d8ad1ac6066dddaafed0e6cf9b1fc46e9e06a 100755 (executable)
--- 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)\r
- *\r
- * Copyright (C) 2003, 2004 Raymond Penners <raymond@dotsphinx.com>\r
- * Includes code adapted from redmond95 by Owen Taylor, and\r
- * gtk-nativewin by Evan Martin\r
- *\r
- * This library is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Library General Public\r
- * License as published by the Free Software Foundation; either\r
- * version 2 of the License, or (at your option) any later version.\r
- *\r
- * This library is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
- * Library General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU Library General Public\r
- * License along with this library; if not, write to the\r
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,\r
- * Boston, MA 02111-1307, USA.\r
- */\r
-\r
-#ifndef MSW_RC_STYLE_H\r
-#define MSW_RC_STYLE_H\r
-\r
-#include "gtk/gtkrc.h"\r
-\r
-typedef struct _MswRcStyle MswRcStyle;\r
-typedef struct _MswRcStyleClass MswRcStyleClass;\r
-\r
-extern GType msw_type_rc_style;\r
-\r
-#define MSW_TYPE_RC_STYLE              msw_type_rc_style\r
-#define MSW_RC_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MSW_TYPE_RC_STYLE, MswRcStyle))\r
-#define MSW_RC_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), MSW_TYPE_RC_STYLE, MswRcStyleClass))\r
-#define MSW_IS_RC_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), MSW_TYPE_RC_STYLE))\r
-#define MSW_IS_RC_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), MSW_TYPE_RC_STYLE))\r
-#define MSW_RC_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), MSW_TYPE_RC_STYLE, MswRcStyleClass))\r
-\r
-struct _MswRcStyle\r
-{\r
-  GtkRcStyle parent_instance;\r
-  \r
-  GList *img_list;\r
-};\r
-\r
-struct _MswRcStyleClass\r
-{\r
-  GtkRcStyleClass parent_class;\r
-};\r
-\r
-void msw_rc_style_register_type (GTypeModule *module);\r
-\r
-#endif /* MSW_TYPE_RC_STYLE */\r
+/* MS-Windows Engine (aka GTK-Wimp)
+ *
+ * Copyright (C) 2003, 2004 Raymond Penners <raymond@dotsphinx.com>
+ * 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 076ec90d89ac5eb3297d90496652bc23653ded75..746fe8bca779f9143d729ec1fb403cc5248f44ef 100755 (executable)
--- 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)\r
- *\r
- * Copyright (C) 2003, 2004 Raymond Penners <raymond@dotsphinx.com>\r
- * Includes code adapted from redmond95 by Owen Taylor, and\r
- * gtk-nativewin by Evan Martin\r
- *\r
- * This library is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Library General Public\r
- * License as published by the Free Software Foundation; either\r
- * version 2 of the License, or (at your option) any later version.\r
- *\r
- * This library is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
- * Library General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU Library General Public\r
- * License along with this library; if not, write to the\r
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,\r
- * Boston, MA 02111-1307, USA.\r
- */\r
-\r
-#ifndef MSW_STYLE_H\r
-#define MSW_STYLE_H\r
-\r
-#include "gtk/gtkstyle.h"\r
-\r
-typedef struct _MswStyle MswStyle;\r
-typedef struct _MswStyleClass MswStyleClass;\r
-\r
-extern GType msw_type_style;\r
-\r
-#define MSW_TYPE_STYLE              msw_type_style\r
-#define MSW_STYLE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), MSW_TYPE_STYLE, MswStyle))\r
-#define MSW_STYLE_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), MSW_TYPE_STYLE, MswStyleClass))\r
-#define MSW_IS_STYLE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), MSW_TYPE_STYLE))\r
-#define MSW_IS_STYLE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), MSW_TYPE_STYLE))\r
-#define MSW_STYLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), MSW_TYPE_STYLE, MswStyleClass))\r
-\r
-struct _MswStyle\r
-{\r
-  GtkStyle parent_instance;\r
-};\r
-\r
-struct _MswStyleClass\r
-{\r
-  GtkStyleClass parent_class;\r
-};\r
-\r
-void msw_style_register_type (GTypeModule *module);\r
-void msw_style_init (void);\r
-void msw_style_finalize (void);\r
-void msw_style_setup_system_settings (void);\r
-\r
-#endif /* MSW_TYPE_STYLE */\r
+/* MS-Windows Engine (aka GTK-Wimp)
+ *
+ * Copyright (C) 2003, 2004 Raymond Penners <raymond@dotsphinx.com>
+ * 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 */