src/video/cocoa/SDL_cocoawindow.m
changeset 1936 83946ee0ff1f
parent 1933 7ee5297340f7
child 1937 05e88d266921
     1.1 --- a/src/video/cocoa/SDL_cocoawindow.m	Mon Jul 24 23:30:14 2006 +0000
     1.2 +++ b/src/video/cocoa/SDL_cocoawindow.m	Tue Jul 25 06:22:42 2006 +0000
     1.3 @@ -31,6 +31,7 @@
     1.4  
     1.5  static __inline__ void ConvertNSRect(NSRect *r)
     1.6  {
     1.7 +    /* FIXME: Cache the display used for this window */
     1.8      r->origin.y = CGDisplayPixelsHigh(kCGDirectMainDisplay) - r->origin.y - r->size.height;
     1.9  }
    1.10  
    1.11 @@ -325,6 +326,7 @@
    1.12      NSRect rect;
    1.13      unsigned int style;
    1.14      NSString *title;
    1.15 +    int status;
    1.16  
    1.17      pool = [[NSAutoreleasePool alloc] init];
    1.18  
    1.19 @@ -380,18 +382,15 @@
    1.20  
    1.21      if (SetupWindowData(window, nswindow, YES) < 0) {
    1.22          [nswindow release];
    1.23 -        [pool release];
    1.24          return -1;
    1.25      }
    1.26  #ifdef SDL_VIDEO_OPENGL
    1.27 -    /*
    1.28      if (window->flags & SDL_WINDOW_OPENGL) {
    1.29          if (Cocoa_GL_SetupWindow(_this, window) < 0) {
    1.30              Cocoa_DestroyWindow(_this, window);
    1.31              return -1;
    1.32          }
    1.33      }
    1.34 -    */
    1.35  #endif
    1.36      return 0;
    1.37  }
    1.38 @@ -522,11 +521,9 @@
    1.39      if (data) {
    1.40          NSAutoreleasePool *pool;
    1.41  #ifdef SDL_VIDEO_OPENGL
    1.42 -        /*
    1.43          if (window->flags & SDL_WINDOW_OPENGL) {
    1.44              Cocoa_GL_CleanupWindow(_this, window);
    1.45          }
    1.46 -        */
    1.47  #endif
    1.48          pool = [[NSAutoreleasePool alloc] init];
    1.49          [data->listener close];