[Vice-emu-commit] SF.net SVN: vice-emu: [18755] trunk/vice/src

Revision: 18755
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18755&view=rev
Author:   strik
Date:     2008-04-29 11:55:16 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
2008-04-28  Andreas Matthies  <and...@gm...>

	* arch/win32/ui.c (ui_shutdown): Call uikeyboard_shutdown.

	* arch/win32/uikeyboard.c,arch/win32/uikeyboard.h: New function
	uikeyboard_shutdown. Moved cleanup of menuitemmodifier to this
	function.

Modified Paths:
--------------
    trunk/vice/src/ChangeLog
    trunk/vice/src/arch/win32/ui.c
    trunk/vice/src/arch/win32/uikeyboard.c
    trunk/vice/src/arch/win32/uikeyboard.h

Modified: trunk/vice/src/ChangeLog
===================================================================
--- trunk/vice/src/ChangeLog	2008-04-29 01:45:21 UTC (rev 18754)
+++ trunk/vice/src/ChangeLog	2008-04-29 18:55:16 UTC (rev 18755)
@@ -1,3 +1,11 @@
+2008-04-28  Andreas Matthies  <and...@gm...>
+
+	* arch/win32/ui.c (ui_shutdown): Call uikeyboard_shutdown.
+
+	* arch/win32/uikeyboard.c,arch/win32/uikeyboard.h: New function
+	uikeyboard_shutdown. Moved cleanup of menuitemmodifier to this
+	function.
+
 2008-04-27  Spiro Trikaliotis  <spi...@gm...>
 
 	* Version 1.22.13.

Modified: trunk/vice/src/arch/win32/ui.c
===================================================================
--- trunk/vice/src/arch/win32/ui.c	2008-04-29 01:45:21 UTC (rev 18754)
+++ trunk/vice/src/arch/win32/ui.c	2008-04-29 18:55:16 UTC (rev 18755)
@@ -315,6 +315,7 @@
 void ui_shutdown(void)
 {
    statusbar_delete_brushes();
+   uikeyboard_shutdown();
 }
 
 /* Initialize the UI after setting all the resource values.  */

Modified: trunk/vice/src/arch/win32/uikeyboard.c
===================================================================
--- trunk/vice/src/arch/win32/uikeyboard.c	2008-04-29 01:45:21 UTC (rev 18754)
+++ trunk/vice/src/arch/win32/uikeyboard.c	2008-04-29 18:55:16 UTC (rev 18755)
@@ -360,7 +360,12 @@
             }
         }
     }
+}
 
+void uikeyboard_shutdown(void)
+{
+    int i;
+
     for (i = 0; i < menuitemmodifier_len; i++)
         lib_free(menuitemmodifier[i]);
     lib_free(menuitemmodifier);

Modified: trunk/vice/src/arch/win32/uikeyboard.h
===================================================================
--- trunk/vice/src/arch/win32/uikeyboard.h	2008-04-29 01:45:21 UTC (rev 18754)
+++ trunk/vice/src/arch/win32/uikeyboard.h	2008-04-29 18:55:16 UTC (rev 18755)
@@ -49,6 +49,7 @@
 
 extern HACCEL uikeyboard_create_accelerator_table(void);
 extern void uikeyboard_menu_shortcuts(HMENU menu);
+extern void uikeyboard_shutdown(void);
 
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.