Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checkpoint for mac os x reactivation.

Browse Source 
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:
edburns%acm.org
2005-05-13 06:40:12 +00:00
parent 16ed34f985
commit ba350c1664
19 changed files with 378 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/java/webclient/src_moz/NativeWrapperFactory.cpp
View File

@@ -34,7 +34,7 @@
#include "ns_util.h"
#ifdef XP_UNIX
#if defined(XP_UNIX) && !defined(XP_MACOSX)
#include <unistd.h>
#include "gdksuperwin.h"
#include "gtkmozarea.h"
@@ -43,7 +43,6 @@ extern "C" {
static int wc_x_error (Display *display,
XErrorEvent *error);
}
#endif
PLEventQueue *NativeWrapperFactory::sActionQueue = nsnull;
@@ -135,7 +134,7 @@ NativeWrapperFactory::Init(JNIEnv * env, jobject newNativeEventThread)
("NativeBrowserControl_Init: get ActionQueue: %d\n",
mFailureCode));
#ifdef XP_UNIX
#if defined(XP_UNIX) && !defined(XP_MACOSX)
// The gdk_x_error function exits in some cases, we don't
// want that.
@@ -171,12 +170,11 @@ NativeWrapperFactory::ProcessEventLoop(void)
return 0;
}
#ifdef XP_UNIX
#if defined(XP_UNIX) && !defined(XP_MACOSX)
while(gtk_events_pending()) {
gtk_main_iteration();
}
#else
// PENDING(mark): Does this work on the Mac?
#elif !defined(XP_MACOSX)
MSG msg;
PRBool wasHandled;
@@ -226,7 +224,7 @@ NativeWrapperFactory::IsInitialized(void)
return sInitComplete;
}
#ifdef XP_UNIX
#if defined(XP_UNIX) && !defined(XP_MACOSX)
static int
wc_x_error (Display *display,
XErrorEvent *error)