diff --git a/rainbow/Framebuffer/Wnd.cpp b/rainbow/Framebuffer/Wnd.cpp index 9e5a05f14..002c2ee32 100644 --- a/rainbow/Framebuffer/Wnd.cpp +++ b/rainbow/Framebuffer/Wnd.cpp @@ -263,7 +263,6 @@ void Ctrl::DoUpdate() Vector Ctrl::GetPaintRects() { Vector r; - int q = FindTopCtrl(); r.Add(GetScreenRect()); for(int i = max(FindTopCtrl() + 1, 0); i < topctrl.GetCount(); i++) Subtract(r, topctrl[i]->GetScreenRect()); diff --git a/rainbow/SDLFb/Proc.cpp b/rainbow/SDLFb/Proc.cpp index 5fdf30ad6..69fa806d9 100644 --- a/rainbow/SDLFb/Proc.cpp +++ b/rainbow/SDLFb/Proc.cpp @@ -89,7 +89,7 @@ void HandleSDLEvent(SDL_Event* event) case SDL_KEYDOWN: case SDL_KEYUP: //SDL_KeyboardEvent { - bool b = false; +// bool b = false; dword keycode = 0; if(event->type == SDL_KEYDOWN) { switch(event->key.keysym.sym) @@ -99,17 +99,18 @@ void HandleSDLEvent(SDL_Event* event) case SDLK_LCTRL: modkeys |= KM_LCTRL; break; case SDLK_RCTRL: modkeys |= KM_RCTRL; break; case SDLK_LALT: modkeys |= KM_LALT; break; - case SDLK_RALT: modkeys |= KM_RALT; break; + case SDLK_RALT: modkeys |= KM_RALT; break; + default:; } keycode = fbKEYtoK((dword)event->key.keysym.sym); if(keycode != K_SPACE) //dont send space on keydown - b = Ctrl::DoKeyFB(keycode, 1); + /*b = */Ctrl::DoKeyFB(keycode, 1); //send respective keyup things as char events as well keycode = (dword)event->key.keysym.unicode; if((keycode != 127 && keycode >= 32 && keycode < 255)) - b = Ctrl::DoKeyFB(keycode, 1); + /*b = */Ctrl::DoKeyFB(keycode, 1); } else if(event->type == SDL_KEYUP) @@ -122,10 +123,11 @@ void HandleSDLEvent(SDL_Event* event) case SDLK_RCTRL: modkeys &= ~KM_RCTRL; break; case SDLK_LALT: modkeys &= ~KM_LALT; break; case SDLK_RALT: modkeys &= ~KM_RALT; break; + default:; } keycode = fbKEYtoK((dword)event->key.keysym.sym) | K_KEYUP; - b = Ctrl::DoKeyFB(keycode, 1); + /*b = */Ctrl::DoKeyFB(keycode, 1); } } break;