[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1269
Date : Thu Jun 8 10:27:45 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/attrappl.cpp
M /Trunk/XaraLX/Kernel/bitfilt.cpp
M /Trunk/XaraLX/Kernel/bmpalctrl.cpp
M /Trunk/XaraLX/Kernel/bmpprefs.h
M /Trunk/XaraLX/Kernel/camfiltr.h
M /Trunk/XaraLX/Kernel/coldlog.h
M /Trunk/XaraLX/Kernel/dialogop.cpp
M /Trunk/XaraLX/Kernel/dialogop.h
M /Trunk/XaraLX/Kernel/docview.h
M /Trunk/XaraLX/Kernel/fillattr.h
M /Trunk/XaraLX/Kernel/filters.h
M /Trunk/XaraLX/Kernel/mrhbits.cpp
M /Trunk/XaraLX/Kernel/ngcore.cpp
M /Trunk/XaraLX/Kernel/nodebev.cpp
M /Trunk/XaraLX/Kernel/nodebev.h
M /Trunk/XaraLX/Kernel/nodebmp.cpp
M /Trunk/XaraLX/Kernel/nodeliveeffect.cpp
M /Trunk/XaraLX/Kernel/nodepath.cpp
M /Trunk/XaraLX/Kernel/prevwdlg.h
M /Trunk/XaraLX/Kernel/sgtree.cpp
M /Trunk/XaraLX/tools/bevinfo.cpp
M /Trunk/XaraLX/tools/bevtool.cpp
M /Trunk/XaraLX/tools/blndtool.cpp
M /Trunk/XaraLX/tools/cntrtool.cpp
M /Trunk/XaraLX/tools/freeinfo.cpp
M /Trunk/XaraLX/tools/textops.cpp
M /Trunk/XaraLX/wxOil/colpick.cpp
M /Trunk/XaraLX/wxOil/convert.h
M /Trunk/XaraLX/wxOil/dlgmgr.cpp
M /Trunk/XaraLX/wxOil/dlgmgr.h
More dependency reductions
Diff:
Index: Trunk/XaraLX/tools/bevinfo.cpp
===================================================================
--- Trunk/XaraLX/tools/bevinfo.cpp (revision 1268)
+++ Trunk/XaraLX/tools/bevinfo.cpp (revision 1269)
@@ -101,6 +101,7 @@
*/
#include "camtypes.h"
+#include "docview.h"
//#include "app.h"
//#include "resource.h"
#include "bevinfo.h"
Index: Trunk/XaraLX/tools/cntrtool.cpp
===================================================================
--- Trunk/XaraLX/tools/cntrtool.cpp (revision 1268)
+++ Trunk/XaraLX/tools/cntrtool.cpp (revision 1269)
@@ -103,6 +103,7 @@
#include "camtypes.h"
#include "oilfiles.h"
#include "csrstack.h"
+#include "docview.h"
//#include "markn.h"
#include "spread.h"
#include "nodepath.h"
Index: Trunk/XaraLX/tools/bevtool.cpp
===================================================================
--- Trunk/XaraLX/tools/bevtool.cpp (revision 1268)
+++ Trunk/XaraLX/tools/bevtool.cpp (revision 1269)
@@ -109,7 +109,7 @@
//#include "rik.h"
//#include "markn.h"
//#include "viewrc.h"
-//#include "docview.h"
+#include "docview.h"
//#include "document.h"
//#include "mainfrm.h"
#include "infobar.h"
Index: Trunk/XaraLX/tools/freeinfo.cpp
===================================================================
--- Trunk/XaraLX/tools/freeinfo.cpp (revision 1268)
+++ Trunk/XaraLX/tools/freeinfo.cpp (revision 1269)
@@ -103,6 +103,7 @@
#include "camtypes.h"
#include "freehand.h"
#include "freeinfo.h"
+#include "dlgmgr.h"
#include "range.h"
//#include "resource.h"
//#include "barsdlgs.h"
Index: Trunk/XaraLX/tools/textops.cpp
===================================================================
--- Trunk/XaraLX/tools/textops.cpp (revision 1268)
+++ Trunk/XaraLX/tools/textops.cpp (revision 1269)
@@ -115,6 +115,7 @@
#include "camtypes.h"
#include "textops.h"
+#include "dlgmgr.h"
// Resource files
//#include "markg.h"
Index: Trunk/XaraLX/tools/blndtool.cpp
===================================================================
--- Trunk/XaraLX/tools/blndtool.cpp (revision 1268)
+++ Trunk/XaraLX/tools/blndtool.cpp (revision 1269)
@@ -102,6 +102,7 @@
#include "camtypes.h"
//#include "oilfiles.h"
+#include "docview.h"
#include "selop.h"
#include "csrstack.h"
//#include "markn.h"
Index: Trunk/XaraLX/Kernel/attrappl.cpp
===================================================================
--- Trunk/XaraLX/Kernel/attrappl.cpp (revision 1268)
+++ Trunk/XaraLX/Kernel/attrappl.cpp (revision 1269)
@@ -129,6 +129,7 @@
#include "brshattr.h"
#include "effects_stack.h"
#include "ophist.h"
+#include "docview.h"
CC_IMPLEMENT_DYNCREATE(OpApplyAttrib, SelOperation)
CC_IMPLEMENT_DYNCREATE(OpApplyAttribToSelected, OpApplyAttrib)
Index: Trunk/XaraLX/Kernel/prevwdlg.h
===================================================================
--- Trunk/XaraLX/Kernel/prevwdlg.h (revision 1268)
+++ Trunk/XaraLX/Kernel/prevwdlg.h (revision 1269)
@@ -111,8 +111,8 @@
class KernelBitmap;
class RenderRegion;
+class DialogColourInfo;
-
/********************************************************************************************
> class AnimatedBitmapItem : public ListItem
Index: Trunk/XaraLX/Kernel/camfiltr.h
===================================================================
--- Trunk/XaraLX/Kernel/camfiltr.h (revision 1268)
+++ Trunk/XaraLX/Kernel/camfiltr.h (revision 1269)
@@ -103,7 +103,6 @@
#include "filters.h"
#include "ccfile.h" // FilePos
-#include "bmpprefs.h" // SelectionType
#include "doccoord.h"
#include "node.h" // AttachNodeDirection
Index: Trunk/XaraLX/Kernel/bmpalctrl.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmpalctrl.cpp (revision 1268)
+++ Trunk/XaraLX/Kernel/bmpalctrl.cpp (revision 1269)
@@ -109,8 +109,10 @@
// the caller expects (ie sorted or non sorted).
#include "camtypes.h"
+
#include "bmpalctrl.h"
+#include "dlgmgr.h"
#include "filedlgs.h" // required CreateOSRenderRegion
#include "dlgcol.h" // required for DialogColours
//#include "bmpreres.h" // for _R(IDC_T2_PALETTE_CONTROL)
Index: Trunk/XaraLX/Kernel/coldlog.h
===================================================================
--- Trunk/XaraLX/Kernel/coldlog.h (revision 1268)
+++ Trunk/XaraLX/Kernel/coldlog.h (revision 1269)
@@ -119,8 +119,8 @@
class KeyPress;
class Layer;
class ColourListComponent;
+class DialogColourInfo;
-
/***********************************************************************************************
< ColEditDragArea
Index: Trunk/XaraLX/Kernel/docview.h
===================================================================
--- Trunk/XaraLX/Kernel/docview.h (revision 1268)
+++ Trunk/XaraLX/Kernel/docview.h (revision 1269)
@@ -116,7 +116,6 @@
#include "ops.h"
#include "monotime.h"
#include "oilcoord.h"
-#include "rendtype.h"
#include "quality.h"
#include "docvmsg.h"
#include "draginfo.h"
Index: Trunk/XaraLX/Kernel/nodebev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodebev.cpp (revision 1268)
+++ Trunk/XaraLX/Kernel/nodebev.cpp (revision 1269)
@@ -104,7 +104,7 @@
#include "nbevcont.h"
#include "noderect.h"
#include "ppbevel.h"
-
+#include "docview.h"
// Code headers
#include "attrmgr.h"
#include "fillval.h"
Index: Trunk/XaraLX/Kernel/fillattr.h
===================================================================
--- Trunk/XaraLX/Kernel/fillattr.h (revision 1268)
+++ Trunk/XaraLX/Kernel/fillattr.h (revision 1269)
@@ -102,7 +102,6 @@
#ifndef INC_FILLATTR
#define INC_FILLATTR
-#include "docview.h"
#include "attr.h"
#include "nodeattr.h"
#include "msg.h"
Index: Trunk/XaraLX/Kernel/bmpprefs.h
===================================================================
--- Trunk/XaraLX/Kernel/bmpprefs.h (revision 1268)
+++ Trunk/XaraLX/Kernel/bmpprefs.h (revision 1269)
@@ -118,8 +118,6 @@
class CXaraFileRecord;
-enum SelectionType { SELECTION, DRAWING, SPREAD, ABITMAP, SOMEBITMAPS, PAGE };
-
enum PALETTE
{
PAL_STANDARD = 0, // just to make sure
Index: Trunk/XaraLX/Kernel/nodebmp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodebmp.cpp (revision 1268)
+++ Trunk/XaraLX/Kernel/nodebmp.cpp (revision 1269)
@@ -103,7 +103,7 @@
#include "camtypes.h"
#include "nodebmp.h"
-
+#include "docview.h"
//#include "tim.h"
//#include "rndrgn.h"
#include "doccolor.h"
Index: Trunk/XaraLX/Kernel/sgtree.cpp
===================================================================
--- Trunk/XaraLX/Kernel/sgtree.cpp (revision 1268)
+++ Trunk/XaraLX/Kernel/sgtree.cpp (revision 1269)
@@ -101,6 +101,7 @@
#include "camtypes.h"
+#include "dlgmgr.h"
#include "document.h" // For Document->GetTitle()
#include "dragmgr.h" // Drag manager (DragManagerOp::StartDrag, RedrawStarting etc)
//#include "galres.h" // Gallery bitmap resources
Index: Trunk/XaraLX/Kernel/nodeliveeffect.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodeliveeffect.cpp (revision 1268)
+++ Trunk/XaraLX/Kernel/nodeliveeffect.cpp (revision 1269)
@@ -103,6 +103,7 @@
#include "app.h"
#include "node.h"
#include "nodeliveeffect.h"
+#include "docview.h"
//#include "xpehost.h"
#include "dibutil.h"
#include "cxftags.h"
Index: Trunk/XaraLX/Kernel/ngcore.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ngcore.cpp (revision 1268)
+++ Trunk/XaraLX/Kernel/ngcore.cpp (revision 1269)
@@ -102,6 +102,7 @@
#include "camtypes.h"
+#include "docview.h"
#include "ngcore.h"
#include "ngdialog.h"
#include "ngitem.h"
Index: Trunk/XaraLX/Kernel/dialogop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/dialogop.cpp (revision 1268)
+++ Trunk/XaraLX/Kernel/dialogop.cpp (revision 1269)
@@ -1329,7 +1329,7 @@
INT32 EndRange,
UINT32 IDSInvalidMsg,
BOOL* Valid,
- DialogManager::PFNSTRINGTOINT32 pfnParser)
+ Convert::PFNSTRINGTOINT32 pfnParser)
{
return DlgMgr->GetLongGadgetValue(GetReadWriteWindowID(),
Gadget,
@@ -1365,7 +1365,7 @@
double EndRange,
UINT32 IDSInvalidMsg,
BOOL* Valid,
- DialogManager::PFNSTRINGTODOUBLE pfnParser)
+ Convert::PFNSTRINGTODOUBLE pfnParser)
{
return DlgMgr->GetDoubleGadgetValue(GetReadWriteWindowID(),
Gadget,
Index: Trunk/XaraLX/Kernel/bitfilt.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bitfilt.cpp (revision 1268)
+++ Trunk/XaraLX/Kernel/bitfilt.cpp (revision 1269)
@@ -102,6 +102,7 @@
#include "camtypes.h"
#include "bitfilt.h"
+#include "docview.h"
//#include "resource.h" // _R(IDS_OUT_OF_MEMORY)
//#include "camvw.h" // sadly
#include "layer.h"
Index: Trunk/XaraLX/Kernel/filters.h
===================================================================
--- Trunk/XaraLX/Kernel/filters.h (revision 1268)
+++ Trunk/XaraLX/Kernel/filters.h (revision 1269)
@@ -236,6 +236,7 @@
// !!!!!!!!!!!!!!!!! DON'T ADD ANY MORE TO THE ABOVE LIST !!!!!!!!!!!!!!!!
+enum SelectionType { SELECTION, DRAWING, SPREAD, ABITMAP, SOMEBITMAPS, PAGE };
/********************************************************************************************
Index: Trunk/XaraLX/Kernel/nodebev.h
===================================================================
--- Trunk/XaraLX/Kernel/nodebev.h (revision 1268)
+++ Trunk/XaraLX/Kernel/nodebev.h (revision 1269)
@@ -109,7 +109,6 @@
#include "cxfrech.h"
#include "cxfrec.h"
#include "attr.h"
-#include "fillattr.h"
#include "ink.h"
//#include "grndbmp.h"
Index: Trunk/XaraLX/Kernel/mrhbits.cpp
===================================================================
--- Trunk/XaraLX/Kernel/mrhbits.cpp (revision 1268)
+++ Trunk/XaraLX/Kernel/mrhbits.cpp (revision 1269)
@@ -99,6 +99,7 @@
#include "camtypes.h"
#include "mrhbits.h" // TODO
+#include "view.h"
//#include "bitmap.h"
#include "fillattr.h"
#include "grndrgn.h"
Index: Trunk/XaraLX/Kernel/nodepath.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodepath.cpp (revision 1268)
+++ Trunk/XaraLX/Kernel/nodepath.cpp (revision 1269)
@@ -104,6 +104,7 @@
#include "nodepath.h"
#include <math.h>
+#include "docview.h"
#include "becomea.h"
#include "blobs.h"
Index: Trunk/XaraLX/Kernel/dialogop.h
===================================================================
--- Trunk/XaraLX/Kernel/dialogop.h (revision 1268)
+++ Trunk/XaraLX/Kernel/dialogop.h (revision 1269)
@@ -112,8 +112,11 @@
#include "ops.h" // Operation class
#include "dlgtypes.h" // The DialogOp types
-#include "dlgmgr.h" // For the wierd inclass typedef in GetLongGadgetValue
+#include "convert.h"
+class CGadgetImageList;
+class CustomComboBoxControlDataItem;
+class DialogManager;
class String_256;
class Node;
class RenderRegion;
@@ -325,14 +328,14 @@
INT32 EndRange,
UINT32 IDSInvalidMsg = 0,
BOOL* Valid = NULL,
- DialogManager::PFNSTRINGTOINT32 pfnParser = Convert::StringToLong);
+ Convert::PFNSTRINGTOINT32 pfnParser = Convert::StringToLong);
double GetDoubleGadgetValue(CGadgetID GadgetID,
double StartRange,
double EndRange,
UINT32 IDSInvalidMsg = 0,
BOOL* Valid = NULL,
- DialogManager::PFNSTRINGTODOUBLE pfnParser = Convert::StringToDouble);
+ Convert::PFNSTRINGTODOUBLE pfnParser = Convert::StringToDouble);
BOOL GetDoubleAndUnitGadgetValue(double* pMPValue,
double* pUnitValue,
Index: Trunk/XaraLX/wxOil/colpick.cpp
===================================================================
--- Trunk/XaraLX/wxOil/colpick.cpp (revision 1268)
+++ Trunk/XaraLX/wxOil/colpick.cpp (revision 1269)
@@ -104,6 +104,7 @@
#include "camtypes.h"
+#include "dlgmgr.h"
#include "colcontx.h"
#include "coldlog.h"
#include "collist.h"
Index: Trunk/XaraLX/wxOil/dlgmgr.h
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.h (revision 1268)
+++ Trunk/XaraLX/wxOil/dlgmgr.h (revision 1269)
@@ -506,19 +506,13 @@
UINT32 IDSInvalidMsg = 0,
BOOL* Valid = NULL);
- // This defines a name for a pointer to the "string parser" function that takes
- // a string and calculates the number from it, returning TRUE if it is valid.
-
- typedef BOOL (*PFNSTRINGTOINT32)(const StringBase &, INT32*);
- typedef BOOL (*PFNSTRINGTODOUBLE)(const StringBase &, double*);
-
static INT32 GetLongGadgetValue(CWindowID WindowID,
CGadgetID Gadget,
INT32 StartRange,
INT32 EndRange,
UINT32 IDSInvalidMsg = 0,
BOOL* Valid = NULL,
- PFNSTRINGTOINT32 pfnParser = Convert::StringToLong);
+ Convert::PFNSTRINGTOINT32 pfnParser = Convert::StringToLong);
static double GetDoubleGadgetValue(CWindowID WindowID,
CGadgetID Gadget,
@@ -526,7 +520,7 @@
double EndRange,
UINT32 IDSInvalidMsg = 0,
BOOL* Valid = NULL,
- PFNSTRINGTODOUBLE pfnParser = Convert::StringToDouble);
+ Convert::PFNSTRINGTODOUBLE pfnParser = Convert::StringToDouble);
static BOOL GetBoolGadgetSelected(CWindowID WindowID,
CGadgetID Gadget,
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 1268)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 1269)
@@ -3609,7 +3609,7 @@
INT32 EndRange,
UINT32 IDSInvalidMsg,
BOOL* Valid,
- DialogManager::PFNSTRINGTOINT32 pfnParser)
+ Convert::PFNSTRINGTOINT32 pfnParser)
{
wxWindow * pGadget = GetGadget(WindowID, Gadget);
if (!pGadget) return FALSE;
@@ -3788,7 +3788,7 @@
double EndRange,
UINT32 IDSInvalidMsg,
BOOL* Valid,
- DialogManager::PFNSTRINGTODOUBLE pfnParser)
+ Convert::PFNSTRINGTODOUBLE pfnParser)
{
wxWindow * pGadget = GetGadget(WindowID, Gadget);
if (!pGadget) return FALSE;
Index: Trunk/XaraLX/wxOil/convert.h
===================================================================
--- Trunk/XaraLX/wxOil/convert.h (revision 1268)
+++ Trunk/XaraLX/wxOil/convert.h (revision 1269)
@@ -188,6 +188,12 @@
static BOOL IsCharStartOfNumber(TCHAR Char);
static BOOL ReadUnitType(const StringBase &Str,INT32* pPos,UnitType* pUnitType);
static BOOL ReadNumber(const StringBase &Str,INT32* pPos,double* pResult);
+
+ // This defines a name for a pointer to the "string parser" function that takes
+ // a string and calculates the number from it, returning TRUE if it is valid.
+
+ typedef BOOL (*PFNSTRINGTOINT32)(const StringBase &, INT32*);
+ typedef BOOL (*PFNSTRINGTODOUBLE)(const StringBase &, double*);
protected:
// These are the default display options
Xara