solve merge conflict

2025-12-05 23:05:10 -07:00 · 2025-12-05 23:05:10 -07:00 · 3f6a77f890
commit 3f6a77f890
parent 6b21ac7be9 cc05431879
171 changed files with 730 additions and 926 deletions
--- a/include/Mw/Abstract/Directory.h
+++ b/include/Mw/Abstract/Directory.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Abstract/Directory.h
 * @brief Directory functions
--- a/include/Mw/Abstract/Dynamic.h
+++ b/include/Mw/Abstract/Dynamic.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Abstract/Dynamic.h
 * @brief Dynamic library
--- a/include/Mw/Abstract/Time.h
+++ b/include/Mw/Abstract/Time.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Abstract/Time.h
 * @brief Time
--- a/include/Mw/BaseTypes.h
+++ b/include/Mw/BaseTypes.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/BaseTypes.h
 * @brief Base type definitions
--- a/include/Mw/Constants.h
+++ b/include/Mw/Constants.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Constants.h
 * @brief Constants
--- a/include/Mw/Core.h
+++ b/include/Mw/Core.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Core.h
 * @brief Core
--- a/include/Mw/Default.h
+++ b/include/Mw/Default.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Default.h
 * @brief Default properties
--- a/include/Mw/Dialog/ColorPicker.h
+++ b/include/Mw/Dialog/ColorPicker.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Dialog/ColorPicker.h
 * @brief Color picker
--- a/include/Mw/Dialog/DirectoryChooser.h
+++ b/include/Mw/Dialog/DirectoryChooser.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Dialog/DirectoryChooser.h
 * @brief Directory chooser
--- a/include/Mw/Dialog/FileChooser.h
+++ b/include/Mw/Dialog/FileChooser.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Dialog/FileChooser.h
 * @brief File chooser
--- a/include/Mw/Dialog/MessageBox.h
+++ b/include/Mw/Dialog/MessageBox.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Dialog/MessageBox.h
 * @brief Message box
--- a/include/Mw/Draw.h
+++ b/include/Mw/Draw.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Draw.h
 * @brief Common drawing API
--- a/include/Mw/Error.h
+++ b/include/Mw/Error.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Error.h
 * @brief Error codes
--- a/include/Mw/Font.h
+++ b/include/Mw/Font.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Font.h
 * @brief Font
--- a/include/Mw/LowLevel.h
+++ b/include/Mw/LowLevel.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/LowLevel.h
 * @brief Low-level drawing API
--- a/include/Mw/LowLevel/GDI.h
+++ b/include/Mw/LowLevel/GDI.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/LowLevel/GDI.h
 * @brief GDI Backend
--- a/include/Mw/LowLevel/X11.h
+++ b/include/Mw/LowLevel/X11.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/LowLevel/X11.h
 * @brief X11 Backend
@ -34,6 +33,7 @@ struct _MwLLX11 {
 	XIC	 xic;

 	int top;
+	int toplevel;
 	int grabbed;
 	int force_render;

--- a/include/Mw/MachDep.h
+++ b/include/Mw/MachDep.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/MachDep.h
 * @brief Machine dependent headers and macros
--- a/include/Mw/Milsko.h
+++ b/include/Mw/Milsko.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Milsko.h
 * @brief Includes all headers
--- a/include/Mw/Resource/Cursor.h
+++ b/include/Mw/Resource/Cursor.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Resource/Cursor.h
 * @brief Cursor externs
--- a/include/Mw/Resource/Font.h
+++ b/include/Mw/Resource/Font.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Resource/Font.h
 * @brief Default font resources
--- a/include/Mw/Resource/Icon.h
+++ b/include/Mw/Resource/Icon.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Resource/Icon.h
 * @brief Icon
--- a/include/Mw/String.h
+++ b/include/Mw/String.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/String.h
 * @brief String utilities
--- a/include/Mw/StringDefs.h
+++ b/include/Mw/StringDefs.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/StringDefs.h
 * @brief String definitions for property
--- a/include/Mw/TypeDefs.h
+++ b/include/Mw/TypeDefs.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/TypeDefs.h
 * @brief Type definitions
--- a/include/Mw/Unicode.h
+++ b/include/Mw/Unicode.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Unicode.h
 * @brief Handles UTF8 stuff
--- a/include/Mw/Version.h
+++ b/include/Mw/Version.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Version.h
 * @brief Version informations
--- a/include/Mw/Widget/Button.h
+++ b/include/Mw/Widget/Button.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/Button.h
 * @brief Button widget
--- a/include/Mw/Widget/CheckBox.h
+++ b/include/Mw/Widget/CheckBox.h
@ -1,4 +1,3 @@
-/* $Id: CheckBox.h 206 2025-10-07 15:10:46Z nishi $ */
 /*!
 * @file Mw/Widget/CheckBox.h
 * @brief CheckBox widget
--- a/include/Mw/Widget/ComboBox.h
+++ b/include/Mw/Widget/ComboBox.h
@ -1,4 +1,3 @@
-/* $Id: ComboBox.h 206 2025-10-07 15:10:46Z nishi $ */
 /*!
 * @file Mw/Widget/ComboBox.h
 * @brief ComboBox widget
--- a/include/Mw/Widget/Entry.h
+++ b/include/Mw/Widget/Entry.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/Entry.h
 * @brief Entry widget
--- a/include/Mw/Widget/Frame.h
+++ b/include/Mw/Widget/Frame.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/Frame.h
 * @brief Frame widget
--- a/include/Mw/Widget/Image.h
+++ b/include/Mw/Widget/Image.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/Image.h
 * @brief Image widget
--- a/include/Mw/Widget/Label.h
+++ b/include/Mw/Widget/Label.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/Label.h
 * @brief Label widget
--- a/include/Mw/Widget/ListBox.h
+++ b/include/Mw/Widget/ListBox.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/ListBox.h
 * @brief ListBox widget
--- a/include/Mw/Widget/Menu.h
+++ b/include/Mw/Widget/Menu.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/Menu.h
 * @brief Menu widget
--- a/include/Mw/Widget/NumberEntry.h
+++ b/include/Mw/Widget/NumberEntry.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/NumberEntry.h
 * @brief NumberEntry widget
--- a/include/Mw/Widget/OpenGL.h
+++ b/include/Mw/Widget/OpenGL.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/OpenGL.h
 * @brief OpenGL widget
--- a/include/Mw/Widget/ProgressBar.h
+++ b/include/Mw/Widget/ProgressBar.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/ProgressBar.h
 * @brief ProgressBar widget
--- a/include/Mw/Widget/RadioBox.h
+++ b/include/Mw/Widget/RadioBox.h
@ -1,4 +1,3 @@
-/* $Id: RadioBox.h 206 2025-10-07 15:10:46Z nishi $ */
 /*!
 * @file Mw/Widget/RadioBox.h
 * @brief RadioBox widget
--- a/include/Mw/Widget/ScrollBar.h
+++ b/include/Mw/Widget/ScrollBar.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/ScrollBar.h
 * @brief ScrollBar widget
--- a/include/Mw/Widget/Separator.h
+++ b/include/Mw/Widget/Separator.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/Separator.h
 * @brief Separator widget
--- a/include/Mw/Widget/SubMenu.h
+++ b/include/Mw/Widget/SubMenu.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/SubMenu.h
 * @brief SubMenu widget
--- a/include/Mw/Widget/TreeView.h
+++ b/include/Mw/Widget/TreeView.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/TreeView.h
 * @brief TreeView widget
--- a/include/Mw/Widget/Viewport.h
+++ b/include/Mw/Widget/Viewport.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/Viewport.h
 * @brief Viewport widget
--- a/include/Mw/Widget/Vulkan.h
+++ b/include/Mw/Widget/Vulkan.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/Vulkan.h
 * @brief Vulkan widget
--- a/include/Mw/Widget/Window.h
+++ b/include/Mw/Widget/Window.h
@ -1,4 +1,3 @@
-/* $Id$ */
 /*!
 * @file Mw/Widget/Window.h
 * @brief Window widget