wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge backout

Browse Source
This commit is contained in:
Chris Jones 2010-08-19 19:02:24 -05:00
commit 68693b6537
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
view/src/nsView.cpp
View File

@ -745,16 +745,6 @@ nsresult nsView::CreateWidget(const nsIID &aWindowIID,
::HandleEvent, dx, nsnull, nsnull, aWidgetInitData); ::HandleEvent, dx, nsnull, nsnull, aWidgetInitData);
} }
InitializeWindow(aEnableDragDrop, aResetVisibility);
return NS_OK;
}
void
nsView::InitializeWindow(bool aEnableDragDrop, bool aResetVisibility)
{
NS_ABORT_IF_FALSE(mWindow, "Must have a window to initialize");
if (aEnableDragDrop) { if (aEnableDragDrop) {
mWindow->EnableDragDrop(PR_TRUE); mWindow->EnableDragDrop(PR_TRUE);
} }
@ -767,6 +757,8 @@ nsView::InitializeWindow(bool aEnableDragDrop, bool aResetVisibility)
if (aResetVisibility) { if (aResetVisibility) {
SetVisibility(GetVisibility()); SetVisibility(GetVisibility());
} }
return NS_OK;
} }
// Attach to a top level widget and start receiving mirrored events. // Attach to a top level widget and start receiving mirrored events.

3
view/src/nsView.h
View File

@ -194,9 +194,6 @@ protected:
void DoResetWidgetBounds(PRBool aMoveOnly, PRBool aInvalidateChangedSize); void DoResetWidgetBounds(PRBool aMoveOnly, PRBool aInvalidateChangedSize);
nsRegion* mDirtyRegion; nsRegion* mDirtyRegion;
private:
void InitializeWindow(bool aEnableDragDrop, bool aResetVisibility);
}; };
#endif #endif