Integrate the ms-windows theme engine (better known as Wimp) into the

2004-08-30  Matthias Clasen  <mclasen@redhat.com>

	Integrate the ms-windows theme engine (better known as Wimp)
	into the autotools build. Wimp (http://gtk-wimp.sourceforge.net/)
	was written by Raymond Penners and Dom Lachowicz. The Wimp 0.6.2
	sources have been added to the GTK+ source tree in
	modules/engines/ms-windows, and there is a ChangeLog detailing
	the history of Wimp. (#109615, Havoc Pennington)

	* configure.in: Generate modules/engines/Makefile and
	modules/engines/ms-windows/Makefile.

	* modules/Makefile.am (SUBDIRS): Add engines.

	* modules/engines/Makefile.am: Compile ms-windows for win32.

diff --git a/ChangeLog b/ChangeLog
index 5a2a8041442ef3977aeae8124b14b445e41e3668..2678e195f1822b48c71b6aa1a60a2aebee63cb2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2004-08-30  Matthias Clasen  <mclasen@redhat.com>
+
+       Integrate the ms-windows theme engine (better known as Wimp)
+       into the autotools build. Wimp (http://gtk-wimp.sourceforge.net/) 
+       was written by Raymond Penners and Dom Lachowicz. The Wimp 0.6.2
+       sources have been added to the GTK+ source tree in 
+       modules/engines/ms-windows, and there is a ChangeLog detailing 
+       the history of Wimp. (#109615, Havoc Pennington)
+       
+       * configure.in: Generate modules/engines/Makefile and 
+       modules/engines/ms-windows/Makefile.
+
+       * modules/Makefile.am (SUBDIRS): Add engines.
+
+       * modules/engines/Makefile.am: Compile ms-windows for win32.
+
 2004-08-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler): Make it compile.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5a2a8041442ef3977aeae8124b14b445e41e3668..2678e195f1822b48c71b6aa1a60a2aebee63cb2d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,19 @@
+2004-08-30  Matthias Clasen  <mclasen@redhat.com>
+
+       Integrate the ms-windows theme engine (better known as Wimp)
+       into the autotools build. Wimp (http://gtk-wimp.sourceforge.net/) 
+       was written by Raymond Penners and Dom Lachowicz. The Wimp 0.6.2
+       sources have been added to the GTK+ source tree in 
+       modules/engines/ms-windows, and there is a ChangeLog detailing 
+       the history of Wimp. (#109615, Havoc Pennington)
+       
+       * configure.in: Generate modules/engines/Makefile and 
+       modules/engines/ms-windows/Makefile.
+
+       * modules/Makefile.am (SUBDIRS): Add engines.
+
+       * modules/engines/Makefile.am: Compile ms-windows for win32.
+
 2004-08-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler): Make it compile.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5a2a8041442ef3977aeae8124b14b445e41e3668..2678e195f1822b48c71b6aa1a60a2aebee63cb2d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,19 @@
+2004-08-30  Matthias Clasen  <mclasen@redhat.com>
+
+       Integrate the ms-windows theme engine (better known as Wimp)
+       into the autotools build. Wimp (http://gtk-wimp.sourceforge.net/) 
+       was written by Raymond Penners and Dom Lachowicz. The Wimp 0.6.2
+       sources have been added to the GTK+ source tree in 
+       modules/engines/ms-windows, and there is a ChangeLog detailing 
+       the history of Wimp. (#109615, Havoc Pennington)
+       
+       * configure.in: Generate modules/engines/Makefile and 
+       modules/engines/ms-windows/Makefile.
+
+       * modules/Makefile.am (SUBDIRS): Add engines.
+
+       * modules/engines/Makefile.am: Compile ms-windows for win32.
+
 2004-08-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler): Make it compile.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5a2a8041442ef3977aeae8124b14b445e41e3668..2678e195f1822b48c71b6aa1a60a2aebee63cb2d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,19 @@
+2004-08-30  Matthias Clasen  <mclasen@redhat.com>
+
+       Integrate the ms-windows theme engine (better known as Wimp)
+       into the autotools build. Wimp (http://gtk-wimp.sourceforge.net/) 
+       was written by Raymond Penners and Dom Lachowicz. The Wimp 0.6.2
+       sources have been added to the GTK+ source tree in 
+       modules/engines/ms-windows, and there is a ChangeLog detailing 
+       the history of Wimp. (#109615, Havoc Pennington)
+       
+       * configure.in: Generate modules/engines/Makefile and 
+       modules/engines/ms-windows/Makefile.
+
+       * modules/Makefile.am (SUBDIRS): Add engines.
+
+       * modules/engines/Makefile.am: Compile ms-windows for win32.
+
 2004-08-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_delete_surrounding_handler): Make it compile.

diff --git a/configure.in b/configure.in
index 3fa6c2e89a21248a1226228935d4f435656c291e..5dc3a789309415aef8d0c1bdd0cf7a25344fbb91 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1622,6 +1622,8 @@ gtk/theme-bits/Makefile
 gtk/xdgmime/Makefile
 modules/Makefile
 modules/input/Makefile
+modules/engines/Makefile
+modules/engines/ms-windows/Makefile
 contrib/Makefile
 contrib/gdk-pixbuf-xlib/Makefile
 contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc

diff --git a/modules/Makefile.am b/modules/Makefile.am
index a46c3bc32e890c9ed74d4e5783366c514a06cb6e..10e4875ad89014ded3e65328608a059acb2d97b9 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1 +1 @@
-SUBDIRS=input
+SUBDIRS=input engines

diff --git a/modules/engines/Makefile.am b/modules/engines/Makefile.am
new file mode 100644 (file)
index 0000000..a4c1284
--- /dev/null
+++ b/modules/engines/Makefile.am
@@ -0,0 +1,5 @@
+if PLATFORM_WIN32
+wimp = ms-windows
+endif
+
+SUBDIRS = $(wimp)