More correctness fixes to fix compiler warnings.

This commit is contained in:
Ben Byer 2007-11-16 05:36:51 -08:00 committed by Jeremy Huddleston
parent cee516e142
commit c50a40263b
4 changed files with 10 additions and 15 deletions

View file

@ -464,7 +464,7 @@ void DarwinModeProcessEvent(
case kXDarwinWindowMoved: case kXDarwinWindowMoved:
DEBUG_LOG("kXDarwinWindowMoved\n"); DEBUG_LOG("kXDarwinWindowMoved\n");
RootlessNativeWindowMoved (xe->u.clientMessage.u.l.longs0); RootlessNativeWindowMoved ((WindowPtr)xe->u.clientMessage.u.l.longs0);
break; break;
case kXDarwinToggleFullscreen: case kXDarwinToggleFullscreen:

View file

@ -123,9 +123,9 @@ int QuartzFSUseQDCursor(
* Clean out any autoreleased objects. * Clean out any autoreleased objects.
*/ */
void QuartzBlockHandler( void QuartzBlockHandler(
void *blockData, pointer blockData,
void *pTimeout, OSTimePtr pTimeout,
void *pReadmask) pointer pReadmask)
{ {
static NSAutoreleasePool *aPool = nil; static NSAutoreleasePool *aPool = nil;
@ -138,9 +138,9 @@ void QuartzBlockHandler(
* QuartzWakeupHandler * QuartzWakeupHandler
*/ */
void QuartzWakeupHandler( void QuartzWakeupHandler(
void *blockData, pointer blockData,
int result, int result,
void *pReadmask) pointer pReadmask)
{ {
// nothing here // nothing here
} }

View file

@ -46,6 +46,7 @@
#undef Cursor #undef Cursor
#undef WindowPtr #undef WindowPtr
#undef Picture #undef Picture
#include <X11/Xdefs.h>
// Quartz specific per screen storage structure // Quartz specific per screen storage structure
typedef struct { typedef struct {
@ -87,8 +88,8 @@ void QuartzSetWindowMenu(int nitems, const char **items,
void QuartzFSCapture(void); void QuartzFSCapture(void);
void QuartzFSRelease(void); void QuartzFSRelease(void);
int QuartzFSUseQDCursor(int depth); int QuartzFSUseQDCursor(int depth);
void QuartzBlockHandler(void *blockData, void *pTimeout, void *pReadmask); void QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask);
void QuartzWakeupHandler(void *blockData, int result, void *pReadmask); void QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask);
// Messages that can be sent to the main thread. // Messages that can be sent to the main thread.
enum { enum {

View file

@ -88,13 +88,7 @@ eventHandler(unsigned int type, const void *arg,
{ {
xp_window_id id = * (xp_window_id *) arg; xp_window_id id = * (xp_window_id *) arg;
WindowPtr pWin = xprGetXWindow(id); WindowPtr pWin = xprGetXWindow(id);
BoxRec box; QuartzMessageServerThread(kXDarwinWindowMoved, 1, pWin);
xp_error retval = xp_get_window_bounds(id, &box);
if (retval != Success) {
ErrorF("Unable to find new bounds for window\n");
break;
}
QuartzMessageServerThread(kXDarwinWindowMoved, 3, pWin, box.x1, box.y1);
} }
break; break;