[cairo-commit] cairomm/cairomm fontface.h, 1.7, 1.8 fontoptions.h, 1.6, 1.7 path.h, 1.5, 1.6 pattern.h, 1.8, 1.9 win32_surface.cc, 1.3, 1.4 win32_surface.h, 1.3, 1.4

[Jonathon Jongsma]

Committed by: jjongsma

Update of /cvs/cairo/cairomm/cairomm
In directory kemper:/tmp/cvs-serv3538/cairomm

Modified Files:
	fontface.h fontoptions.h path.h pattern.h win32_surface.cc 
	win32_surface.h 
Log Message:
2006-03-14  Jonathon Jongsma  <jonathon.jongsma at gmail.com>

	* cairomm/fontface.h:
	* cairomm/fontoptions.h:
	* cairomm/path.h:
	* cairomm/pattern.h: include <cairo.h> instead of <cairo/cairo.h> since it
	didn't want to compile on windows without these
	* cairomm/win32_surface.cc:
	* cairomm/win32_surface.h: Move the include of cairo-win32.h from the
	source file to the header since the declaration of create() needs the HDC
	type definition.
	With these changes, cairomm should compile the Win32Surface cleanly with
	mingw on Microsoft Windows


Index: fontface.h
===================================================================
RCS file: /cvs/cairo/cairomm/cairomm/fontface.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fontface.h	6 Mar 2006 17:55:51 -0000	1.7
+++ fontface.h	15 Mar 2006 01:00:59 -0000	1.8
@@ -20,7 +20,7 @@
 #define __CAIROMM_FONTFACE_H
 
 #include <cairomm/enums.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 
 
 namespace Cairo

Index: fontoptions.h
===================================================================
RCS file: /cvs/cairo/cairomm/cairomm/fontoptions.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fontoptions.h	6 Mar 2006 17:55:51 -0000	1.6
+++ fontoptions.h	15 Mar 2006 01:00:59 -0000	1.7
@@ -21,7 +21,7 @@
 
 #include <cairomm/enums.h>
 #include <string>
-#include <cairo/cairo.h>
+#include <cairo.h>
 
 
 namespace Cairo

Index: path.h
===================================================================
RCS file: /cvs/cairo/cairomm/cairomm/path.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- path.h	6 Mar 2006 17:55:51 -0000	1.5
+++ path.h	15 Mar 2006 01:00:59 -0000	1.6
@@ -21,7 +21,7 @@
 
 #include <cairomm/enums.h>
 #include <string>
-#include <cairo/cairo.h>
+#include <cairo.h>
 
 
 namespace Cairo

Index: pattern.h
===================================================================
RCS file: /cvs/cairo/cairomm/cairomm/pattern.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pattern.h	6 Mar 2006 17:55:51 -0000	1.8
+++ pattern.h	15 Mar 2006 01:00:59 -0000	1.9
@@ -21,7 +21,7 @@
 
 #include <cairomm/surface.h>
 #include <cairomm/enums.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 
 
 namespace Cairo

Index: win32_surface.cc
===================================================================
RCS file: /cvs/cairo/cairomm/cairomm/win32_surface.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- win32_surface.cc	6 Mar 2006 17:55:51 -0000	1.3
+++ win32_surface.cc	15 Mar 2006 01:00:59 -0000	1.4
@@ -19,10 +19,6 @@
 #include <cairomm/win32_surface.h>
 #include <cairomm/private.h>
 
-#ifdef CAIRO_HAS_WIN32_SURFACE
-#include <cairo-win32.h>
-#endif
-
 namespace Cairo
 {
 

Index: win32_surface.h
===================================================================
RCS file: /cvs/cairo/cairomm/cairomm/win32_surface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- win32_surface.h	6 Mar 2006 17:55:51 -0000	1.3
+++ win32_surface.h	15 Mar 2006 01:00:59 -0000	1.4
@@ -21,6 +21,10 @@
 
 #include <cairomm/surface.h>
 
+#ifdef CAIRO_HAS_WIN32_SURFACE
+#include <cairo-win32.h>
+#endif
+
 // This header is not included by cairomm.h because it requires Windows headers that 
 // tend to pollute the namespace with non-prefixed #defines and typedefs.
 // You may include it directly if you need to use this API.