AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug #313627. Make win32 theme's handling of toolbars, handleboxes, and

Browse Source 
2005-11-12  Dom Lachowicz <cinamod@hotmail.com>

	* modules/engines/ms-windows/msw_style.c: Bug #313627. Make win32
	theme's handling of toolbars, handleboxes, and menubars more in-line
	with Microsoft's IE style.
	* modules/engines/ms-windows/*.c: Indentation cleanups
This commit is contained in:
Dom Lachowicz 2005-11-12 14:20:51 +00:00 committed by Dom Lachowicz
parent 82f12b610d
commit 5411a3a1a2
6 changed files with 2856 additions and 2504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-11-12 Dom Lachowicz <cinamod@hotmail.com>
* modules/engines/ms-windows/msw_style.c: Bug #313627. Make win32
theme's handling of toolbars, handleboxes, and menubars more in-line
with Microsoft's IE style.
* modules/engines/ms-windows/*.c: Indentation cleanups
2005-11-12 Matthias Clasen <mclasen@redhat.com>
Make builtin icons work in gtk_window_set_icon_name()

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2005-11-12 Dom Lachowicz <cinamod@hotmail.com>
* modules/engines/ms-windows/msw_style.c: Bug #313627. Make win32
theme's handling of toolbars, handleboxes, and menubars more in-line
with Microsoft's IE style.
* modules/engines/ms-windows/*.c: Indentation cleanups
2005-11-12 Matthias Clasen <mclasen@redhat.com>
Make builtin icons work in gtk_window_set_icon_name()

154
modules/engines/ms-windows/msw_rc_style.c
View File

@ -1,78 +1,76 @@
/* 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.
*/
#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);
}
/* 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.
*/
#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);
}

3638
modules/engines/ms-windows/msw_style.c
View File

File diff suppressed because it is too large Load Diff

239
modules/engines/ms-windows/msw_theme_main.c
View File

@ -1,119 +1,120 @@
/* 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.
*/
#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);
}
/* 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.
*/
#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);
}

1315
modules/engines/ms-windows/xp_theme.c
View File

File diff suppressed because it is too large Load Diff