Index: /trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/IToolTip.java
===================================================================
--- /trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/IToolTip.java	(revision 1024)
+++ /trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/IToolTip.java	(revision 1024)
@@ -0,0 +1,27 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.eventcore.guimodel;
+
+/**
+ * <p>
+ * Marker interface for GUI elements that represent a tool tip
+ * </p>
+ * 
+ * @version 1.0
+ * @author Patrick Harms
+ */
+public interface IToolTip extends IGUIElement {
+
+}
Index: unk/autoquest-plugin-mfc/data/guimappings/guimapping-MFC-dummy.txt
===================================================================
--- /trunk/autoquest-plugin-mfc/data/guimappings/guimapping-MFC-dummy.txt	(revision 1023)
+++ 	(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 1023)
+++ /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 1023)
+++ /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
Index: /trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCMenuButton.java
===================================================================
--- /trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCMenuButton.java	(revision 1024)
+++ /trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCMenuButton.java	(revision 1024)
@@ -0,0 +1,51 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.plugin.mfc.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IMenuButton;
+
+/**
+ * <p>
+ * Class that represents menu buttons in MFC GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Patrick Harms
+ */
+public class MFCMenuButton extends MFCGUIElement implements IMenuButton {
+
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new MFCMenuButton.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public MFCMenuButton(MFCGUIElementSpec specification, MFCGUIElement parent) {
+        super(specification, parent);
+    }
+
+}
Index: /trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCToolTip.java
===================================================================
--- /trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCToolTip.java	(revision 1024)
+++ /trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCToolTip.java	(revision 1024)
@@ -0,0 +1,51 @@
+//   Copyright 2012 Georg-August-Universität Göttingen, Germany
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+package de.ugoe.cs.autoquest.plugin.mfc.guimodel;
+
+import de.ugoe.cs.autoquest.eventcore.guimodel.IToolTip;
+
+/**
+ * <p>
+ * Class that represents tool tips in MFC GUIs.
+ * </p>
+ * 
+ * @version 1.0
+ * @author Patrick Harms
+ */
+public class MFCToolTip extends MFCGUIElement implements IToolTip {
+
+    /**
+     * <p>
+     * Id for object serialization.
+     * </p>
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * <p>
+     * Constructor. Creates a new MFCToolTIp.
+     * </p>
+     * 
+     * @param specification
+     *            specification of created GUI element
+     * @param parent
+     *            parent of the created GUI element; null means that the element is a top-level
+     *            window
+     */
+    public MFCToolTip(MFCGUIElementSpec specification, MFCGUIElement parent) {
+        super(specification, parent);
+    }
+
+}