CVSROOT: /cvs/gnome
Module name: ooo-build
Changes by: tml 06/09/29 04:23:47
Modified files:
patches/cairo : cairo-canvas-win32.diff
cairo-config_office-configure-in.diff
cairo-makefile-mk.diff
cairocanvas-check-bitmap-system-data-pixmap-size.diff
cairocanvas-vcl-add-pixmap-size-to-bitmap-system-data.diff
Log message:
2006-09-27 Tor Lillqvist <[EMAIL PROTECTED]>
Initial commit of diffs for the cairo canvas code on Win32. Work
in progress. No idea whether it works at all yet, but at least the
cairo canvas DLL did build successfully at one stage. For some
unrelated reason, I seem to have to do a clean rebuild of all of
OO.o right now. (I get a weird component registration problem with
binfilter, for instance.) So, it will have to wait some days until
the build is done before I can actually try running OO.o with the
cairo canvas on Win32.
* patches/cairo/cairo-canvas-win32.diff (canvas/prj/build.lst):
Make it depend on cairo if the CAIRO build type is turned on.
(canvas/source/cairo/makefile.mk): On Win32 link with cairo.lib,
pixman.lib and gdi32.lib.
(canvas/source/cairo/cairo_cairo.hxx): Include <stdio.h> for
NULL. No need for mpDisplay, mhDrawable, and mpRenderFormat fields
on Win32. Adapt constructors and methods correspondingly on Win32.
(canvas/source/cairo/cairo_helper.hxx): Make many of the functions
X11-only.
(canvas/source/cairo/cairo_cairo.cxx): Adapt for Win32.
(canvas/source/cairo/cairo_canvashelper.cxx)
(canvas/source/cairo/cairo_spritehelper.cxx): Use namespace
::rtl::math for round().
(canvas/source/cairo/cairo_canvashelper_text.cxx): Include
<windows.h> (surrounded by the lovely <tools/prewin.h> and
<tools/postwin.h> headers) on WNT. Add ifdefs for the X11 code,
add corresponding Win32 code. Use F_PI instead of the nonportable
M_PI.
(canvas/source/cairo/cairo_helper.cxx): Also include <windows.h>
here, add ifdefs for X11 code, add Win32 code.
* patches/cairo/cairo-config_office-configure-in.diff
(config_office/configure.in): Add CAIRO to BUILD_TYPE if using
internal cairo.
* patches/cairo/cairo-makefile-mk.diff (cairo/makefile.mk):
Deliver also cairo-win32.h.
* patches/cairo/cairocanvas-check-bitmap-system-data-pixmap-size.diff
(canvas/source/cairo/cairo_helper.cxx): Yes, more diffs to the
same file here as in cairo-canvas-win32.diff. Part of the diffs
for Win32 would have partially overlapped the lines already
handled in this diff, so have to have them here.
* patches/cairo/cairocanvas-vcl-add-pixmap-size-to-bitmap-system-data.diff
(vcl/inc/bitmap.hxx): Have the mnWidth and mnHeight fields also on
Win32. Don't know if this will turn out to be absolutely
necessary.
(vcl/win/source/gdi/salbmp.cxx): Set mnWidth and mnHeight in
WinSalBitmap::GetSystemData().
URL :
http://cvs.gnome.org/bonsai/cvsquery.cgi?branch=&dir=ooo-build&who=tml&date=explicit&mindate=2006-09-29%2004:22&maxdate=2006-09-29%2004:24
_______________________________________________
cvs-commits-list mailing list
cvs-commits-list@gnome.org
http://mail.gnome.org/mailman/listinfo/cvs-commits-list
