mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixed up messaging

This commit is contained in:
dcone%netscape.com 1998-08-17 15:18:28 +00:00
Родитель 2a297a4411
Коммит d283c88961
5 изменённых файлов: 257 добавлений и 309 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

182
widget/src/mac/nsAppShell.cpp
Просмотреть файл

@ -20,7 +20,7 @@
#include "nsIAppShell.h"
#include "nsWindow.h"
#include <stdlib.h>
#include "nsMacMessagePump.h"
//XtAppContext gAppContext;
@ -53,87 +53,15 @@ void nsAppShell::Create(int* argc, char ** argv)
// Enter a message handler loop
//
//-------------------------------------------------------------------------
nsresult nsAppShell::Run()
{
EventRecord theevent;
RgnHandle fMouseRgn=NULL;
long sleep=0;
PRInt16 haveevent;
WindowPtr whichwindow;
#define SUSPENDRESUMEMESSAGE 0x01
#define MOUSEMOVEDMESSAGE 0xFA
mRunning = TRUE;
nsMacMessagePump *macpump;
while(mRunning)
{
haveevent = ::WaitNextEvent(everyEvent,&theevent,sleep,fMouseRgn);
if(haveevent)
{
switch(theevent.what)
{
case nullEvent:
IdleWidgets();
break;
case diskEvt:
if(theevent.message<0)
{
// error, bad disk mount
}
break;
case keyUp:
break;
case keyDown:
case autoKey:
doKey(&theevent);
this->Exit();
break;
case mouseDown:
DoMouseDown(&theevent);
break;
case mouseUp:
break;
case updateEvt:
whichwindow = (WindowPtr)theevent.message;
break;
case activateEvt:
whichwindow = (WindowPtr)theevent.message;
if(theevent.modifiers & activeFlag)
{
::BringToFront(whichwindow);
::HiliteWindow(whichwindow,TRUE);
}
else
{
::HiliteWindow(whichwindow,FALSE);
}
break;
case osEvt:
unsigned char evtype;
whichwindow = (WindowPtr)theevent.message;
evtype = (unsigned char) (theevent.message>>24)&0x00ff;
switch(evtype)
{
case MOUSEMOVEDMESSAGE:
break;
case SUSPENDRESUMEMESSAGE:
if(theevent.message&0x00000001)
{
// resume message
}
else
{
// suspend message
}
}
break;
}
}
}
mMessages = new nsMacMessenger();
macpump = new nsMacMessagePump( mMessages );
macpump->DoMessagePump();
//if (mDispatchListener)
//mDispatchListener->AfterDispatch();
@ -143,103 +71,14 @@ WindowPtr whichwindow;
//-------------------------------------------------------------------------
//
// Handle and pass on Idle events
// nsAppShell constructor
//
//-------------------------------------------------------------------------
void nsAppShell::IdleWidgets()
{
WindowPtr whichwindow;
PRInt16 partcode;
nsWindow *thewindow;
nsIWidget *thewidget;
whichwindow = ::FrontWindow();
while(whichwindow)
{
// idle the widget
thewindow = (nsWindow*)(((WindowPeek)whichwindow)->refCon);
whichwindow = (WindowPtr)((WindowPeek)whichwindow)->nextWindow;
}
}
//-------------------------------------------------------------------------
//
// Handle the mousedown event
//
//-------------------------------------------------------------------------
void nsAppShell::DoMouseDown(EventRecord *aTheEvent)
{
WindowPtr whichwindow;
PRInt16 partcode;
nsWindow *thewindow;
nsIWidget *thewidget;
partcode = FindWindow(aTheEvent->where,&whichwindow);
if(whichwindow!=0)
{
thewindow = (nsWindow*)(((WindowPeek)whichwindow)->refCon);
thewidget = thewindow->FindWidgetHit(aTheEvent->where);
switch(partcode)
{
case inSysWindow:
break;
case inContent:
break;
case inDrag:
break;
case inGrow:
break;
case inGoAway:
break;
case inZoomIn:
case inZoomOut:
break;
case inMenuBar:
break;
}
}
}
//-------------------------------------------------------------------------
//
// Handle the key events
//
//-------------------------------------------------------------------------
void nsAppShell::doKey(EventRecord *aTheEvent)
{
char ch;
WindowPtr whichwindow;
ch = (char)(aTheEvent->message & charCodeMask);
if(aTheEvent->modifiers&cmdKey)
{
// do a menu key command
}
else
{
whichwindow = FrontWindow();
if(whichwindow)
{
// generate a keydown event for the widget
}
}
}
//-------------------------------------------------------------------------
//
// Exit a message handler loop
//
//-------------------------------------------------------------------------
void nsAppShell::Exit()
{
mRunning = FALSE;
if(mMessages)
mMessages->Quit();
}
//-------------------------------------------------------------------------
@ -251,6 +90,7 @@ nsAppShell::nsAppShell()
{
mRefCnt = 0;
mDispatchListener = 0;
mMessages = 0;
}
//-------------------------------------------------------------------------

21
widget/src/mac/nsAppShell.h
Просмотреть файл

@ -20,6 +20,7 @@
#define nsAppShell_h__
#include "nsIAppShell.h"
#include "nsMacMessagePump.h"
#include "nsToolKit.h"
#include <Fonts.h>
#include <TextEdit.h>
@ -36,17 +37,12 @@
class nsAppShell : public nsIAppShell
{
private:
nsDispatchListener* mDispatchListener;
nsToolkit* mToolKit;
PRBool mRunning;
nsDispatchListener *mDispatchListener;
nsToolkit *mToolKit;
nsMacMessenger *mMessages;
// CLASS METHODS
private:
void DoMouseDown(EventRecord *aTheEvent);
void IdleWidgets();
void doKey(EventRecord *aTheEvent);
private:
public:
@ -58,11 +54,8 @@ class nsAppShell : public nsIAppShell
// nsIAppShellInterface
virtual void Create(int* argc, char ** argv);
virtual nsresult Run();
virtual void Exit();
virtual nsresult Run();
virtual void Exit();
virtual void SetDispatchListener(nsDispatchListener* aDispatchListener);
virtual void* GetNativeData(PRUint32 aDataType);

36
widget/src/mac/nsMacMessagePump.cpp
Просмотреть файл

@ -111,6 +111,7 @@ WindowPtr whichwindow;
break;
case activateEvt:
whichwindow = (WindowPtr)theevent.message;
SetPort(whichwindow);
if(theevent.modifiers & activeFlag)
{
::BringToFront(whichwindow);
@ -197,22 +198,28 @@ nsMouseEvent mevent;
if(whichwindow!=0)
{
SelectWindow(whichwindow);
thewindow = (nsWindow*)(((WindowPeek)whichwindow)->refCon);
thewindow = thewindow->FindWidgetHit(aTheEvent->where);
if(thewindow != nsnull)
thewindow = thewindow->FindWidgetHit(aTheEvent->where);
switch(partcode)
{
case inSysWindow:
break;
case inContent:
// mousedown inside the content region
mevent.time = 1000;
mevent.isShift = FALSE;
mevent.isControl = FALSE;
mevent.isAlt = FALSE;
mevent.clickCount = 1;
mevent.eventStructType = NS_MOUSE_EVENT;
thewindow->DispatchMouseEvent(mevent);
if(thewindow)
{
// mousedown inside the content region
mevent.time = 1000;
mevent.isShift = FALSE;
mevent.isControl = FALSE;
mevent.isAlt = FALSE;
mevent.clickCount = 1;
mevent.eventStructType = NS_MOUSE_EVENT;
thewindow->DispatchMouseEvent(mevent);
}
break;
case inDrag:
therect = qd.screenBits.bounds;
@ -243,7 +250,14 @@ nsMouseEvent mevent;
break;
case inGoAway:
if(TrackGoAway(whichwindow,aTheEvent->where))
mRunning = PR_FALSE;
if(thewindow)
{
thewindow->Destroy();
mRunning = PR_FALSE;
}
else
{
}
break;
case inZoomIn:
case inZoomOut:

304
widget/src/mac/nsWindow.cpp
Просмотреть файл

@ -75,6 +75,9 @@ nsWindow::nsWindow(nsISupports *aOuter):
mLowerLeft = PR_FALSE;
mCursor = eCursor_standard;
mClientData = nsnull;
mWindowRegion = nsnull;
mChildren = NULL;
}
@ -86,6 +89,13 @@ nsWindow::nsWindow(nsISupports *aOuter):
nsWindow::~nsWindow()
{
if(mWindowRegion!=nsnull)
{
DisposeRgn(mWindowRegion);
mWindowRegion = nsnull;
}
//XtDestroyWidget(mWidget);
//if (nsnull != mGC) {
//::XFreeGC((Display *)GetNativeData(NS_NATIVE_DISPLAY),mGC);
@ -112,7 +122,6 @@ void nsWindow::Create(nsIWidget *aParent,
aParent->AddChild(this);
// now create our stuff
if (0==aParent)
CreateMainWindow(0, 0, aRect, aHandleEventFunction, aContext, aAppShell, aToolkit, aInitData);
else
@ -121,7 +130,7 @@ void nsWindow::Create(nsIWidget *aParent,
//-------------------------------------------------------------------------
//
// This creates a nsWindow using the passed in nsNativeWidget(windowptr) no matter what
// Creates a main nsWindow using the native platforms window or widget
//
//-------------------------------------------------------------------------
void nsWindow::Create(nsNativeWidget aParent,
@ -142,8 +151,8 @@ void nsWindow::Create(nsNativeWidget aParent,
//
//
//-------------------------------------------------------------------------
void nsWindow::InitToolkit(nsIToolkit *aToolkit,
nsIWidget *aWidgetParent)
void
nsWindow::InitToolkit(nsIToolkit *aToolkit,nsIWidget *aWidgetParent)
{
if (nsnull == mToolkit) {
if (nsnull != aToolkit) {
@ -151,19 +160,16 @@ void nsWindow::InitToolkit(nsIToolkit *aToolkit,
mToolkit->AddRef();
}
else {
if (nsnull != aWidgetParent) {
if (nsnull != aWidgetParent)
{
mToolkit = (nsToolkit*)(aWidgetParent->GetToolkit()); // the call AddRef's, we don't have to
}
// it's some top level window with no toolkit passed in.
// Create a default toolkit with the current thread
else {
}
else
{ // it's some top level window with no toolkit passed in.
mToolkit = new nsToolkit();
mToolkit->AddRef();
mToolkit->Init(PR_GetCurrentThread());
// Create a shared GC for all widgets
//((nsToolkit *)mToolkit)->SetSharedGC((GC)GetNativeData(NS_NATIVE_GRAPHIC));
}
}
}
}
@ -175,7 +181,8 @@ void nsWindow::InitToolkit(nsIToolkit *aToolkit,
// Create a new windowptr since we do not have a main window yet
//
//-------------------------------------------------------------------------
void nsWindow::CreateMainWindow(nsNativeWidget aNativeParent,
void
nsWindow::CreateMainWindow(nsNativeWidget aNativeParent,
nsIWidget *aWidgetParent,
const nsRect &aRect,
EVENT_CALLBACK aHandleEventFunction,
@ -184,42 +191,49 @@ void nsWindow::CreateMainWindow(nsNativeWidget aNativeParent,
nsIToolkit *aToolkit,
nsWidgetInitData *aInitData)
{
Rect bounds;
mBounds = aRect;
mAppShell = aAppShell;
Rect bounds;
InitToolkit(aToolkit, aWidgetParent);
// save the event callback function
mEventCallback = aHandleEventFunction;
bounds.top = aRect.x;
bounds.left = aRect.y;
bounds.bottom = aRect.y+aRect.height;
bounds.right = aRect.x+aRect.width;
// build the main native window
mWindowRecord = (WindowRecord*)new char[sizeof(WindowRecord)]; // allocate our own windowrecord space
mWindowPtr = NewCWindow(mWindowRecord,&bounds,"\ptestwindow",TRUE,0,(GrafPort*)-1,TRUE,(long)this);
mWindowMadeHere = PR_TRUE;
//InitToolkit(aToolkit, aWidgetParent);
// save the event callback function
//mEventCallback = aHandleEventFunction;
if(0==aNativeParent)
{
bounds.top = aRect.x;
bounds.left = aRect.y;
bounds.bottom = aRect.y+aRect.height;
bounds.right = aRect.x+aRect.width;
mWindowRecord = (WindowRecord*)new char[sizeof(WindowRecord)]; // allocate our own windowrecord space
mWindowPtr = NewCWindow(mWindowRecord,&bounds,"\ptestwindow",TRUE,0,(GrafPort*)-1,TRUE,(long)this);
mWindowRegion = NewRgn();
SetRectRgn(mWindowRegion,bounds.left,bounds.top,bounds.right,bounds.bottom);
mWindowMadeHere = PR_TRUE;
mIsMainWindow = PR_TRUE;
}
else
{
mWindowRecord = (WindowRecord*)aNativeParent;
mWindowPtr = (WindowPtr)aNativeParent;
mWindowMadeHere = PR_FALSE;
mIsMainWindow = PR_TRUE;
}
//InitDeviceContext(aContext, (Widget) aAppShell->GetNativeData(NS_NATIVE_SHELL));
//Widget frameParent = 0;
//mWidget = frame ;
//if (aWidgetParent)
//{
//aWidgetParent->AddChild(this);
//}
}
//-------------------------------------------------------------------------
//
// Create a nsWindow, a WindowPtr will not be created here
//
//-------------------------------------------------------------------------
void nsWindow::CreateChildWindow(nsNativeWidget aNativeParent,
nsIWidget *aWidgetParent,
const nsRect &aRect,
@ -229,25 +243,28 @@ void nsWindow::CreateChildWindow(nsNativeWidget aNativeParent,
nsIToolkit *aToolkit,
nsWidgetInitData *aInitData)
{
// bounds of this child
mBounds = aRect;
mAppShell = aAppShell;
mIsMainWindow = PR_FALSE;
mWindowMadeHere = PR_TRUE;
InitToolkit(aToolkit, aWidgetParent);
// save the event callback function
// save the event callback function
mEventCallback = aHandleEventFunction;
// add this new nsWindow to the parents list
if (aWidgetParent)
{
aWidgetParent->AddChild(this);
mWindowRecord = (WindowRecord*)aNativeParent;
mWindowPtr = (WindowPtr)aNativeParent;
}
//InitDeviceContext(aContext, (Widget)aNativeParent);
//mWidget = ::XtVaCreateManagedWidget("frame",xmDrawingAreaWidgetClass,(Widget)aNativeParent,
//XmNwidth, aRect.width,XmNheight, aRect.height,XmNmarginHeight, 0,XmNmarginWidth, 0, XmNrecomputeSize, False, nsnull);
if (aWidgetParent)
{
//aWidgetParent->AddChild(this);
}
// Force cursor to default setting
mCursor = eCursor_select;
SetCursor(eCursor_standard);
@ -262,12 +279,17 @@ void nsWindow::CreateChildWindow(nsNativeWidget aNativeParent,
void nsWindow::Destroy()
{
if (mWindowMadeHere==PR_TRUE)
if (mWindowMadeHere==PR_TRUE && mIsMainWindow==PR_TRUE)
{
CloseWindow(mWindowPtr);
delete mWindowRecord;
}
if(mWindowRegion!=nsnull)
{
DisposeRgn(mWindowRegion);
mWindowRegion = nsnull;
}
}
//-------------------------------------------------------------------------
@ -295,7 +317,8 @@ NS_IMETHODIMP nsWindow::SetClientData(void* aClientData)
//-------------------------------------------------------------------------
nsIWidget* nsWindow::GetParent(void)
{
return nsnull;
return (0);
}
@ -306,7 +329,7 @@ nsIWidget* nsWindow::GetParent(void)
//-------------------------------------------------------------------------
nsIEnumerator* nsWindow::GetChildren()
{
return nsnull;
return NULL;
}
@ -317,8 +340,11 @@ nsIEnumerator* nsWindow::GetChildren()
//-------------------------------------------------------------------------
void nsWindow::AddChild(nsIWidget* aChild)
{
}
if (!mChildren)
mChildren = new Enumerator();
mChildren->Append(aChild);
}
//-------------------------------------------------------------------------
//
@ -327,9 +353,10 @@ void nsWindow::AddChild(nsIWidget* aChild)
//-------------------------------------------------------------------------
void nsWindow::RemoveChild(nsIWidget* aChild)
{
if (mChildren)
mChildren->Remove(aChild);
}
//-------------------------------------------------------------------------
//
// Hide or show this component
@ -337,15 +364,24 @@ void nsWindow::RemoveChild(nsIWidget* aChild)
//-------------------------------------------------------------------------
void nsWindow::Show(PRBool bState)
{
// set the state
mShown = bState;
if (bState) {
//XtManageChild(mWidget);
}
//else
//XtUnmanageChild(mWidget);
// UpdateVisibilityFlag();
// UpdateDisplay();
// if its a main window, do the thing
if (bState)
{ // visible
if(mIsMainWindow) // mac WindowPtr
{
}
}
else
{ // hidden
if(mIsMainWindow) // mac WindowPtr
{
}
}
// update the change
}
//-------------------------------------------------------------------------
@ -357,10 +393,14 @@ void nsWindow::Move(PRUint32 aX, PRUint32 aY)
{
mBounds.x = aX;
mBounds.y = aY;
// UpdateVisibilityFlag();
// UpdateDisplay();
//XtMoveWidget(mWidget, (Position)aX, (Position)GetYCoord(aY));
//XtVaSetValues(mWidget, XmNx, aX, XmNy, GetYCoord(aY), nsnull);
// if its a main window, move the window,
// else is a child, so change its relative position
// update this change
}
//-------------------------------------------------------------------------
@ -604,19 +644,14 @@ void nsWindow::Invalidate(PRBool aIsSynchronous)
//-------------------------------------------------------------------------
void* nsWindow::GetNativeData(PRUint32 aDataType)
{
switch(aDataType) {
switch(aDataType)
{
case NS_NATIVE_WIDGET:
case NS_NATIVE_WINDOW:
//return (void*)XtWindow(mWidget);
case NS_NATIVE_DISPLAY:
//return (void*)XtDisplay(mWidget);
case NS_NATIVE_WIDGET:
//return (void*)(mWidget);
case NS_NATIVE_GRAPHIC:
{
void *res = NULL;
return res;
}
return (void*)mWindowPtr;
break;
case NS_NATIVE_COLORMAP:
default:
break;
@ -635,8 +670,8 @@ nsIRenderingContext* nsWindow::GetRenderingContext()
{
nsIRenderingContext * ctx = nsnull;
if (GetNativeData(NS_NATIVE_WIDGET)) {
if (GetNativeData(NS_NATIVE_WIDGET))
{
nsresult res;
static NS_DEFINE_IID(kRenderingContextCID, NS_RENDERING_CONTEXT_CID);
@ -648,7 +683,7 @@ nsIRenderingContext* nsWindow::GetRenderingContext()
ctx->Init(mContext, this);
NS_ASSERTION(NULL != ctx, "Null rendering context");
}
}
return ctx;
@ -782,7 +817,7 @@ PRBool nsWindow::DispatchEvent(nsGUIEvent* event)
// Deal with all sort of mouse event
//
//-------------------------------------------------------------------------
PRBool nsWindow::DispatchMouseEvent(nsMouseEvent aEvent)
PRBool nsWindow::DispatchMouseEvent(nsMouseEvent &aEvent)
{
PRBool result = PR_FALSE;
if (nsnull == mEventCallback && nsnull == mMouseListener) {
@ -800,17 +835,21 @@ PRBool nsWindow::DispatchMouseEvent(nsMouseEvent aEvent)
if (nsnull != mMouseListener) {
switch (aEvent.message) {
case NS_MOUSE_MOVE: {
/*result = ConvertStatus(mMouseListener->MouseMoved(event));
result = ConvertStatus(mMouseListener->MouseMoved(aEvent));
nsRect rect;
GetBounds(rect);
if (rect.Contains(event.point.x, event.point.y)) {
if (mCurrentWindow == NULL || mCurrentWindow != this) {
//printf("Mouse enter");
mCurrentWindow = this;
}
} else {
//printf("Mouse exit");
}*/
if (rect.Contains(aEvent.point.x, aEvent.point.y))
{
//if (mWindowPtr == NULL || mWindowPtr != this)
//{
printf("Mouse enter");
//mCurrentWindow = this;
//}
}
else
{
printf("Mouse exit");
}
} break;
@ -1016,7 +1055,8 @@ void nsWindow::GetResizeRect(nsRect* aRect)
//
//
//-------------------------------------------------------------------------
void nsWindow::SetResized(PRBool aResized)
void
nsWindow::SetResized(PRBool aResized)
{
mResized = aResized;
}
@ -1026,21 +1066,60 @@ void nsWindow::SetResized(PRBool aResized)
//
//
//-------------------------------------------------------------------------
PRBool nsWindow::GetResized()
PRBool
nsWindow::GetResized()
{
return(mResized);
}
//-------------------------------------------------------------------------
//
// Is the point in this window
//
//-------------------------------------------------------------------------
PRBool
nsWindow::ptInWindow(PRInt32 aX,PRInt32 aY)
{
PRBool result = PR_FALSE;
Point hitpt;
hitpt.h = aX;
hitpt.v = aY;
if( PtInRgn( hitpt,mWindowRegion) )
result = TRUE;
return(result);
}
//-------------------------------------------------------------------------
//
// find the widget that was hit
//
//-------------------------------------------------------------------------
nsWindow* nsWindow::FindWidgetHit(Point)
nsWindow*
nsWindow::FindWidgetHit(Point aThePoint)
{
nsWindow* thewindow = NULL;
nsWindow *thewindow = this;
nsWindow *deeperwindow;
// traverse through all the nsWindows to find out who got hit, lowest level of course
if (mChildren)
{
mChildren->ResetToLast();
while(thewindow)
{
if (thewindow->ptInWindow(aThePoint.h,aThePoint.v) )
{
// go down this windows list
deeperwindow = thewindow->FindWidgetHit(aThePoint);
if (deeperwindow)
return(deeperwindow);
else
return(thewindow);
}
thewindow = (nsWindow*)mChildren->Previous();
}
}
return(thewindow);
}
@ -1242,7 +1321,7 @@ void nsWindow::RemoveTooltips()
nsWindow::Enumerator::Enumerator()
{
mArraySize = INITIAL_SIZE;
mChildrens = (nsWindow**)new PRInt32[mArraySize];
mChildrens = (nsIWidget**)new PRInt32[mArraySize];
memset(mChildrens, 0, sizeof(PRInt32) * mArraySize);
mCurrentPosition = 0;
}
@ -1269,13 +1348,23 @@ nsWindow::Enumerator::~Enumerator()
nsIWidget* nsWindow::Enumerator::Next()
{
if (mCurrentPosition < mArraySize && mChildrens[mCurrentPosition])
{
return mChildrens[mCurrentPosition++];
}
return NULL;
}
//-------------------------------------------------------------------------
//
// Get enumeration previous element. Return null at the beginning
//
//-------------------------------------------------------------------------
nsIWidget* nsWindow::Enumerator::Previous()
{
if ((mCurrentPosition >=0) && (mCurrentPosition < mArraySize) && (mChildrens[mCurrentPosition]))
return mChildrens[mCurrentPosition--];
return NULL;
}
//-------------------------------------------------------------------------
//
@ -1287,13 +1376,22 @@ void nsWindow::Enumerator::Reset()
mCurrentPosition = 0;
}
//-------------------------------------------------------------------------
//
// Reset enumerator internal pointer to the end
//
//-------------------------------------------------------------------------
void nsWindow::Enumerator::ResetToLast()
{
mCurrentPosition = mArraySize-1;
}
//-------------------------------------------------------------------------
//
// Append an element
//
//-------------------------------------------------------------------------
void nsWindow::Enumerator::Append(nsWindow* aWinWidget)
void nsWindow::Enumerator::Append(nsIWidget* aWinWidget)
{
PRInt32 pos;
@ -1312,7 +1410,7 @@ PRInt32 pos;
// Remove an element
//
//-------------------------------------------------------------------------
void nsWindow::Enumerator::Remove(nsWindow* aWinWidget)
void nsWindow::Enumerator::Remove(nsIWidget* aWinWidget)
{
int pos;
for(pos = 0; mChildrens[pos] && (mChildrens[pos] != aWinWidget); pos++);
@ -1331,7 +1429,7 @@ void nsWindow::Enumerator::Remove(nsWindow* aWinWidget)
void nsWindow::Enumerator::GrowArray()
{
mArraySize <<= 1;
nsWindow **newArray = (nsWindow**)new PRInt32[mArraySize];
nsIWidget **newArray = (nsIWidget**)new PRInt32[mArraySize];
memset(newArray, 0, sizeof(PRInt32) * mArraySize);
memcpy(newArray, mChildrens, (mArraySize>>1) * sizeof(PRInt32));
mChildrens = newArray;

23
widget/src/mac/nsWindow.h
Просмотреть файл

@ -38,7 +38,7 @@
// =============================================================================
/**
* Native Motif window wrapper.
* Native Macintosh window wrapper.
*/
class nsWindow : public nsIWidget
@ -116,7 +116,7 @@ public:
static PRBool ConvertStatus(nsEventStatus aStatus);
virtual PRBool DispatchEvent(nsGUIEvent* event);
virtual PRBool DispatchMouseEvent(nsMouseEvent aEvent);
virtual PRBool DispatchMouseEvent(nsMouseEvent &aEvent);
virtual void OnDestroy();
virtual PRBool OnPaint(nsPaintEvent &event);
@ -138,7 +138,9 @@ public:
void GetResizeRect(nsRect* aRect);
PRBool GetResized();
nsWindow* FindWidgetHit(Point);
nsWindow* FindWidgetHit(Point aThePoint);
ptInWindow(PRInt32 aX,PRInt32 aY);
char gInstanceClassName[256];
protected:
@ -209,7 +211,7 @@ protected:
// keep the list of children
class Enumerator
{
nsWindow **mChildrens;
nsIWidget **mChildrens;
PRInt32 mCurrentPosition;
PRInt32 mArraySize;
@ -217,11 +219,13 @@ protected:
Enumerator();
~Enumerator();
nsIWidget* Previous();
nsIWidget* Next();
void Reset();
void ResetToLast();
void Append(nsWindow* aWidget);
void Remove(nsWindow* aWidget);
void Append(nsIWidget* aWidget);
void Remove(nsIWidget* aWidget);
private:
void GrowArray();
@ -253,8 +257,7 @@ private:
WindowPtr mWindowPtr;
PRBool mWindowMadeHere; // if main window and we created, true
PRBool mIsMainWindow; // top level Mac window
RgnHandle mWindowRegion; // the region defining this window
RgnHandle mWindowRegion; // the region defining this window
};
@ -345,7 +348,7 @@ public: \
virtual void BeginResizingChildren(void); \
virtual void EndResizingChildren(void); \
virtual PRBool DispatchEvent(nsGUIEvent* event); \
virtual PRBool DispatchMouseEvent(nsMouseEvent aEvent); \
virtual PRBool DispatchMouseEvent(nsMouseEvent &aEvent); \
virtual void OnDestroy(); \
virtual PRBool OnPaint(nsPaintEvent & event); \
virtual PRBool OnResize(nsSizeEvent &aEvent); \
@ -557,7 +560,7 @@ public: \
{ \
return GET_OUTER()->DispatchEvent(event); \
} \
PRBool _classname::_aggname::DispatchMouseEvent(nsMouseEvent event) \
PRBool _classname::_aggname::DispatchMouseEvent(nsMouseEvent &event) \
{ \
return GET_OUTER()->DispatchMouseEvent(event); \
} \