зеркало из https://github.com/mozilla/gecko-dev.git
WIP: MultiUserView
This commit is contained in:
Родитель
f6d531b383
Коммит
a06e43b08e
|
@ -43,6 +43,7 @@ enum eCalXMLTags
|
|||
eCalXMLTag_mcc,
|
||||
eCalXMLTag_monthviewcanvas,
|
||||
eCalXMLTag_multidayviewcanvas,
|
||||
eCalXMLTag_multiuserviewcanvas,
|
||||
eCalXMLTag_object,
|
||||
eCalXMLTag_panel,
|
||||
eCalXMLTag_rootpanel,
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include "nsCalTodoComponentCanvas.h"
|
||||
#include "nsCalMonthContextController.h"
|
||||
#include "nsCalMultiDayViewCanvas.h"
|
||||
#include "nsCalMultiUserViewCanvas.h"
|
||||
#include "nsCalCommandCanvas.h"
|
||||
#include "nsXPFCHTMLCanvas.h"
|
||||
#include "nsICalendarShell.h"
|
||||
|
@ -47,6 +48,7 @@ static NS_DEFINE_IID(kCCalTimebarContextControllerCID, NS_CAL_TIMEBAR_CONTEXT_CO
|
|||
static NS_DEFINE_IID(kCCalMonthContextControllerCID, NS_CAL_MONTH_CONTEXT_CONTROLLER_CID);
|
||||
static NS_DEFINE_IID(kCCalTodoComponentCanvasCID, NS_CAL_TODOCOMPONENTCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalMultiDayViewCanvasCID, NS_CAL_MULTIDAYVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalMultiUserViewCanvasCID, NS_CAL_MULTIUSERVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCalMonthViewCanvasCID, NS_CAL_MONTHVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalCommandCanvasCID, NS_CAL_COMMANDCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCalTimebarUserHeadingCID, NS_CAL_TIMEBARUSERHEADING_CID);
|
||||
|
@ -54,6 +56,7 @@ static NS_DEFINE_IID(kCalTimebarScaleCID, NS_CAL_TIMEBARSCALE_CID);
|
|||
static NS_DEFINE_IID(kCalTodoComponentCanvasCID, NS_CAL_TODOCOMPONENTCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCalCommandCanvasCID, NS_CAL_COMMANDCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCalMultiDayViewCanvasCID, NS_CAL_MULTIDAYVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCalMultiUserViewCanvasCID, NS_CAL_MULTIUSERVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCalTimebarCanvasCID, NS_CAL_TIMEBARCANVAS_CID);
|
||||
|
||||
static NS_DEFINE_IID(kCalContextcontrollerIID, NS_ICAL_CONTEXT_CONTROLLER_IID);
|
||||
|
@ -392,6 +395,10 @@ NS_IMETHODIMP nsCalXMLContentSink::CIDFromTag(eCalXMLTags tag, nsCID &aClass)
|
|||
aClass = kCalMultiDayViewCanvasCID;
|
||||
break;
|
||||
|
||||
case eCalXMLTag_multiuserviewcanvas:
|
||||
aClass = kCalMultiUserViewCanvasCID;
|
||||
break;
|
||||
|
||||
case eCalXMLTag_monthviewcanvas:
|
||||
aClass = kCalMonthViewCanvasCID;
|
||||
break;
|
||||
|
@ -521,8 +528,11 @@ NS_IMETHODIMP nsCalXMLContentSink::ApplyContext(nsIXPFCCanvas * aCanvas, nsICalT
|
|||
time_canvas->SetTimeContext(aContext);
|
||||
|
||||
/*
|
||||
* XXX: Should this be for all Multi Views?
|
||||
*
|
||||
* If this is a MultiView Canvas, stop here
|
||||
*/
|
||||
|
||||
static NS_DEFINE_IID(kCalMultiDayViewCanvasCID, NS_CAL_MULTIDAYVIEWCANVAS_CID);
|
||||
nsCalMultiDayViewCanvas * multi;
|
||||
nsresult res = time_canvas->QueryInterface(kCalMultiDayViewCanvasCID,(void**)&multi);
|
||||
|
|
|
@ -62,6 +62,7 @@ nsCalXMLTagEntry gCalXMLTagTable[] =
|
|||
{"mcc", eCalXMLTag_mcc},
|
||||
{"monthviewcanvas", eCalXMLTag_monthviewcanvas},
|
||||
{"multidayviewcanvas", eCalXMLTag_multidayviewcanvas},
|
||||
{"multiuserviewcanvas", eCalXMLTag_multiuserviewcanvas},
|
||||
{"object", eCalXMLTag_object},
|
||||
{"panel", eCalXMLTag_panel},
|
||||
{"rootpanel", eCalXMLTag_rootpanel},
|
||||
|
@ -272,6 +273,7 @@ nsresult nsCalXMLDTD::HandleStartToken(CToken* aToken)
|
|||
case eCalXMLTag_monthviewcanvas:
|
||||
case eCalXMLTag_multidayviewcanvas:
|
||||
case eCalXMLTag_timebarscale:
|
||||
case eCalXMLTag_multiuserviewcanvas:
|
||||
case eCalXMLTag_timebaruserheading:
|
||||
case eCalXMLTag_todocanvas:
|
||||
case eCalXMLTag_xpitem:
|
||||
|
@ -345,6 +347,7 @@ nsresult nsCalXMLDTD::HandleEndToken(CToken* aToken)
|
|||
case eCalXMLTag_commandcanvas:
|
||||
case eCalXMLTag_monthviewcanvas:
|
||||
case eCalXMLTag_multidayviewcanvas:
|
||||
case eCalXMLTag_multiuserviewcanvas:
|
||||
case eCalXMLTag_timebarscale:
|
||||
case eCalXMLTag_timebaruserheading:
|
||||
case eCalXMLTag_todocanvas:
|
||||
|
|
|
@ -25,7 +25,8 @@
|
|||
#include "nsxpfcCIID.h"
|
||||
|
||||
static NS_DEFINE_IID(kICalWidgetIID, NS_ICALENDAR_WIDGET_IID);
|
||||
static NS_DEFINE_IID(kCCalMultiDayViewCID, NS_CAL_MULTIDAYVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalMultiDayViewCID, NS_CAL_MULTIDAYVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalMultiUserViewCID, NS_CAL_MULTIUSERVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kIXPFCCanvasIID, NS_IXPFC_CANVAS_IID);
|
||||
static NS_DEFINE_IID(kCXPFCCanvasCID, NS_XPFC_CANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalTimeContextCID, NS_CAL_TIME_CONTEXT_CID);
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
#include "nsX400Parser.h"
|
||||
#include "nscal.h"
|
||||
#include "nsCalMultiDayViewCanvas.h"
|
||||
#include "nsCalMultiUserViewCanvas.h"
|
||||
#include "nsLayer.h"
|
||||
#include "nsCalTimebarCanvas.h"
|
||||
#include "nsCalUICIID.h"
|
||||
|
@ -779,6 +780,7 @@ nsresult nsCalendarContainer::RegisterFactories()
|
|||
nsRepository::RegisterFactory(kCCalDayViewCID, CALUI_DLL, PR_FALSE, PR_FALSE);
|
||||
nsRepository::RegisterFactory(kCCalMonthViewCID, CALUI_DLL, PR_FALSE, PR_FALSE);
|
||||
nsRepository::RegisterFactory(kCCalMultiDayViewCID, CALUI_DLL, PR_FALSE, PR_FALSE);
|
||||
nsRepository::RegisterFactory(kCCalMultiUserViewCID, CALUI_DLL, PR_FALSE, PR_FALSE);
|
||||
nsRepository::RegisterFactory(kCalTimebarHeadingCID, CALUI_DLL, PR_FALSE, PR_FALSE);
|
||||
nsRepository::RegisterFactory(kCalTimebarUserHeadingCID, CALUI_DLL, PR_FALSE, PR_FALSE);
|
||||
nsRepository::RegisterFactory(kCalTimebarTimeHeadingCID, CALUI_DLL, PR_FALSE, PR_FALSE);
|
||||
|
|
|
@ -66,6 +66,7 @@ class nsICalendarShell;
|
|||
#include "nsCalDayViewCanvas.h"
|
||||
#include "nsCalMonthViewCanvas.h"
|
||||
#include "nsCalMultiDayViewCanvas.h"
|
||||
#include "nsCalMultiUserViewCanvas.h"
|
||||
#include "nsCalTodoComponentCanvas.h"
|
||||
#include "nsCalTimebarHeading.h"
|
||||
#include "nsCalTimebarUserHeading.h"
|
||||
|
|
|
@ -23,6 +23,8 @@ PRIVATE_EXPORTS = \
|
|||
nsCalTimebarTimeHeading.h \
|
||||
nsCalTimebarScale.h \
|
||||
nsCalMultiDayViewCanvas.h \
|
||||
nsCalMultiViewCanvas.h \
|
||||
nsCalMultiUserViewCanvas.h \
|
||||
nsCalCanvas.h \
|
||||
nsCalDayViewCanvas.h \
|
||||
nsCalMonthViewCanvas.h \
|
||||
|
|
|
@ -19,11 +19,12 @@
|
|||
#ifndef nsCalMultiDayViewCanvas_h___
|
||||
#define nsCalMultiDayViewCanvas_h___
|
||||
|
||||
#include "nsCalMultiViewCanvas.h"
|
||||
#include "nsCalTimebarComponentCanvas.h"
|
||||
#include "nsCalTimebarCanvas.h"
|
||||
#include "nsDateTime.h"
|
||||
|
||||
class nsCalMultiDayViewCanvas : public nsCalTimebarComponentCanvas
|
||||
class nsCalMultiDayViewCanvas : public nsCalMultiViewCanvas
|
||||
{
|
||||
|
||||
public:
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
#ifndef nsCalMultiUserViewCanvas_h___
|
||||
#define nsCalMultiUserViewCanvas_h___
|
||||
|
||||
#include "nsCalMultiViewCanvas.h"
|
||||
#include "nsCalTimebarCanvas.h"
|
||||
#include "nsDateTime.h"
|
||||
|
||||
class nsCalMultiUserViewCanvas : public nsCalMultiViewCanvas
|
||||
{
|
||||
|
||||
public:
|
||||
nsCalMultiUserViewCanvas(nsISupports* outer);
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
NS_IMETHOD Init();
|
||||
|
||||
protected:
|
||||
~nsCalMultiUserViewCanvas();
|
||||
|
||||
};
|
||||
|
||||
#endif /* nsCalMultiUserViewCanvas_h___ */
|
|
@ -0,0 +1,41 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
#ifndef nsCalMultiViewCanvas_h___
|
||||
#define nsCalMultiViewCanvas_h___
|
||||
|
||||
#include "nsCalTimebarComponentCanvas.h"
|
||||
#include "nsCalTimebarCanvas.h"
|
||||
#include "nsDateTime.h"
|
||||
|
||||
class nsCalMultiViewCanvas : public nsCalTimebarComponentCanvas
|
||||
{
|
||||
|
||||
public:
|
||||
nsCalMultiViewCanvas(nsISupports* outer);
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
NS_IMETHOD Init();
|
||||
|
||||
protected:
|
||||
~nsCalMultiViewCanvas();
|
||||
|
||||
};
|
||||
|
||||
#endif /* nsCalMultiViewCanvas_h___ */
|
|
@ -28,6 +28,8 @@ CPPSRCS = \
|
|||
nsCalTimebarTimeHeading.cpp \
|
||||
nsCalTimebarScale.cpp \
|
||||
nsCalMultiDayViewCanvas.cpp \
|
||||
nsCalMultiUserViewCanvas.cpp \
|
||||
nsCalMultiViewCanvas.cpp \
|
||||
nsCalDayViewCanvas.cpp \
|
||||
nsCalMonthViewCanvas.cpp \
|
||||
nsCalCanvas.cpp \
|
||||
|
|
|
@ -58,7 +58,7 @@ NS_IMPL_RELEASE(nsCalCanvas)
|
|||
|
||||
nsresult nsCalCanvas :: Init()
|
||||
{
|
||||
return NS_OK;
|
||||
return (nsXPFCCanvas::Init());
|
||||
}
|
||||
|
||||
nsresult nsCalCanvas :: GetUser(nsICalendarUser *& aUser)
|
||||
|
|
|
@ -39,7 +39,7 @@ static NS_DEFINE_IID(kCalMultiDayViewCanvasCID, NS_CAL_MULTIDAYVIEWCANVAS_CID);
|
|||
static NS_DEFINE_IID(kIXPFCCanvasIID, NS_IXPFC_CANVAS_IID);
|
||||
static NS_DEFINE_IID(kCalTimebarCanvasCID, NS_CAL_TIMEBARCANVAS_CID);
|
||||
|
||||
nsCalMultiDayViewCanvas :: nsCalMultiDayViewCanvas(nsISupports* outer) : nsCalTimebarComponentCanvas(outer)
|
||||
nsCalMultiDayViewCanvas :: nsCalMultiDayViewCanvas(nsISupports* outer) : nsCalMultiViewCanvas(outer)
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
mNumberViewableDays = 0;
|
||||
|
@ -76,7 +76,7 @@ nsresult nsCalMultiDayViewCanvas::QueryInterface(REFNSIID aIID, void** aInstance
|
|||
AddRef();
|
||||
return NS_OK;
|
||||
}
|
||||
return (nsCalTimebarComponentCanvas::QueryInterface(aIID, aInstancePtr));
|
||||
return (nsCalMultiViewCanvas::QueryInterface(aIID, aInstancePtr));
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(nsCalMultiDayViewCanvas)
|
||||
|
@ -88,19 +88,13 @@ NS_IMPL_RELEASE(nsCalMultiDayViewCanvas)
|
|||
|
||||
nsresult nsCalMultiDayViewCanvas :: Init()
|
||||
{
|
||||
/*
|
||||
* Call the Init method of the standard canvas, since
|
||||
* we'll be dealing with child canvas's
|
||||
*/
|
||||
|
||||
nsXPFCCanvas::Init();
|
||||
|
||||
/*
|
||||
* We also need a context. Maybe this should be specifically
|
||||
* done rather than a part of Init.
|
||||
*/
|
||||
|
||||
nsCalTimebarComponentCanvas::Init();
|
||||
nsCalMultiViewCanvas::Init();
|
||||
|
||||
/*
|
||||
* Create the default number of viewable day canvas's as children
|
||||
|
@ -118,7 +112,7 @@ nsresult nsCalMultiDayViewCanvas :: Init()
|
|||
nsEventStatus nsCalMultiDayViewCanvas :: PaintBackground(nsIRenderingContext& aRenderingContext,
|
||||
const nsRect& aDirtyRect)
|
||||
{
|
||||
return (nsXPFCCanvas :: PaintBackground(aRenderingContext,aDirtyRect));
|
||||
return (nsCalMultiViewCanvas :: PaintBackground(aRenderingContext,aDirtyRect));
|
||||
}
|
||||
|
||||
nsresult nsCalMultiDayViewCanvas :: SetNumberViewableDays(PRUint32 aNumberViewableDays)
|
||||
|
@ -690,7 +684,7 @@ nsresult nsCalMultiDayViewCanvas::Action(nsIXPFCCommand * aCommand)
|
|||
}
|
||||
}
|
||||
|
||||
return (nsXPFCCanvas::Action(aCommand));
|
||||
return (nsCalMultiViewCanvas::Action(aCommand));
|
||||
|
||||
}
|
||||
|
||||
|
@ -712,5 +706,5 @@ nsresult nsCalMultiDayViewCanvas :: SetParameter(nsString& aKey, nsString& aValu
|
|||
|
||||
}
|
||||
|
||||
return (nsCalTimebarComponentCanvas::SetParameter(aKey, aValue));
|
||||
return (nsCalMultiViewCanvas::SetParameter(aKey, aValue));
|
||||
}
|
||||
|
|
|
@ -0,0 +1,81 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
#include "nsCalMultiUserViewCanvas.h"
|
||||
#include "nsCalTimebarTimeHeading.h"
|
||||
#include "nsBoxLayout.h"
|
||||
#include "nsCalUICIID.h"
|
||||
#include "nsIVector.h"
|
||||
#include "nsIIterator.h"
|
||||
#include "nsCalToolkit.h"
|
||||
#include "nsCalDayListCommand.h"
|
||||
#include "nsCalNewModelCommand.h"
|
||||
#include "nscalstrings.h"
|
||||
|
||||
|
||||
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
||||
static NS_DEFINE_IID(kCalMultiViewCanvasCID, NS_CAL_MULTIVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kIXPFCCanvasIID, NS_IXPFC_CANVAS_IID);
|
||||
static NS_DEFINE_IID(kCalTimebarCanvasCID, NS_CAL_TIMEBARCANVAS_CID);
|
||||
|
||||
nsCalMultiUserViewCanvas :: nsCalMultiUserViewCanvas(nsISupports* outer) : nsCalMultiViewCanvas(outer)
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
}
|
||||
|
||||
nsCalMultiUserViewCanvas :: ~nsCalMultiUserViewCanvas()
|
||||
{
|
||||
}
|
||||
|
||||
nsresult nsCalMultiUserViewCanvas::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
||||
{
|
||||
if (NULL == aInstancePtr) {
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
||||
static NS_DEFINE_IID(kClassIID, kCalMultiViewCanvasCID);
|
||||
if (aIID.Equals(kClassIID)) {
|
||||
*aInstancePtr = (void*) this;
|
||||
AddRef();
|
||||
return NS_OK;
|
||||
}
|
||||
if (aIID.Equals(kISupportsIID)) {
|
||||
*aInstancePtr = (void*) (this);
|
||||
AddRef();
|
||||
return NS_OK;
|
||||
}
|
||||
if (aIID.Equals(kIXPFCCanvasIID)) {
|
||||
*aInstancePtr = (void*) (this);
|
||||
AddRef();
|
||||
return NS_OK;
|
||||
}
|
||||
return (nsCalMultiViewCanvas::QueryInterface(aIID, aInstancePtr));
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(nsCalMultiUserViewCanvas)
|
||||
NS_IMPL_RELEASE(nsCalMultiUserViewCanvas)
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
|
||||
nsresult nsCalMultiUserViewCanvas :: Init()
|
||||
{
|
||||
return (nsCalMultiViewCanvas::Init());
|
||||
}
|
||||
|
|
@ -0,0 +1,81 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
#include "nsCalMultiViewCanvas.h"
|
||||
#include "nsCalTimebarTimeHeading.h"
|
||||
#include "nsBoxLayout.h"
|
||||
#include "nsCalUICIID.h"
|
||||
#include "nsIVector.h"
|
||||
#include "nsIIterator.h"
|
||||
#include "nsCalToolkit.h"
|
||||
#include "nsCalDayListCommand.h"
|
||||
#include "nsCalNewModelCommand.h"
|
||||
#include "nscalstrings.h"
|
||||
|
||||
|
||||
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
||||
static NS_DEFINE_IID(kCalMultiViewCanvasCID, NS_CAL_MULTIVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kIXPFCCanvasIID, NS_IXPFC_CANVAS_IID);
|
||||
static NS_DEFINE_IID(kCalTimebarCanvasCID, NS_CAL_TIMEBARCANVAS_CID);
|
||||
|
||||
nsCalMultiViewCanvas :: nsCalMultiViewCanvas(nsISupports* outer) : nsCalTimebarComponentCanvas(outer)
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
}
|
||||
|
||||
nsCalMultiViewCanvas :: ~nsCalMultiViewCanvas()
|
||||
{
|
||||
}
|
||||
|
||||
nsresult nsCalMultiViewCanvas::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
||||
{
|
||||
if (NULL == aInstancePtr) {
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
|
||||
static NS_DEFINE_IID(kClassIID, kCalMultiViewCanvasCID);
|
||||
if (aIID.Equals(kClassIID)) {
|
||||
*aInstancePtr = (void*) this;
|
||||
AddRef();
|
||||
return NS_OK;
|
||||
}
|
||||
if (aIID.Equals(kISupportsIID)) {
|
||||
*aInstancePtr = (void*) (this);
|
||||
AddRef();
|
||||
return NS_OK;
|
||||
}
|
||||
if (aIID.Equals(kIXPFCCanvasIID)) {
|
||||
*aInstancePtr = (void*) (this);
|
||||
AddRef();
|
||||
return NS_OK;
|
||||
}
|
||||
return (nsCalTimebarComponentCanvas::QueryInterface(aIID, aInstancePtr));
|
||||
}
|
||||
|
||||
NS_IMPL_ADDREF(nsCalMultiViewCanvas)
|
||||
NS_IMPL_RELEASE(nsCalMultiViewCanvas)
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
|
||||
nsresult nsCalMultiViewCanvas :: Init()
|
||||
{
|
||||
return (nsCalTimebarComponentCanvas::Init());
|
||||
}
|
||||
|
|
@ -73,7 +73,7 @@ nsresult nsCalTimebarCanvas :: Init()
|
|||
|
||||
mTimeContext->Init();
|
||||
|
||||
return res;
|
||||
return (nsCalCanvas::Init());
|
||||
}
|
||||
|
||||
PRUint32 nsCalTimebarCanvas::GetVisibleMajorIntervals()
|
||||
|
|
|
@ -113,6 +113,16 @@
|
|||
{ 0x5b6775e0, 0x1c39, 0x11d2, \
|
||||
{ 0x92, 0x46, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6 } }
|
||||
|
||||
//a60db790-5c85-11d2-924c-00805f8a7ab6
|
||||
#define NS_CAL_MULTIUSERVIEWCANVAS_CID \
|
||||
{ 0xa60db790, 0x5c85, 0x11d2, \
|
||||
{ 0x92, 0x4c, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6 } }
|
||||
|
||||
//0a402270-5c87-11d2-924c-00805f8a7ab6
|
||||
#define NS_CAL_MULTIVIEWCANVAS_CID \
|
||||
{ 0x0a402270, 0x5c87, 0x11d2, \
|
||||
{ 0x92, 0x4c, 0x00, 0x80, 0x5f, 0x8a, 0x7a, 0xb6 } }
|
||||
|
||||
//879f3230-1da4-11d2-bed9-00805f8a8dbd
|
||||
#define NS_CAL_DAYVIEWCANVAS_CID \
|
||||
{ 0x879f3230, 0x1da4, 0x11d2, \
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
#include "nsCalTimebarTimeHeading.h"
|
||||
#include "nsCalTimebarScale.h"
|
||||
#include "nsCalMultiDayViewCanvas.h"
|
||||
#include "nsCalMultiUserViewCanvas.h"
|
||||
#include "nsCalDayViewCanvas.h"
|
||||
#include "nsCalMonthViewCanvas.h"
|
||||
#include "nsCalTodoComponentCanvas.h"
|
||||
|
@ -63,6 +64,7 @@ static NS_DEFINE_IID(kCCalStatusCanvas, NS_CAL_STATUSCANVAS_CID);
|
|||
static NS_DEFINE_IID(kCCalCommandCanvas, NS_CAL_COMMANDCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalTimebarComponentCanvas, NS_CAL_TIMEBARCOMPONENTCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalMultiDayViewCanvas, NS_CAL_MULTIDAYVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalMultiUserViewCanvas, NS_CAL_MULTIUSERVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalDayViewCanvas, NS_CAL_DAYVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalMonthViewCanvas, NS_CAL_MONTHVIEWCANVAS_CID);
|
||||
static NS_DEFINE_IID(kCCalTodoComponentCanvas, NS_CAL_TODOCOMPONENTCANVAS_CID);
|
||||
|
@ -233,6 +235,10 @@ nsresult nsCalFactory::CreateInstance(nsISupports *aOuter,
|
|||
nsXPFCCanvas * canvas = (nsXPFCCanvas *)new nsCalMultiDayViewCanvas(aOuter);
|
||||
canvas->QueryInterface(kISupportsIID,(void **)&inst);
|
||||
}
|
||||
else if (mClassID.Equals(kCCalMultiUserViewCanvas)) {
|
||||
nsXPFCCanvas * canvas = (nsXPFCCanvas *)new nsCalMultiUserViewCanvas(aOuter);
|
||||
canvas->QueryInterface(kISupportsIID,(void **)&inst);
|
||||
}
|
||||
else if (mClassID.Equals(kCCalDayViewCanvas)) {
|
||||
nsXPFCCanvas * canvas = (nsXPFCCanvas *)new nsCalDayViewCanvas(aOuter);
|
||||
canvas->QueryInterface(kISupportsIID,(void **)&inst);
|
||||
|
|
Загрузка…
Ссылка в новой задаче