diff --git a/ChangeLog b/ChangeLog
index 0df6317..34026a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-10 Riccardo Mottola <rmottola@users.sf.net>
+
+	* Source/win32/w32_activate.m: generate GSAppKitWindowLeave leave
+	events.
+	
 2010-01-08 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/win32/w32_text_focus.m: Small clean up in focus handling.
diff --git a/Source/win32/w32_activate.m b/Source/win32/w32_activate.m
index 578c0db..2f34db0 100644
--- a/Source/win32/w32_activate.m
+++ b/Source/win32/w32_activate.m
@@ -41,12 +41,36 @@
     {
       case WA_ACTIVE:  //deactivate
         {
-          // future implimentation if needed
+	  NSEvent *ev;
+      
+	  ev = [NSEvent otherEventWithType: NSAppKitDefined
+		      	          location: NSMakePoint(0, 0)
+			     modifierFlags: 0
+			         timestamp: 0
+			      windowNumber: (int)lParam
+			           context: GSCurrentContext()
+			           subtype: GSAppKitWindowLeave
+			             data1: 0
+			             data2: 0];
+      
+	  [EVENT_WINDOW(lParam) sendEvent: ev];
         }
         break;
       case WA_CLICKACTIVE:  //order back the window
         {
-          // future implimentation if needed
+	  NSEvent *ev;
+      
+	  ev = [NSEvent otherEventWithType: NSAppKitDefined
+		      	          location: NSMakePoint(0, 0)
+			     modifierFlags: 0
+			         timestamp: 0
+			      windowNumber: (int)lParam
+			           context: GSCurrentContext()
+			           subtype: GSAppKitWindowLeave
+			             data1: 0
+			             data2: 0];
+      
+	  [EVENT_WINDOW(lParam) sendEvent: ev];
         }
         break;
       case WA_INACTIVE: // set currentactive and display