Named the event structs. Fixed a warning with endif comments.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@817 dfc29bdd-3216-0410-991c-e03cc46cb475

include/IEventReceiver.h

@@ -139,78 +139,82 @@ namespace irr
 //! SEvents hold information about an event. 
 struct SEvent
 {
-	EEVENT_TYPE EventType;
-
-	union
+	struct SGUIEvent
 	{
-		struct 
-		{
-			//! IGUIElement who called the event
-			gui::IGUIElement* Caller;
+		//! IGUIElement who called the event
+		gui::IGUIElement* Caller;
 
-			//! If the event has something to do with another element, it will be held here.
-			gui::IGUIElement* Element;
+		//! If the event has something to do with another element, it will be held here.
+		gui::IGUIElement* Element;
 
-			//! Type of GUI Event
-			gui::EGUI_EVENT_TYPE EventType;
+		//! Type of GUI Event
+		gui::EGUI_EVENT_TYPE EventType;
 
-		} GUIEvent;
+	};
 
-		struct
-		{
-			//! X position of mouse cursor
-			s32 X;
+	struct SMouseInput
+	{
+		//! X position of mouse cursor
+		s32 X;
 
-			//! Y position of mouse cursor
-			s32 Y;
+		//! Y position of mouse cursor
+		s32 Y;
 
-			//! mouse wheel delta, usually 1.0 or -1.0.
-			/** Only valid if event was EMIE_MOUSE_WHEEL */
-			f32 Wheel; 
+		//! mouse wheel delta, usually 1.0 or -1.0.
+		/** Only valid if event was EMIE_MOUSE_WHEEL */
+		f32 Wheel; 
 
-			//! type of mouse event
-			EMOUSE_INPUT_EVENT Event;
-		} MouseInput;
+		//! type of mouse event
+		EMOUSE_INPUT_EVENT Event;
+	};
 
-		struct
-		{
-			//! Character corresponding to the key (0, if not a character)
-			wchar_t Char; 
+	struct SKeyInput
+	{
+		//! Character corresponding to the key (0, if not a character)
+		wchar_t Char; 
 
-			//! Key which has been pressed or released
-			EKEY_CODE Key; 
+		//! Key which has been pressed or released
+		EKEY_CODE Key; 
 
-			//! if not pressed, then the key was left up
-			bool PressedDown; 
+		//! if not pressed, then the key was left up
+		bool PressedDown; 
 
-			//! true if shift was also pressed
-			bool Shift; 
+		//! true if shift was also pressed
+		bool Shift; 
 
-			//! true if ctrl was also pressed
-			bool Control; 
-		} KeyInput;
+		//! true if ctrl was also pressed
+		bool Control; 
+	};
 
-		struct
-		{
-			//! pointer to text which has been logged
-			const c8* Text;
+	struct SLogEvent
+	{
+		//! pointer to text which has been logged
+		const c8* Text;
 
-			//! log level in which the text has been logged
-			ELOG_LEVEL Level;
-		} LogEvent;
+		//! log level in which the text has been logged
+		ELOG_LEVEL Level;
+	};
 
-		struct
-		{
-			//! Some user specified data as int
-			s32 UserData1; 
+	struct SUserEvent
+	{
+		//! Some user specified data as int
+		s32 UserData1; 
 
-			//! Another user specified data as int
-			s32 UserData2; 
+		//! Another user specified data as int
+		s32 UserData2; 
 
-			//! Some user specified data as float
-			f32 UserData3; 
-		} UserEvent;
+		//! Some user specified data as float
+		f32 UserData3; 
+	};
 
+	EEVENT_TYPE EventType;
+	union
+	{
+		struct SGUIEvent GUIEvent;
+		struct SMouseInput MouseInput;
+		struct SKeyInput KeyInput;
+		struct SLogEvent LogEvent;
+		struct SUserEvent UserEvent;
 	};
 
 };

source/Irrlicht/BuiltInFont.h

@@ -1059,7 +1059,7 @@ u8 BuiltInFontData[] =
 } // end namespace gui
 } // end namespace irr
 
-#endif _IRR_COMPILE_WITH_GUI_
+#endif // _IRR_COMPILE_WITH_GUI_
 
 #endif