Checkpoint for mac os x reactivation.
Having trouble with the implementation of getHandleToPeer. Current problem is that JAWT_DrawingSurface->Lock() is failing. Why would that be? git-svn-id: svn://10.0.0.236/trunk@173357 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -111,11 +111,13 @@ nsresult
|
||||
EmbedWindow::CreateWindow_(PRUint32 width, PRUint32 height)
|
||||
{
|
||||
nsresult rv;
|
||||
#ifdef XP_UNIX
|
||||
#if defined(XP_UNIX) && !defined(XP_MACOSX)
|
||||
PR_ASSERT(PR_FALSE);
|
||||
GtkWidget *ownerAsWidget (GTK_WIDGET(mOwner->parentHWnd));
|
||||
width = ownerAsWidget->allocation.width;
|
||||
height = ownerAsWidget->allocation.height;
|
||||
#elif defined(XP_MACOSX)
|
||||
void *ownerAsWidget = mOwner->parentHWnd;
|
||||
#else
|
||||
HWND ownerAsWidget = mOwner->parentHWnd;
|
||||
#endif
|
||||
@@ -645,8 +647,10 @@ EmbedWindow::SetTitle(const PRUnichar *aTitle)
|
||||
NS_IMETHODIMP
|
||||
EmbedWindow::GetSiteWindow(void **aSiteWindow)
|
||||
{
|
||||
#ifdef XP_UNIX
|
||||
#if defined(XP_UNIX) && !defined(XP_MACOSX)
|
||||
GtkWidget *ownerAsWidget (GTK_WIDGET(mOwner->parentHWnd));
|
||||
#elif defined(XP_MACOSX)
|
||||
void *ownerAsWidget = mOwner->parentHWnd;
|
||||
#else
|
||||
HWND ownerAsWidget = mOwner->parentHWnd;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user