[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 841
Date : Wed Apr 19 16:04:31 BST 2006
Changed paths:
D /Trunk/XaraLX/Kernel/jconfig.h
M /Trunk/XaraLX/wxOil/basestr.cpp
M /Trunk/XaraLX/wxOil/camelot.cpp
M /Trunk/XaraLX/wxOil/camframe.cpp
M /Trunk/XaraLX/wxOil/camresource.cpp
M /Trunk/XaraLX/wxOil/camresource.h
M /Trunk/XaraLX/wxOil/cartctl.cpp
M /Trunk/XaraLX/wxOil/cartctl.h
M /Trunk/XaraLX/wxOil/cartprov.cpp
M /Trunk/XaraLX/wxOil/cartprov.h
M /Trunk/XaraLX/wxOil/ctrllist.cpp
M /Trunk/XaraLX/wxOil/dlgevt.cpp
M /Trunk/XaraLX/wxOil/dlgevt.h
M /Trunk/XaraLX/wxOil/dlgmgr.cpp
M /Trunk/XaraLX/wxOil/drawctl.h
M /Trunk/XaraLX/wxOil/errors.h
M /Trunk/XaraLX/wxOil/ftfonts.cpp
M /Trunk/XaraLX/wxOil/grndrgn.cpp
A /Trunk/XaraLX/wxOil/jconfig.h (from /Trunk/XaraLX/Kernel/jconfig.h:839)
M /Trunk/XaraLX/wxOil/oilprefs.h
M /Trunk/XaraLX/wxOil/stdwx.h
Rationalized inclusion of wx include files. They now all get included
in stdwx.h which means they get into the pch. Note that wxXtra is
an exception, as these do not use the pch.
Put jconfig.h (which appears unused) in wxOil, where it should be (as it refers to wx stuff). It still directly includes wx/setup.h because it doesn't seem to require camtypes.h to be included & given namespace problems with image libraries, probably best not change that.
Diff:
Index: Trunk/XaraLX/Kernel/jconfig.h (deleted)
===================================================================
Index: Trunk/XaraLX/wxOil/camresource.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camresource.cpp (revision 840)
+++ Trunk/XaraLX/wxOil/camresource.cpp (revision 841)
@@ -99,16 +99,6 @@
#include "camtypes.h"
-#include <wx/wxprec.h>
-#include <wx/filesys.h>
-#include <wx/fs_mem.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/xrc/xh_all.h>
-#include <wx/fs_zip.h>
-#include <wx/filesys.h>
-#include <wx/splash.h>
-#include <wx/bitmap.h>
-
//#include "camconfig.h"
#include "camresource.h"
#include "cartctl.h"
Index: Trunk/XaraLX/wxOil/ftfonts.cpp
===================================================================
--- Trunk/XaraLX/wxOil/ftfonts.cpp (revision 840)
+++ Trunk/XaraLX/wxOil/ftfonts.cpp (revision 841)
@@ -113,17 +113,14 @@
#include "textfuns.h"
#include "oilpanse.h"
-#include "wx/wx.h"
-#include <wx/fontenum.h>
-
-#include "pango/pango.h"
-#include "pango/pangofc-font.h"
+#include <pango/pango.h>
+#include <pango/pangofc-font.h>
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_OUTLINE_H
#ifdef __WXGTK20__
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
extern GtkWidget *wxGetRootWindow();
#endif
Index: Trunk/XaraLX/wxOil/dlgevt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgevt.cpp (revision 840)
+++ Trunk/XaraLX/wxOil/dlgevt.cpp (revision 841)
@@ -99,9 +99,6 @@
#include "camtypes.h"
-#include <wx/wxprec.h>
-#include <wx/event.h>
-
#include "dlgevt.h"
#include "dlgmgr.h"
#include "camframe.h"
Index: Trunk/XaraLX/wxOil/drawctl.h
===================================================================
--- Trunk/XaraLX/wxOil/drawctl.h (revision 840)
+++ Trunk/XaraLX/wxOil/drawctl.h (revision 841)
@@ -99,10 +99,6 @@
#ifndef INC_DRAWCTL
#define INC_DRAWCTL
-#include <wx/wxprec.h>
-#include <wx/event.h>
-#include <wx/xrc/xmlres.h>
-
#include "ctrllist.h"
enum wxCamDrawControlStyle
Index: Trunk/XaraLX/wxOil/cartprov.cpp
===================================================================
--- Trunk/XaraLX/wxOil/cartprov.cpp (revision 840)
+++ Trunk/XaraLX/wxOil/cartprov.cpp (revision 841)
@@ -99,9 +99,6 @@
#include "camtypes.h"
-#include <wx/wxprec.h>
-#include <wx/event.h>
-
#include "cartprov.h"
#include "camframe.h"
#include "cartctl.h"
Index: Trunk/XaraLX/wxOil/camresource.h
===================================================================
--- Trunk/XaraLX/wxOil/camresource.h (revision 840)
+++ Trunk/XaraLX/wxOil/camresource.h (revision 841)
@@ -99,15 +99,6 @@
#ifndef INC_CAMRESOURCE
#define INC_CAMRESOURCE
-#include <wx/wxprec.h>
-
-#include <wx/filesys.h>
-#include <wx/fs_mem.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/xrc/xh_all.h>
-#include <wx/hashmap.h>
-
-
// Define _R() before we include other Camelot headers
// NOTE THIS MACRO IS EXPANDABLE IN A STATIC INITIALIZER
#if 0 != wxUSE_UNICODE
Index: Trunk/XaraLX/wxOil/oilprefs.h
===================================================================
--- Trunk/XaraLX/wxOil/oilprefs.h (revision 840)
+++ Trunk/XaraLX/wxOil/oilprefs.h (revision 841)
@@ -100,7 +100,6 @@
#define INC_OILPREFS
#include "prefs.h"
-#include "wx/config.h"
/********************************************************************************************
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp (revision 840)
+++ Trunk/XaraLX/wxOil/camelot.cpp (revision 841)
@@ -113,9 +113,7 @@
#include "keypress.h"
#include "oilmenus.h"
-#if defined(__WXMSW__)
-#include "wx/sysopt.h"
-#else
+#if !defined(__WXMSW__)
#include "gdraw.h"
#endif
@@ -144,19 +142,7 @@
#define XARA_MENUGEN
//#endif
-#if defined(FILELIST)
-//#include <wx/config.h>
-//#include <wx/confbase.h>
-#include <wx/fileconf.h>
-#if defined(__WXMSW__)
-#include <wx/msw/regconf.h>
-#endif
-
-#endif
-
-#include <wx/cmdline.h>
-
/********************************************************************************************
Preference: MainWndMax
Index: Trunk/XaraLX/wxOil/cartprov.h
===================================================================
--- Trunk/XaraLX/wxOil/cartprov.h (revision 840)
+++ Trunk/XaraLX/wxOil/cartprov.h (revision 841)
@@ -99,9 +99,6 @@
#ifndef INC_CARTPROV
#define INC_CARTPROV
-#include <wx/wxprec.h>
-#include <wx/event.h>
-
#include "ccobject.h"
class CamArtCacheEntry;
Index: Trunk/XaraLX/wxOil/errors.h
===================================================================
--- Trunk/XaraLX/wxOil/errors.h (revision 840)
+++ Trunk/XaraLX/wxOil/errors.h (revision 841)
@@ -106,10 +106,6 @@
#ifndef INC_ERRORS
#define INC_ERRORS
-// FreeBSD does not provide backtrace()
-#if !defined(__WXMAC__) && !defined(__FreeBSD__)
-#include <wx/stackwalk.h>
-#endif
//#include "errordlg.h"
Index: Trunk/XaraLX/wxOil/cartctl.h
===================================================================
--- Trunk/XaraLX/wxOil/cartctl.h (revision 840)
+++ Trunk/XaraLX/wxOil/cartctl.h (revision 841)
@@ -99,10 +99,6 @@
#ifndef INC_CARTCTL
#define INC_CARTCTL
-#include <wx/wxprec.h>
-#include <wx/event.h>
-#include <wx/xrc/xmlres.h>
-
#include "cartprov.h"
#include "ctrllist.h"
Index: Trunk/XaraLX/wxOil/basestr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/basestr.cpp (revision 840)
+++ Trunk/XaraLX/wxOil/basestr.cpp (revision 841)
@@ -111,7 +111,6 @@
//#include "reshelp.h"
//#include "oilmods.h" // for OILModule::xx
#include "convert.h" // for MakePercent
-#include <wx/wxchar.h>
//#include "Res/UKEnglish/stringtbl.h"
Index: Trunk/XaraLX/wxOil/ctrllist.cpp
===================================================================
--- Trunk/XaraLX/wxOil/ctrllist.cpp (revision 840)
+++ Trunk/XaraLX/wxOil/ctrllist.cpp (revision 841)
@@ -99,10 +99,6 @@
#include "camtypes.h"
-#include <wx/wxprec.h>
-#include <wx/event.h>
-#include <wx/tooltip.h>
-
#include "cartctl.h"
#include "cartprov.h"
#include "dlgevt.h"
Index: Trunk/XaraLX/wxOil/dlgevt.h
===================================================================
--- Trunk/XaraLX/wxOil/dlgevt.h (revision 840)
+++ Trunk/XaraLX/wxOil/dlgevt.h (revision 841)
@@ -99,9 +99,6 @@
#ifndef INC_DLGEVT
#define INC_DLGEVT
-#include <wx/wxprec.h>
-#include <wx/event.h>
-
#include "drawctl.h"
#include "ccobject.h"
#include "dlgtypes.h"
Index: Trunk/XaraLX/wxOil/cartctl.cpp
===================================================================
--- Trunk/XaraLX/wxOil/cartctl.cpp (revision 840)
+++ Trunk/XaraLX/wxOil/cartctl.cpp (revision 841)
@@ -99,10 +99,6 @@
#include "camtypes.h"
-#include <wx/wxprec.h>
-#include <wx/event.h>
-#include <wx/tooltip.h>
-
#include "cartctl.h"
#include "cartprov.h"
#include "dlgevt.h"
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 840)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 841)
@@ -101,8 +101,6 @@
// Include files
#include "camtypes.h"
-#include <wx/tooltip.h>
-
#include "dlgmgr.h"
#include "dialogop.h"
//#include "simon.h"
Index: Trunk/XaraLX/wxOil/grndrgn.cpp
===================================================================
--- Trunk/XaraLX/wxOil/grndrgn.cpp (revision 840)
+++ Trunk/XaraLX/wxOil/grndrgn.cpp (revision 841)
@@ -108,8 +108,6 @@
// camconfig.h must be included immediately after camtypes.h
#include "camconfig.h"
-#include <wx/display.h>
-
#include "docview.h"
// Includes (alphabetically ordered for convenience)
Index: Trunk/XaraLX/wxOil/camframe.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camframe.cpp (revision 840)
+++ Trunk/XaraLX/wxOil/camframe.cpp (revision 841)
@@ -123,8 +123,6 @@
#include "ccolbar.h"
#include "dragmgr.h"
-#include "wx/sysopt.h"
-
#if defined(USE_WXAUI)
class CamFrameManager : public wxFrameManager
Index: Trunk/XaraLX/wxOil/stdwx.h
===================================================================
--- Trunk/XaraLX/wxOil/stdwx.h (revision 840)
+++ Trunk/XaraLX/wxOil/stdwx.h (revision 841)
@@ -95,20 +95,54 @@
=================================XARAHEADEREND============================
*/
+
+// First the main include file
#include <wx/wx.h>
+
+// Now specialized bits we might not have got through the above
#include <wx/bitmap.h>
+#include <wx/cmdline.h>
+#include <wx/cmdproc.h>
+#include <wx/config.h>
+#include <wx/dcbuffer.h>
+#include <wx/display.h>
+#include <wx/docmdi.h>
#include <wx/docview.h>
-#include <wx/docmdi.h>
-#include <wx/cmdproc.h>
+#include <wx/event.h>
+#include <wx/fileconf.h>
+#include <wx/file.h>
+#include <wx/filesys.h>
+#include <wx/fontenum.h>
+#include <wx/fs_mem.h>
+#include <wx/fs_zip.h>
+#include <wx/hashmap.h>
#include <wx/image.h>
#include <wx/imagpng.h>
#include <wx/log.h>
#include <wx/rawbmp.h>
+#include <wx/splash.h>
+#include <wx/stdpaths.h>
+#include <wx/sysopt.h>
+#include <wx/tooltip.h>
#include <wx/treectrl.h>
-#include <wx/dcbuffer.h>
-#include <wx/file.h>
-#include <wx/stdpaths.h>
+#include <wx/wxchar.h>
+#include <wx/wxprec.h>
+#include <wx/xrc/xh_all.h>
+#include <wx/xrc/xmlres.h>
+// Now platform dependent stuff
+// FreeBSD does not provide backtrace()
+#if !defined(__WXMAC__) && !defined(__FreeBSD__)
+#include <wx/stackwalk.h>
+#endif
+
+#if defined(__WXMSW__)
+#include <wx/msw/regconf.h>
+#endif
+
+
+
+
#include "wxXtra.h"
#include <memory>
Index: Trunk/XaraLX/wxOil/jconfig.h
===================================================================
--- Trunk/XaraLX/wxOil/jconfig.h (revision 0)
+++ Trunk/XaraLX/wxOil/jconfig.h (revision 841)
@@ -0,0 +1,252 @@
+// $Id$
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+================================XARAHEADERSTART===========================
+
+ Xara LX, a vector drawing and manipulation program.
+ Copyright (C) 1993-2006 Xara Group Ltd.
+ Copyright on certain contributions may be held in joint with their
+ respective authors. See AUTHORS file for details.
+
+LICENSE TO USE AND MODIFY SOFTWARE
+----------------------------------
+
+This file is part of Xara LX.
+
+Xara LX is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published
+by the Free Software Foundation.
+
+Xara LX and its component source files are 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with Xara LX (see the file GPL in the root directory of the
+distribution); if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ADDITIONAL RIGHTS
+-----------------
+
+Conditional upon your continuing compliance with the GNU General Public
+License described above, Xara Group Ltd grants to you certain additional
+rights.
+
+The additional rights are to use, modify, and distribute the software
+together with the wxWidgets library, the wxXtra library, and the "CDraw"
+library and any other such library that any version of Xara LX relased
+by Xara Group Ltd requires in order to compile and execute, including
+the static linking of that library to XaraLX. In the case of the
+"CDraw" library, you may satisfy obligation under the GNU General Public
+License to provide source code by providing a binary copy of the library
+concerned and a copy of the license accompanying it.
+
+Nothing in this section restricts any of the rights you have under
+the GNU General Public License.
+
+
+SCOPE OF LICENSE
+----------------
+
+This license applies to this program (XaraLX) and its constituent source
+files only, and does not necessarily apply to other Xara products which may
+in part share the same code base, and are subject to their own licensing
+terms.
+
+This license does not apply to files in the wxXtra directory, which
+are built into a separate library, and are subject to the wxWindows
+license contained within that directory in the file "WXXTRA-LICENSE".
+
+This license does not apply to the binary libraries (if any) within
+the "libs" directory, which are subject to a separate license contained
+within that directory in the file "LIBS-LICENSE".
+
+
+ARRANGEMENTS FOR CONTRIBUTION OF MODIFICATIONS
+----------------------------------------------
+
+Subject to the terms of the GNU Public License (see above), you are
+free to do whatever you like with your modifications. However, you may
+(at your option) wish contribute them to Xara's source tree. You can
+find details of how to do this at:
+ http://www.xaraxtreme.org/developers/
+
+Prior to contributing your modifications, you will need to complete our
+contributor agreement. This can be found at:
+ http://www.xaraxtreme.org/developers/contribute/
+
+Please note that Xara will not accept modifications which modify any of
+the text between the start and end of this header (marked
+XARAHEADERSTART and XARAHEADEREND).
+
+
+MARKS
+-----
+
+Xara, Xara LX, Xara X, Xara X/Xtreme, Xara Xtreme, the Xtreme and Xara
+designs are registered or unregistered trademarks, design-marks, and/or
+service marks of Xara Group Ltd. All rights in these marks are reserved.
+
+
+ Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+ http://www.xara.com/
+
+=================================XARAHEADEREND============================
+ */
+/* This test added by JACS as a quick fix. What should we do
+ * to make it work with configure?
+ */
+
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__DMC__)
+
+/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */
+/* see jconfig.doc for explanations */
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+/* #define void char */
+/* #define const */
+#undef CHAR_IS_UNSIGNED
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */
+#undef NEED_SHORT_EXTERNAL_NAMES
+#undef INCOMPLETE_TYPES_BROKEN
+
+/* Define "boolean" as unsigned char, not INT32, per Windows custom */
+#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
+typedef unsigned char boolean;
+#endif
+#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
+
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED /* BMP image file format */
+#define GIF_SUPPORTED /* GIF image file format */
+#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED /* Utah RLE image file format */
+#define TARGA_SUPPORTED /* Targa image file format */
+
+#define TWO_FILE_COMMANDLINE /* optional */
+#define USE_SETMODE /* Microsoft has setmode() */
+#undef NEED_SIGNAL_CATCHER
+#undef DONT_USE_B_MODE
+#undef PROGRESS_REPORT /* optional */
+
+#endif /* JPEG_CJPEG_DJPEG */
+
+#else
+
+/* jconfig.h. Generated automatically by configure. */
+/* jconfig.cfg --- source file edited by configure script */
+/* see jconfig.doc for explanations */
+
+/* If using MetroWerks on Mac define __WXMAC__ if it isn't already
+ FIXME: Is this necessary any longer? */
+#ifdef __MWERKS__
+#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
+# ifndef __WXMAC__
+# define __WWXMAC__
+# endif
+#endif
+#endif
+
+/* use wxWidgets' configure */
+#include <wx/setup.h>
+
+/* If using Metrowerks and not using configure-generated setup */
+#if defined(__MWERKS__) && !defined(__WX_SETUP_H__)
+#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
+
+# define USE_MAC_MEMMGR
+
+# ifdef __MACH__
+# include <ansi_prefix.mach.h>
+# include <msl_c_version.h>
+# include <stdint.h>
+# undef WCHAR_MAX
+# include <machine/ansi.h>
+# endif
+
+/* automatically includes MacHeaders */
+#elif (__MWERKS__ >= 0x0900) && __INTEL__
+ #define __WXMSW__
+#endif
+#endif
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+#undef void
+#undef const
+
+/* use wxWidgets' configure */
+/* #undef CHAR_IS_UNSIGNED */
+#ifdef __CHAR_UNSIGNED__
+ #ifndef CHAR_IS_UNSIGNED
+ #define CHAR_IS_UNSIGNED
+ #endif
+#else
+ #undef CHAR_IS_UNSIGNED
+#endif
+
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS
+#undef NEED_SHORT_EXTERNAL_NAMES
+/* Define this if you get warnings about undefined structures. */
+#undef INCOMPLETE_TYPES_BROKEN
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+
+/* use wxWidgets' configure */
+/* #define INLINE __inline__ */
+#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
+#define INLINE
+#elif defined(__WATCOMC__)
+#define INLINE
+#else
+#define INLINE inline
+#endif
+
+/* These are for configuring the JPEG memory manager. */
+#undef DEFAULT_MAX_MEM
+#undef NO_MKTEMP
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED /* BMP image file format */
+#define GIF_SUPPORTED /* GIF image file format */
+#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED /* Utah RLE image file format */
+#define TARGA_SUPPORTED /* Targa image file format */
+
+#undef TWO_FILE_COMMANDLINE
+#undef NEED_SIGNAL_CATCHER
+#undef DONT_USE_B_MODE
+
+/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
+#undef PROGRESS_REPORT
+
+#endif /* JPEG_CJPEG_DJPEG */
+#endif
+ /* _MSC_VER */
+
Property changes on: Trunk/XaraLX/wxOil/jconfig.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Xara