many things changed

include/Mw/Constants.h

@@ -99,4 +99,26 @@ enum MwMB_ICON {
  */
 #define MwMB_BUTTONYESNOCANCEL (MwMB_BUTTONYES | MwMB_BUTTONNO | MwMB_BUTTONCANCEL)
 
+/* Whether or not GetXY/SetXY works with global or local coordinates */
+enum MwCOORDINATE {
+	MwCOORDINATE_GLOBAL = 0,
+	MwCOORDINATE_LOCAL,
+};
+
+/* The clipboard type that MwGetClipboard should return */
+enum MwCLIPBOARD {
+	/* the clipboard that is present on every platform that supports it */
+	MwCLIPBOARD_MAIN = 0,
+	/* the "primary" clipboard that Wayland stores to emulate X11's behavior. */
+	MwCLIPBOARD_PRIMARY,
+};
+
+enum MwMOUSE {
+	MwMOUSE_LEFT = 1,
+	MwMOUSE_MIDDLE,
+	MwMOUSE_RIGHT,
+	MwMOUSE_WHEELUP,
+	MwMOUSE_WHEELDOWN
+};
+
 #endif

include/Mw/LowLevel.h

@@ -10,7 +10,6 @@
 #include <Mw/MachDep.h>
 
 typedef struct _MwLLHandler*	  MwLLHandler;
-typedef struct _MwLLMouse	  MwLLMouse;
 typedef struct _MwLLCommon*	  MwLLCommon;
 typedef struct _MwLLCommonColor*  MwLLCommonColor;
 typedef struct _MwLLCommonPixmap* MwLLCommonPixmap;
@@ -187,19 +186,6 @@ enum MwLLKeyEnum {
 #define MwLLControlMask MwLLKeyMask | (1 << 30)
 #define MwLLAltMask MwLLKeyMask | (1 << 29)
 
-enum MwLLMouseEnum {
-	MwLLMouseLeft = 1,
-	MwLLMouseMiddle,
-	MwLLMouseRight,
-	MwLLMouseWheelUp,
-	MwLLMouseWheelDown
-};
-
-struct _MwLLMouse {
-	MwPoint point;
-	int	button;
-};
-
 struct _MwLLHandler {
 	void (*draw)(MwLL handle, void* data);
 	void (*up)(MwLL handle, void* data);

include/Mw/StringDefs.h

@@ -60,24 +60,27 @@
 #define MwNmonospaceFont "VmonospaceFont"
 #define MwNboldMonospaceFont "VboldMonospaceFont"
 
-#define MwNactivateHandler "Cactivate"		     /* NULL/int* (MwListBox)/void* (MwTreeView) */
-#define MwNresizeHandler "Cresize"		     /* NULL */
-#define MwNtickHandler "Ctick"			     /* NULL */
-#define MwNmenuHandler "Cmenu"			     /* MwMenu */
-#define MwNmouseDownHandler "CmouseDown"	     /* MwLLMouse* */
-#define MwNmouseUpHandler "CmouseUp"		     /* same as MwNmouseDownHandler */
-#define MwNmouseMoveHandler "CmouseMove"	     /* MwPoint* */
-#define MwNchangedHandler "Cchanged"		     /* NULL/int* (MwComboBox) */
-#define MwNkeyHandler "Ckey"			     /* int* (MwLLKeyEnum or character code) */
-#define MwNkeyReleaseHandler "CkeyRelease"	     /* same as MwNkeyHandler */
-#define MwNcloseHandler "Cclose"		     /* NULL */
-#define MwNfocusInHandler "CfocusIn"		     /* NULL */
-#define MwNfocusOutHandler "CfocusOut"		     /* NULL */
-#define MwNfileChosenHandler "CfileChosen"	     /* char* */
-#define MwNdirectoryChosenHandler "CdirectoryChosen" /* char* */
-#define MwNcolorChosenHandler "CcolorChosen"	     /* MwRGB* */
-#define MwNdrawHandler "Cdraw"			     /* NULL */
-#define MwNclipboardHandler "Cclipboard"	     /* char* */
-#define MwNdarkThemeHandler "CdarkTheme"	     /* int* */
+#define MwNactivateHandler "Cactivate"		       /* NULL */
+#define MwNlistBoxActivateHandler "ClistBoxActivate"   /* int* */
+#define MwNtreeViewActivateHandler "CtreeViewActivate" /* void* */
+#define MwNresizeHandler "Cresize"		       /* NULL */
+#define MwNtickHandler "Ctick"			       /* NULL */
+#define MwNmenuHandler "Cmenu"			       /* MwMenu */
+#define MwNmouseDownHandler "CmouseDown"	       /* MwMouse* */
+#define MwNmouseUpHandler "CmouseUp"		       /* same as MwNmouseDownHandler */
+#define MwNmouseMoveHandler "CmouseMove"	       /* MwPoint* */
+#define MwNchangedHandler "Cchanged"		       /* NULL */
+#define MwNcomboBoxChangedHandler "CcomboBoxChanged"   /* int* */
+#define MwNkeyHandler "Ckey"			       /* int* (MwLLKeyEnum or character code) */
+#define MwNkeyReleaseHandler "CkeyRelease"	       /* same as MwNkeyHandler */
+#define MwNcloseHandler "Cclose"		       /* NULL */
+#define MwNfocusInHandler "CfocusIn"		       /* NULL */
+#define MwNfocusOutHandler "CfocusOut"		       /* NULL */
+#define MwNfileChosenHandler "CfileChosen"	       /* char* */
+#define MwNdirectoryChosenHandler "CdirectoryChosen"   /* char* */
+#define MwNcolorChosenHandler "CcolorChosen"	       /* MwRGB* */
+#define MwNdrawHandler "Cdraw"			       /* NULL */
+#define MwNclipboardHandler "Cclipboard"	       /* char* */
+#define MwNdarkThemeHandler "CdarkTheme"	       /* int* */
 
 #endif

include/Mw/TypeDefs.h

@@ -28,6 +28,7 @@ typedef struct _MwTreeViewEntry	      MwTreeViewEntry;
 typedef struct _MwDirectoryEntry      MwDirectoryEntry;
 typedef struct _MwListBoxPacket	      MwListBoxPacket;
 typedef struct _MwBox*		      MwBox;
+typedef struct _MwMouse		      MwMouse;
 #ifdef _MILSKO
 typedef struct _MwWidget* MwWidget;
 #else
@@ -210,6 +211,11 @@ struct _MwBox {
 	int layout;
 };
 
+struct _MwMouse {
+	MwPoint point;
+	int	button;
+};
+
 struct _MwClass {
 	MwHandlerWithStatus	   create;
 	MwHandler		   destroy;
@@ -233,18 +239,4 @@ struct _MwClass {
 	void*			   reserved4;
 };
 
-/* Whether or not GetXY/SetXY works with global or local coordinates */
-enum MwCoordinateType {
-	MwCoordinatesGlobal = 0,
-	MwCoordinatesLocal,
-};
-
-/* The clipboard type that MwGetClipboard should return */
-enum MwClipboardType {
-	/* the clipboard that is present on every platform that supports it */
-	MwClipboardMain = 0,
-	/* the "primary" clipboard that Wayland stores to emulate X11's behavior. */
-	MwClipboardPrimary,
-};
-
 #endif

include/Mw/Widget/Vulkan.h

@@ -73,45 +73,45 @@ MWDECL void MwVulkanConfigure(MwVulkanConfig* cfg);
 /*!
  * @brief Field that can be gotten from Vulkan.
  */
-typedef enum _MwVulkanField {
+enum MwVULKANFIELD {
 	/*!
 	 * @brief The address of the vulkan widget's vkGetInstanceProcAddr function (PFN_vkGetInstanceProcAddr)
 	 */
-	MwVulkanField_GetInstanceProcAddr = 0,
+	MwVULKANFIELD_GETINSTANCEPROCADDR = 0,
 	/*!
 	 * @brief The address of the vulkan widget's instance (VkInstance)
 	 */
-	MwVulkanField_Instance,
+	MwVULKANFIELD_INSTANCE,
 	/*!
 	 * @brief The address of the vulkan widget's surface (VkSurfaceKHR)
 	 */
-	MwVulkanField_Surface,
+	MwVULKANFIELD_SURFACE,
 	/*!
 	 * @brief The address of the vulkan widget's physical device (VkPhysicalDevice)
 	 */
-	MwVulkanField_PhysicalDevice,
+	MwVULKANFIELD_PHYSICALDEVICE,
 	/*!
 	 * @brief The address of the vulkan widget's logical device (VkDevice)
 	 */
-	MwVulkanField_LogicalDevice,
+	MwVULKANFIELD_LOGICALDEVICE,
 	/*!
 	 * @brief The address of the index that the vulkan widget uses for the graphics queue (uint32_t *)
 	 */
-	MwVulkanField_GraphicsQueueIndex,
+	MwVULKANFIELD_GRAPHICSQUEUEINDEX,
 	/*!
 	 * @brief The address of the index that the vulkan widget uses for the present queue (uint32_t *)
 	 */
-	MwVulkanField_PresentQueueIndex,
-	MwVulkanField_GraphicsQueue,
+	MwVULKANFIELD_PRESENTQUEUEINDEX,
+	MwVULKANFIELD_GRAPHICSQUEUE,
 	/*!
 	 * @brief The address of the vulkan widget's graphics queue (VkQueue)
 	 */
-	MwVulkanField_PresentQueue,
-} MwVulkanField;
+	MwVULKANFIELD_PRESENTQUEUE,
+};
 
 /*!
  * @brief Function for getting a field from within Vulkan.
- * @warning Consult the documentation for MwVulkanField to know what type is expected for out.
+ * @warning Consult the documentation for MwVULKANFIELD to know what type is expected for out.
  */
 MwInline void* MwVulkanGetField(MwWidget handle, int field, int* out) {
 	void* field_out;