diff --git a/MiniEngine_Event.cpp b/MiniEngine_Event.cpp
index b3e38db..fe2ea5d 100644
--- a/MiniEngine_Event.cpp
+++ b/MiniEngine_Event.cpp
@@ -25,12 +25,12 @@ void PumpEvents()
     SDL_PumpEvents();
 }
 
-bool HasEvent(decltype(Event::type) EventType)
+bool HasEvent(_SDLEventType_ EventType)
 {
     return ( SDL_HasEvent(EventType)==SDL_TRUE );
 }
 
-bool HasEvent(decltype(Event::type) EventTypeMin,decltype(Event::type) EventTypeMax)
+bool HasEvent(_SDLEventType_ EventTypeMin,_SDLEventType_ EventTypeMax)
 {
     return ( SDL_HasEvents(EventTypeMin,EventTypeMax)==SDL_TRUE );
 }
diff --git a/MiniEngine_Event.h b/MiniEngine_Event.h
index 0d000e5..9a136db 100644
--- a/MiniEngine_Event.h
+++ b/MiniEngine_Event.h
@@ -4,21 +4,22 @@
 #include <list>
 
 typedef SDL_Event Event;
+typedef decltype(Event::type) _SDLEventType_;
 
 int PollEvent(Event& refEvent);
 int WaitEvent(Event& refEvent);
 int WaitEventTimeout(Event& refEvent,int ms);
 int PushEvent(const Event& refEvent);
 void PumpEvents();
-bool HasEvent(decltype(Event::type) EventType);
-bool HasEvent(decltype(Event::type) EventTypeMin,decltype(Event::type) EventTypeMax);
-bool EnableEvent(decltype(Event::type) EventType);
-bool DisableEvent(decltype(Event::type) EventType);
-bool IsEventEnabled(decltype(Event::type) EventType);
+bool HasEvent(_SDLEventType_ EventType);
+bool HasEvent(_SDLEventType_ EventTypeMin,_SDLEventType_ EventTypeMax);
+bool EnableEvent(_SDLEventType_ EventType);
+bool DisableEvent(_SDLEventType_ EventType);
+bool IsEventEnabled(_SDLEventType_ EventType);
 
 typedef struct
 {
-    decltype(Event::type) _type_id;
+    _SDLEventType_ _type_id;
     int _looper_cnt;
 }LooperID;
 
@@ -28,7 +29,6 @@ bool operator != (const LooperID&,const LooperID&);
 class Looper
 {
 public:
-    typedef decltype(Event::type) _SDLEventType_;
     Looper();
     /// If Callback does not return 0, then stop transferring this event.
     LooperID add(_SDLEventType_ event_type,const std::function<int(Looper&,Event&)>& event_callback);