From 9f396e296466370a688c6336ab58450dab5ce2a0 Mon Sep 17 00:00:00 2001
From: egottlieb <none@none>
Date: Mon, 16 Aug 2010 01:17:19 -0400
Subject: [PATCH] Condensed flag-setting code and put parantheses in the
 appropriate places.  It was that, in the end.

---
 src/video/SDL_shape.c            | 6 +-----
 src/video/win32/SDL_win32shape.c | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/video/SDL_shape.c b/src/video/SDL_shape.c
index 20bfc4e94..32e7de99a 100644
--- a/src/video/SDL_shape.c
+++ b/src/video/SDL_shape.c
@@ -33,11 +33,7 @@
 SDL_Window*
 SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) {
     SDL_Window *result = NULL;
-    flags |= SDL_WINDOW_BORDERLESS;
-    flags &= (~SDL_WINDOW_RESIZABLE);
-    flags &= (~SDL_WINDOW_FULLSCREEN);
-    //flags &= (~SDL_WINDOW_SHOWN);
-    result = SDL_CreateWindow(title,x,y,w,h,flags | SDL_WINDOW_BORDERLESS & ~SDL_WINDOW_FULLSCREEN & ~SDL_WINDOW_RESIZABLE);
+    result = SDL_CreateWindow(title,x,y,w,h,(flags | SDL_WINDOW_BORDERLESS) & (~SDL_WINDOW_FULLSCREEN) & (~SDL_WINDOW_RESIZABLE) /*& (~SDL_WINDOW_SHOWN)*/);
     if(result != NULL) {
         result->shaper = result->display->device->shape_driver.CreateShaper(result);
         if(result->shaper != NULL) {
diff --git a/src/video/win32/SDL_win32shape.c b/src/video/win32/SDL_win32shape.c
index 721fcbd61..b649bb09f 100644
--- a/src/video/win32/SDL_win32shape.c
+++ b/src/video/win32/SDL_win32shape.c
@@ -40,7 +40,7 @@ Win32_CreateShaper(SDL_Window * window) {
     resized_properly = Win32_ResizeWindowShape(window);
     if (resized_properly != 0)
             return NULL;
-
+    
     return result;
 }