Removed isCustom ... not used any more. SDL-1.2
authorRyan C. Gordon <icculus@icculus.org>
Tue, 29 Sep 2009 13:42:33 +0000
branchSDL-1.2
changeset 426727f972dd5aff
parent 4266 62849663f20a
child 4268 d48035d857d3
Removed isCustom ... not used any more.
src/video/quartz/SDL_QuartzVideo.m
     1.1 --- a/src/video/quartz/SDL_QuartzVideo.m	Tue Sep 29 13:40:34 2009 +0000
     1.2 +++ b/src/video/quartz/SDL_QuartzVideo.m	Tue Sep 29 13:42:33 2009 +0000
     1.3 @@ -461,7 +461,6 @@
     1.4      NSRect screen_rect;
     1.5      CGError error;
     1.6      NSRect contentRect;
     1.7 -    BOOL isCustom = NO;
     1.8      CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
     1.9  
    1.10      /* Fade to black to hide resolution-switching flicker (and garbage
    1.11 @@ -577,11 +576,9 @@
    1.12      }
    1.13      /* We already have a window, just change its size */
    1.14      else {
    1.15 -        if (!isCustom) {
    1.16 -            [ qz_window setContentSize:contentRect.size ];
    1.17 -            current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
    1.18 -            [ window_view setFrameSize:contentRect.size ];
    1.19 -        }
    1.20 +        [ qz_window setContentSize:contentRect.size ];
    1.21 +        current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
    1.22 +        [ window_view setFrameSize:contentRect.size ];
    1.23      }
    1.24  
    1.25      /* Setup OpenGL for a fullscreen context */
    1.26 @@ -660,7 +657,6 @@
    1.27                                           int height, int *bpp, Uint32 flags) {
    1.28      unsigned int style;
    1.29      NSRect contentRect;
    1.30 -    BOOL isCustom = NO;
    1.31      int center_window = 1;
    1.32      int origin_x, origin_y;
    1.33      CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
    1.34 @@ -745,8 +741,7 @@
    1.35              /* have to flip the Y value (NSPoint is lower left corner origin) */
    1.36              [ qz_window setFrameTopLeftPoint:NSMakePoint((float) origin_x, (float) (this->info.current_h - origin_y))];
    1.37              center_window = 0;
    1.38 -        }
    1.39 -        else if ( center_window ) {
    1.40 +        } else if ( center_window ) {
    1.41              [ qz_window center ];
    1.42          }
    1.43  
    1.44 @@ -756,12 +751,9 @@
    1.45      }
    1.46      /* We already have a window, just change its size */
    1.47      else {
    1.48 -    
    1.49 -        if (!isCustom) {
    1.50 -            [ qz_window setContentSize:contentRect.size ];
    1.51 -            current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
    1.52 -            [ window_view setFrameSize:contentRect.size ];
    1.53 -        }
    1.54 +        [ qz_window setContentSize:contentRect.size ];
    1.55 +        current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
    1.56 +        [ window_view setFrameSize:contentRect.size ];
    1.57      }
    1.58  
    1.59      /* For OpenGL, we bind the context to a subview */