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

Make the ms-windows theme engine build with mingw.

Browse Source 
2004-08-30  Tor Lillqvist  <tml@iki.fi>

	Make the ms-windows theme engine build with mingw.

	* configure.in: Expand also modules/engines/ms-windows/Theme/
	Makefile and .../Theme/gtk-2.0/Makefile.

	* modules/engines/ms-windows/Makefile.am: Adapt for building
	inside the GTK sources.

	* modules/engines/ms-windows/*.c: Use "foo.h" style includes for
	GTK and GDK headers. Use correct path for gdkwin32.h header.

	* modules/engines/ms-windows/msw_style.c: Don't use deprecated GDK
	API.

	* modules/engines/ms-windows/xp_theme_defs.h
	* modules/engines/ms-windows/xp_theme.c: Move definitions of TMT_*
	to xp_theme.c, as they are neither in mingw's nor Platform
	SDK's tmschema.h.

	* modules/engines/ms-windows/xp_theme.c: Define _WIN32_WINNT as
	0x0501 to get the necesssary stuff from mingw's uxtheme.h.
This commit is contained in:
Tor Lillqvist 2004-08-30 20:58:57 +00:00 committed by Tor Lillqvist
parent 7feff029c9
commit 585471a479
13 changed files with 153 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ChangeLog
View File

@ -1,3 +1,27 @@
2004-08-30 Tor Lillqvist <tml@iki.fi>
Make the ms-windows theme engine build with mingw.
* configure.in: Expand also modules/engines/ms-windows/Theme/
Makefile and .../Theme/gtk-2.0/Makefile.
* modules/engines/ms-windows/Makefile.am: Adapt for building
inside the GTK sources.
* modules/engines/ms-windows/*.c: Use "foo.h" style includes for
GTK and GDK headers. Use correct path for gdkwin32.h header.
* modules/engines/ms-windows/msw_style.c: Don't use deprecated GDK
API.
* modules/engines/ms-windows/xp_theme_defs.h
* modules/engines/ms-windows/xp_theme.c: Move definitions of TMT_*
to xp_theme.c, as they are neither in mingw's nor Platform
SDK's tmschema.h.
* modules/engines/ms-windows/xp_theme.c: Define _WIN32_WINNT as
0x0501 to get the necesssary stuff from mingw's uxtheme.h.
2004-08-30 Matthias Clasen <mclasen@redhat.com>
Integrate the ms-windows theme engine (better known as Wimp)
@ -16,7 +40,8 @@
2004-08-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler): Make it compile.
* gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler):
Make it compile.
2004-08-27 Matthias Clasen <mclasen@redhat.com>
@ -95,7 +120,6 @@ Thu Aug 26 22:44:12 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkrange.h (struct _GtkRangeClass): Declare change_value
function.
>>>>>>> 1.5765
2004-08-26 Matthias Clasen <mclasen@redhat.com>
* modules/input/Makefile.am: Build imime.la on Windows.

28
ChangeLog.pre-2-10
View File

@ -1,3 +1,27 @@
2004-08-30 Tor Lillqvist <tml@iki.fi>
Make the ms-windows theme engine build with mingw.
* configure.in: Expand also modules/engines/ms-windows/Theme/
Makefile and .../Theme/gtk-2.0/Makefile.
* modules/engines/ms-windows/Makefile.am: Adapt for building
inside the GTK sources.
* modules/engines/ms-windows/*.c: Use "foo.h" style includes for
GTK and GDK headers. Use correct path for gdkwin32.h header.
* modules/engines/ms-windows/msw_style.c: Don't use deprecated GDK
API.
* modules/engines/ms-windows/xp_theme_defs.h
* modules/engines/ms-windows/xp_theme.c: Move definitions of TMT_*
to xp_theme.c, as they are neither in mingw's nor Platform
SDK's tmschema.h.
* modules/engines/ms-windows/xp_theme.c: Define _WIN32_WINNT as
0x0501 to get the necesssary stuff from mingw's uxtheme.h.
2004-08-30 Matthias Clasen <mclasen@redhat.com>
Integrate the ms-windows theme engine (better known as Wimp)
@ -16,7 +40,8 @@
2004-08-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler): Make it compile.
* gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler):
Make it compile.
2004-08-27 Matthias Clasen <mclasen@redhat.com>
@ -95,7 +120,6 @@ Thu Aug 26 22:44:12 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkrange.h (struct _GtkRangeClass): Declare change_value
function.
>>>>>>> 1.5765
2004-08-26 Matthias Clasen <mclasen@redhat.com>
* modules/input/Makefile.am: Build imime.la on Windows.

28
ChangeLog.pre-2-6
View File

@ -1,3 +1,27 @@
2004-08-30 Tor Lillqvist <tml@iki.fi>
Make the ms-windows theme engine build with mingw.
* configure.in: Expand also modules/engines/ms-windows/Theme/
Makefile and .../Theme/gtk-2.0/Makefile.
* modules/engines/ms-windows/Makefile.am: Adapt for building
inside the GTK sources.
* modules/engines/ms-windows/*.c: Use "foo.h" style includes for
GTK and GDK headers. Use correct path for gdkwin32.h header.
* modules/engines/ms-windows/msw_style.c: Don't use deprecated GDK
API.
* modules/engines/ms-windows/xp_theme_defs.h
* modules/engines/ms-windows/xp_theme.c: Move definitions of TMT_*
to xp_theme.c, as they are neither in mingw's nor Platform
SDK's tmschema.h.
* modules/engines/ms-windows/xp_theme.c: Define _WIN32_WINNT as
0x0501 to get the necesssary stuff from mingw's uxtheme.h.
2004-08-30 Matthias Clasen <mclasen@redhat.com>
Integrate the ms-windows theme engine (better known as Wimp)
@ -16,7 +40,8 @@
2004-08-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler): Make it compile.
* gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler):
Make it compile.
2004-08-27 Matthias Clasen <mclasen@redhat.com>
@ -95,7 +120,6 @@ Thu Aug 26 22:44:12 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkrange.h (struct _GtkRangeClass): Declare change_value
function.
>>>>>>> 1.5765
2004-08-26 Matthias Clasen <mclasen@redhat.com>
* modules/input/Makefile.am: Build imime.la on Windows.

28
ChangeLog.pre-2-8
View File

@ -1,3 +1,27 @@
2004-08-30 Tor Lillqvist <tml@iki.fi>
Make the ms-windows theme engine build with mingw.
* configure.in: Expand also modules/engines/ms-windows/Theme/
Makefile and .../Theme/gtk-2.0/Makefile.
* modules/engines/ms-windows/Makefile.am: Adapt for building
inside the GTK sources.
* modules/engines/ms-windows/*.c: Use "foo.h" style includes for
GTK and GDK headers. Use correct path for gdkwin32.h header.
* modules/engines/ms-windows/msw_style.c: Don't use deprecated GDK
API.
* modules/engines/ms-windows/xp_theme_defs.h
* modules/engines/ms-windows/xp_theme.c: Move definitions of TMT_*
to xp_theme.c, as they are neither in mingw's nor Platform
SDK's tmschema.h.
* modules/engines/ms-windows/xp_theme.c: Define _WIN32_WINNT as
0x0501 to get the necesssary stuff from mingw's uxtheme.h.
2004-08-30 Matthias Clasen <mclasen@redhat.com>
Integrate the ms-windows theme engine (better known as Wimp)
@ -16,7 +40,8 @@
2004-08-30 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler): Make it compile.
* gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler):
Make it compile.
2004-08-27 Matthias Clasen <mclasen@redhat.com>
@ -95,7 +120,6 @@ Thu Aug 26 22:44:12 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkrange.h (struct _GtkRangeClass): Declare change_value
function.
>>>>>>> 1.5765
2004-08-26 Matthias Clasen <mclasen@redhat.com>
* modules/input/Makefile.am: Build imime.la on Windows.

2
configure.in
View File

@ -1624,6 +1624,8 @@ modules/Makefile
modules/input/Makefile
modules/engines/Makefile
modules/engines/ms-windows/Makefile
modules/engines/ms-windows/Theme/Makefile
modules/engines/ms-windows/Theme/gtk-2.0/Makefile
contrib/Makefile
contrib/gdk-pixbuf-xlib/Makefile
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc

20
modules/engines/ms-windows/Makefile.am
View File

@ -2,9 +2,22 @@ SUBDIRS=Theme
EXTRA_DIST=Makefile.msc
INCLUDES=$(MSW_CFLAGS)
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
$(GTK_DEP_CFLAGS)
enginedir=$(libdir)/gtk-2.0/$(GTK_VERSION)/engines
LDADDS = \
$(top_builddir)/gdk/$(gdktargetlib) \
$(top_builddir)/gtk/$(gtktargetlib) \
$(GTK_DEP_LIBS)
enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines
engine_LTLIBRARIES = libwimp.la
@ -21,5 +34,4 @@ libwimp_la_SOURCES = \
libwimp_la_LDFLAGS = \
-avoid-version -module -no-undefined -export-dynamic
libwimp_la_LIBADD= $(MSW_LIBS)
libwimp_la_LIBADD = $(LDADDS)

2
modules/engines/ms-windows/msw_rc_style.h
View File

@ -23,7 +23,7 @@
#ifndef MSW_RC_STYLE_H
#define MSW_RC_STYLE_H
#include <gtk/gtkrc.h>
#include "gtk/gtkrc.h"
typedef struct _MswRcStyle MswRcStyle;
typedef struct _MswRcStyleClass MswRcStyleClass;

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

@ -26,12 +26,13 @@
#include <windows.h>
#include <math.h>
#include <string.h>
#include <gtk/gtk.h>
#include <gtk/gtk.h>
#include <gdk/gdkwin32.h>
#include <stdio.h>
#include "gtk/gtk.h"
#include "gtk/gtk.h"
#include "gdk/win32/gdkwin32.h"
/* Default values, not normally used
*/
static const GtkRequisition default_option_indicator_size = { 9, 8 };
@ -798,12 +799,12 @@ sanitize_size (GdkWindow *window,
if ((*width == -1) && (*height == -1))
{
set_bg = GDK_IS_WINDOW (window);
gdk_window_get_size (window, width, height);
gdk_drawable_get_size (window, width, height);
}
else if (*width == -1)
gdk_window_get_size (window, width, NULL);
gdk_drawable_get_size (window, width, NULL);
else if (*height == -1)
gdk_window_get_size (window, NULL, height);
gdk_drawable_get_size (window, NULL, height);
return set_bg;
}
@ -1499,7 +1500,7 @@ draw_box (GtkStyle *style,
gdk_draw_rectangle (window, gc, TRUE, x, y, width, height);
gdk_gc_unref (gc);
gdk_pixmap_unref (pixmap);
gdk_drawable_unref (pixmap);
return;
}

2
modules/engines/ms-windows/msw_style.h
View File

@ -23,7 +23,7 @@
#ifndef MSW_STYLE_H
#define MSW_STYLE_H
#include <gtk/gtkstyle.h>
#include "gtk/gtkstyle.h"
typedef struct _MswStyle MswStyle;
typedef struct _MswStyleClass MswStyleClass;

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

@ -21,8 +21,10 @@
*/
#include <windows.h>
#include <gmodule.h>
#include <gtk/gtk.h>
#include "gtk/gtk.h"
#include "msw_style.h"
#include "msw_rc_style.h"

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

@ -18,15 +18,18 @@
* Boston, MA 02111-1307, USA.
*/
#define _WIN32_WINNT 0x0501
#include "xp_theme.h"
#include <windows.h>
#include <math.h>
#include <string.h>
#include <gdk/gdkwin32.h>
#include <stdio.h>
#include "gdk/win32/gdkwin32.h"
#ifdef DONT_HAVE_UXTHEME_H
#include "xp_theme_defs.h"
#else
@ -34,6 +37,16 @@
#include <tmschema.h>
#endif
#ifndef TMT_CAPTIONFONT
/* These aren't in mingw's "w32api" headers, nor in the Platform SDK
* headers.
*/
#define TMT_CAPTIONFONT 801
#define TMT_MENUFONT 803
#define TMT_STATUSFONT 804
#define TMT_MSGBOXFONT 805
#endif
static const LPCWSTR class_descriptors[] =
{
L"Scrollbar", /* XP_THEME_CLASS_SCROLLBAR */

3
modules/engines/ms-windows/xp_theme.h
View File

@ -22,7 +22,8 @@
#define XP_THEME_H
#include <windows.h>
#include <gtk/gtk.h>
#include "gtk/gtk.h"
typedef enum
{

5
modules/engines/ms-windows/xp_theme_defs.h
View File

@ -154,9 +154,4 @@ typedef HANDLE HTHEME;
#define SP_PANE 1
#define SP_GRIPPER 2
#define TMT_CAPTIONFONT 801
#define TMT_MENUFONT 803
#define TMT_STATUSFONT 804
#define TMT_MSGBOXFONT 805
#endif /* XP_THEME_DFNS_H */