Thread: [Gtk-wimp-cvs] gtk-wimp/src msw_rc_style.c,1.2,1.3 msw_style.c,1.32,1.33 msw_theme_main.c,1.6,1.7 xp

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/gtk-wimp/gtk-wimp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18750

Modified Files:
	msw_rc_style.c msw_style.c msw_theme_main.c xp_theme.c 
Log Message:
indentation fixes to be more in line with the GTK+ style

Index: msw_rc_style.c
===================================================================
RCS file: /cvsroot/gtk-wimp/gtk-wimp/src/msw_rc_style.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** msw_rc_style.c	3 May 2005 20:06:36 -0000	1.2
--- msw_rc_style.c	12 Nov 2005 14:09:10 -0000	1.3
***************
*** 1,78 ****
! /* MS-Windows Engine (aka GTK-Wimp)
!  *
!  * Copyright (C) 2003, 2004 Raymond Penners <ra...@do...>
!  * 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.
!  */
! 
! #include "msw_style.h"
! #include "msw_rc_style.h"
! 
! static void      msw_rc_style_init         (MswRcStyle      *style);
! static void      msw_rc_style_class_init   (MswRcStyleClass *klass);
! static GtkStyle *msw_rc_style_create_style (GtkRcStyle         *rc_style);
! 
! static GtkRcStyleClass *parent_class;
! 
! GType msw_type_rc_style = 0;
! 
! void
! msw_rc_style_register_type (GTypeModule *module)
! {
!   static const GTypeInfo object_info =
!   {
!     sizeof (MswRcStyleClass),
!     (GBaseInitFunc) NULL,
!     (GBaseFinalizeFunc) NULL,
!     (GClassInitFunc) msw_rc_style_class_init,
!     NULL,           /* class_finalize */
!     NULL,           /* class_data */
!     sizeof (MswRcStyle),
!     0,              /* n_preallocs */
!     (GInstanceInitFunc) msw_rc_style_init,
!   };
!   
!   msw_type_rc_style = g_type_module_register_type (module,
! 						      GTK_TYPE_RC_STYLE,
! 						      "MswRcStyle",
! 						      &object_info, 0);
! }
! 
! static void
! msw_rc_style_init (MswRcStyle *style)
! {
! }
! 
! static void
! msw_rc_style_class_init (MswRcStyleClass *klass)
! {
!   GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
! 
!   parent_class = g_type_class_peek_parent (klass);
! 
!   rc_style_class->create_style = msw_rc_style_create_style;
! }
! 
! /* Create an empty style suitable to this RC style
!  */
! static GtkStyle *
! msw_rc_style_create_style (GtkRcStyle *rc_style)
! {
!   return g_object_new (MSW_TYPE_STYLE, NULL);
! }
! 
--- 1,76 ----
! /* MS-Windows Engine (aka GTK-Wimp)
!  *
!  * Copyright (C) 2003, 2004 Raymond Penners <ra...@do...>
!  * 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.
!  */
! 
! #include "msw_style.h"
! #include "msw_rc_style.h"
! 
! static void msw_rc_style_init (MswRcStyle * style);
! static void msw_rc_style_class_init (MswRcStyleClass * klass);
! static GtkStyle *msw_rc_style_create_style (GtkRcStyle * rc_style);
! 
! static GtkRcStyleClass *parent_class;
! 
! GType msw_type_rc_style = 0;
! 
! void
! msw_rc_style_register_type (GTypeModule * module)
! {
!     static const GTypeInfo object_info = {
! 	sizeof (MswRcStyleClass),
! 	(GBaseInitFunc) NULL,
! 	(GBaseFinalizeFunc) NULL,
! 	(GClassInitFunc) msw_rc_style_class_init,
! 	NULL,			/* class_finalize */
! 	NULL,			/* class_data */
! 	sizeof (MswRcStyle),
! 	0,			/* n_preallocs */
! 	(GInstanceInitFunc) msw_rc_style_init,
!     };
! 
!     msw_type_rc_style = g_type_module_register_type (module,
! 						     GTK_TYPE_RC_STYLE,
! 						     "MswRcStyle",
! 						     &object_info, 0);
! }
! 
! static void
! msw_rc_style_init (MswRcStyle * style)
! {
! }
! 
! static void
! msw_rc_style_class_init (MswRcStyleClass * klass)
! {
!     GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
! 
!     parent_class = g_type_class_peek_parent (klass);
! 
!     rc_style_class->create_style = msw_rc_style_create_style;
! }
! 
! /* Create an empty style suitable to this RC style
!  */
! static GtkStyle *
! msw_rc_style_create_style (GtkRcStyle * rc_style)
! {
!     return g_object_new (MSW_TYPE_STYLE, NULL);
! }

Index: msw_style.c
===================================================================
RCS file: /cvsroot/gtk-wimp/gtk-wimp/src/msw_style.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** msw_style.c	12 Nov 2005 04:15:17 -0000	1.32
--- msw_style.c	12 Nov 2005 14:09:10 -0000	1.33
***************
*** 40,43 ****
--- 40,44 ----
  #include "gtk/gtk.h"
  #include <gdk/gdkwin32.h>
+ 
  /* #include "gdk/win32/gdkwin32.h" */
  
***************
*** 50,67 ****
  static GtkStyleClass *parent_class;
  
[...4342 lines suppressed...]
! 						  GTK_TYPE_STYLE,
! 						  "MswStyle",
! 						  &object_info, 0);
  }
  
***************
*** 2182,2187 ****
  msw_style_init (void)
  {
!   xp_theme_init ();
!   msw_style_setup_system_settings ();
!   setup_msw_rc_style ();
  }
--- 2362,2367 ----
  msw_style_init (void)
  {
!     xp_theme_init ();
!     msw_style_setup_system_settings ();
!     setup_msw_rc_style ();
  }

Index: xp_theme.c
===================================================================
RCS file: /cvsroot/gtk-wimp/gtk-wimp/src/xp_theme.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** xp_theme.c	27 Jun 2005 14:54:40 -0000	1.40
--- xp_theme.c	12 Nov 2005 14:09:10 -0000	1.41
***************
*** 42,45 ****
--- 42,46 ----
  
  #ifndef TMT_CAPTIONFONT
+ 
  /* These aren't in mingw's "w32api" headers, nor in the Platform SDK
   * headers.
***************
*** 80,157 ****
  #define TRS_NORMAL 1
  
[...1642 lines suppressed...]
! 	}
! 
!     return FALSE;
  }
  
  gboolean
! xp_theme_get_system_metric (XpThemeClass klazz, int metricId, OUT int *pVal)
  {
!     if (xp_theme_is_active () && get_theme_sys_metric_func != NULL)
! 	{
! 	    HTHEME theme = xp_theme_get_handle_by_class (klazz);
  
! 	    /* if theme is NULL, it will just return the GetSystemMetrics()
! 	       value */
! 	    *pVal = (*get_theme_sys_metric_func) (theme, metricId);
! 	    return TRUE;
! 	}
! 
!     return FALSE;
  }

Index: msw_theme_main.c
===================================================================
RCS file: /cvsroot/gtk-wimp/gtk-wimp/src/msw_theme_main.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** msw_theme_main.c	3 May 2005 20:06:36 -0000	1.6
--- msw_theme_main.c	12 Nov 2005 14:09:10 -0000	1.7
***************
*** 1,119 ****
! /* MS-Windows Engine (aka GTK-Wimp)
!  *
!  * Copyright (C) 2003, 2004 Raymond Penners <ra...@do...>
!  * 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.
!  */
! 
! #include <windows.h>
! 
! #include <gmodule.h>
! 
! #include "gtk/gtk.h"
! 
! #include "msw_style.h"
! #include "msw_rc_style.h"
! #include "xp_theme.h"
! 
! #ifndef WM_THEMECHANGED
! #define WM_THEMECHANGED 0x031A /* winxp only */
! #endif
! 
! static GModule * this_module = NULL;
! static void (*msw_rc_reset_styles) (GtkSettings * settings) = NULL;
! 
! static GdkFilterReturn
! global_filter_func (void     *xevent,
! 		    GdkEvent *event,
! 		    gpointer  data)
! {
!   MSG *msg = (MSG *) xevent;
! 
!   switch (msg->message)
!     {
!       /* catch theme changes */
!     case WM_THEMECHANGED:
!     case WM_SYSCOLORCHANGE:
! 
!       if(msw_rc_reset_styles != NULL) {
! 	  	xp_theme_reset ();
! 	  	msw_style_init ();
! 
! 	  	/* force all gtkwidgets to redraw */
! 		(*msw_rc_reset_styles) (gtk_settings_get_default());
! 	  }
! 
!       return GDK_FILTER_REMOVE;
! 
!     case WM_SETTINGCHANGE:
!       /* catch cursor blink, etc... changes */
!       msw_style_setup_system_settings ();
!       return GDK_FILTER_REMOVE;
! 
!     default:
!       return GDK_FILTER_CONTINUE;
!     }
! }
! 
! G_MODULE_EXPORT void
! theme_init (GTypeModule *module)
! {
!   msw_rc_style_register_type (module);
!   msw_style_register_type (module);
! 
!   /* this craziness is required because only gtk 2.4.x and later have
!      gtk_rc_reset_styles(). But we want to be able to run acceptly well
!      on any GTK 2.x.x platform. */
!   if(gtk_check_version(2,4,0) == NULL) {
!     this_module = g_module_open(NULL, 0);
! 
!     if(this_module)
!       g_module_symbol (this_module, "gtk_rc_reset_styles",
! 		       (gpointer *)(&msw_rc_reset_styles));
!   }
! 
!   msw_style_init ();
!   gdk_window_add_filter (NULL, global_filter_func, NULL);
! }
! 
! G_MODULE_EXPORT void
! theme_exit (void)
! {
!   gdk_window_remove_filter (NULL, global_filter_func, NULL);
! 
!   if(this_module) {
!     g_module_close(this_module);
!     this_module = NULL;
!   }
! }
! 
! G_MODULE_EXPORT GtkRcStyle *
! theme_create_rc_style (void)
! {
!   return g_object_new (MSW_TYPE_RC_STYLE, NULL);
! }
! 
! /* The following function will be called by GTK+ when the module
!  * is loaded and checks to see if we are compatible with the
!  * version of GTK+ that loads us.
!  */
! G_MODULE_EXPORT const gchar*
! g_module_check_init (GModule *module)
! {
!   return gtk_check_version (2,0,0);
! }
--- 1,120 ----
! /* MS-Windows Engine (aka GTK-Wimp)
!  *
!  * Copyright (C) 2003, 2004 Raymond Penners <ra...@do...>
!  * 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.
!  */
! 
! #include <windows.h>
! 
! #include <gmodule.h>
! 
! #include "gtk/gtk.h"
! 
! #include "msw_style.h"
! #include "msw_rc_style.h"
! #include "xp_theme.h"
! 
! #ifndef WM_THEMECHANGED
! #define WM_THEMECHANGED 0x031A	/* winxp only */
! #endif
! 
! static GModule *this_module = NULL;
! static void (*msw_rc_reset_styles) (GtkSettings * settings) = NULL;
! 
! static GdkFilterReturn
! global_filter_func (void *xevent, GdkEvent * event, gpointer data)
! {
!     MSG *msg = (MSG *) xevent;
! 
!     switch (msg->message)
! 	{
! 	    /* catch theme changes */
! 	case WM_THEMECHANGED:
! 	case WM_SYSCOLORCHANGE:
! 
! 	    if (msw_rc_reset_styles != NULL)
! 		{
! 		    xp_theme_reset ();
! 		    msw_style_init ();
! 
! 		    /* force all gtkwidgets to redraw */
! 		    (*msw_rc_reset_styles) (gtk_settings_get_default ());
! 		}
! 
! 	    return GDK_FILTER_REMOVE;
! 
! 	case WM_SETTINGCHANGE:
! 	    /* catch cursor blink, etc... changes */
! 	    msw_style_setup_system_settings ();
! 	    return GDK_FILTER_REMOVE;
! 
! 	default:
! 	    return GDK_FILTER_CONTINUE;
! 	}
! }
! 
! G_MODULE_EXPORT void
! theme_init (GTypeModule * module)
! {
!     msw_rc_style_register_type (module);
!     msw_style_register_type (module);
! 
!     /* this craziness is required because only gtk 2.4.x and later have
!        gtk_rc_reset_styles(). But we want to be able to run acceptly well on
!        any GTK 2.x.x platform. */
!     if (gtk_check_version (2, 4, 0) == NULL)
! 	{
! 	    this_module = g_module_open (NULL, 0);
! 
! 	    if (this_module)
! 		g_module_symbol (this_module, "gtk_rc_reset_styles",
! 				 (gpointer *) (&msw_rc_reset_styles));
! 	}
! 
!     msw_style_init ();
!     gdk_window_add_filter (NULL, global_filter_func, NULL);
! }
! 
! G_MODULE_EXPORT void
! theme_exit (void)
! {
!     gdk_window_remove_filter (NULL, global_filter_func, NULL);
! 
!     if (this_module)
! 	{
! 	    g_module_close (this_module);
! 	    this_module = NULL;
! 	}
! }
! 
! G_MODULE_EXPORT GtkRcStyle *
! theme_create_rc_style (void)
! {
!     return g_object_new (MSW_TYPE_RC_STYLE, NULL);
! }
! 
! /* The following function will be called by GTK+ when the module
!  * is loaded and checks to see if we are compatible with the
!  * version of GTK+ that loads us.
!  */
! G_MODULE_EXPORT const gchar *
! g_module_check_init (GModule * module)
! {
!     return gtk_check_version (2, 0, 0);
! }

Thread: [Gtk-wimp-cvs] gtk-wimp/src msw_rc_style.c,1.2,1.3 msw_style.c,1.32,1.33 msw_theme_main.c,1.6,1.7 xp

gtk-wimp-cvs