Index: trunk/autoquest-plugin-mfc/data/guimappings/guimapping-MFC-dummy.txt
===================================================================
--- trunk/autoquest-plugin-mfc/data/guimappings/guimapping-MFC-dummy.txt	(revision 1006)
+++ 	(revision )
@@ -1,16 +1,0 @@
-OleMainThreadWndClass = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-IME = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-OleDdeWndClass = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-AfxControlBar90u = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-CicMarshalWndClass = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-MSCTFIME\ UI = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-tooltips_class32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-\#32768 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-SysShadow = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-msctls_updown32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-SysHeader32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-ReBarWindow32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-MarWinProbeBmpWnd = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
-
-
-
Index: trunk/autoquest-plugin-mfc/data/guimappings/guimapping-MFC.txt
===================================================================
--- trunk/autoquest-plugin-mfc/data/guimappings/guimapping-MFC.txt	(revision 1006)
+++ trunk/autoquest-plugin-mfc/data/guimappings/guimapping-MFC.txt	(revision 1024)
@@ -1,4 +1,11 @@
 Afx\: = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
 AfxFrameOrView90u = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
+AfxControlBar90u = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCPanel
+CicMarshalWndClass = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
+IME = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
+MSCTFIME\ UI = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
+OleDdeWndClass = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
+OleMainThreadWndClass = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
+SysShadow = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow
 
 MDIClient = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCPanel
@@ -10,12 +17,18 @@
 ListBox = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCListBox
 
+ComboBoxEx32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCComboBox
+ReBarWindow32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCToolBar
+SysAnimate32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCCanvas
+SysHeader32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCPanel
+SysListView32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCListBox
 SysTabControl32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCTabbedPane
-SysListView32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCListBox
-ComboBoxEx32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCComboBox
 ToolbarWindow32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCToolBar
-SysAnimate32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCCanvas
 
+\#32768 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCMenuButton
 \#32770 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCDialog
 
 msctls_statusbar32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCPanel
 msctls_trackbar32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCTrackBar
+msctls_updown32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCTrackBar
+
+tooltips_class32 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCToolTip
Index: trunk/autoquest-plugin-mfc/data/guimappings/guimapping-testcases.txt
===================================================================
--- trunk/autoquest-plugin-mfc/data/guimappings/guimapping-testcases.txt	(revision 1006)
+++ trunk/autoquest-plugin-mfc/data/guimappings/guimapping-testcases.txt	(revision 1024)
@@ -1,1 +1,2 @@
 ATL\:0048A4D0 = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCDialog
+MarWinProbeBmpWnd = de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindow