diff --git a/tetris/scenes.cpp b/tetris/scenes.cpp
index 74acbdb..6d4447b 100644
--- a/tetris/scenes.cpp
+++ b/tetris/scenes.cpp
@@ -389,8 +389,7 @@ void handleKeyUpMain( SDL_Keycode key ) {
 
 void pollEventsMain( SDLPP::Scene &scene ) {
     SDL_Event event;
-    while ( SDL_PeepEvents(&event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1 ) {
-        SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
+    while ( SDLPP::getSDLEvent( event ) ) {
         switch ( event.type ) {
         case SDL_QUIT:
             quitGame();
@@ -502,8 +501,7 @@ void handleKeyDownMenu( SDL_Keycode key ) {
 
 void pollEventsMenu() {
     SDL_Event event;
-    while ( SDL_PeepEvents(&event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1 ) {
-        SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
+    while ( SDLPP::getSDLEvent( event ) ) {
         switch ( event.type ) {
         case SDL_QUIT:
             quitGame();
@@ -568,8 +566,7 @@ void handleKeyDownGameOver( SDL_Keycode key ) {
 
 void pollEventsGameOver() {
     SDL_Event event;
-    while ( SDL_PeepEvents(&event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1 ) {
-        SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
+    while ( SDLPP::getSDLEvent( event ) ) {
         switch ( event.type ) {
         case SDL_QUIT:
             quitGame();
@@ -692,8 +689,7 @@ void handleKeyDownOptions( SDL_Keycode key ) {
 
 void pollEventsOptions() {
     SDL_Event event;
-    while ( SDL_PeepEvents(&event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1 ) {
-        SDL_PeepEvents(&event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT);
+    while ( SDLPP::getSDLEvent( event ) ) {
         switch ( event.type ) {
         case SDL_QUIT:
             quitGame();