remove enum forward declarations

7 days ago

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Wed, 26 Mar 2025 20:27:20 +0100 (7 days ago)
changeset 515
9e18cb8c4412
parent 514
f1662be4eab6
child 516
4b31c74666d7

remove enum forward declarations

ui/common/context.h file | annotate | diff | comparison | revisions
ui/ui/toolkit.h file | annotate | diff | comparison | revisions
--- a/ui/common/context.h	Wed Mar 26 20:23:07 2025 +0100
+++ b/ui/common/context.h	Wed Mar 26 20:27:20 2025 +0100
@@ -45,9 +45,7 @@
 typedef struct UiListVar     UiListVar;
 typedef struct UiGroupWidget UiGroupWidget;
 
-typedef enum UiVarType UiVarType;
-
-enum UiVarType {
+typedef enum UiVarType {
     UI_VAR_SPECIAL = 0,
     UI_VAR_INTEGER,
     UI_VAR_DOUBLE,
@@ -56,7 +54,7 @@
     UI_VAR_LIST,
     UI_VAR_RANGE,
     UI_VAR_GENERIC
-};
+} UiVarType;
 
 struct UiContext {
     UiContext     *parent;
--- a/ui/ui/toolkit.h	Wed Mar 26 20:23:07 2025 +0100
+++ b/ui/ui/toolkit.h	Wed Mar 26 20:27:20 2025 +0100
@@ -206,16 +206,29 @@
 
 typedef struct UiTabbedPane UiTabbedPane;
 
-typedef enum UiTri UiTri;
-typedef enum UiLabelType UiLabelType;
+typedef enum UiTri {
+    UI_DEFAULT = 0,
+    UI_ON,
+    UI_OFF
+} UiTri;
 
-typedef enum UiDnDAction UiDnDAction;
 
 enum UiMouseEventType { UI_PRESS = 0, UI_PRESS2 };
 
-enum UiLabelType { UI_LABEL_DEFAULT, UI_LABEL_TEXT, UI_LABEL_ICON, UI_LABEL_TEXT_ICON };
+typedef enum UiLabelType {
+    UI_LABEL_DEFAULT,
+    UI_LABEL_TEXT,
+    UI_LABEL_ICON,
+    UI_LABEL_TEXT_ICON
+} UiLabelType;
 
-enum UiDnDAction { UI_DND_ACTION_NONE, UI_DND_ACTION_COPY, UI_DND_ACTION_MOVE, UI_DND_ACTION_LINK, UI_DND_ACTION_CUSTOM };
+typedef enum UiDnDAction {
+    UI_DND_ACTION_NONE,
+    UI_DND_ACTION_COPY,
+    UI_DND_ACTION_MOVE,
+    UI_DND_ACTION_LINK,
+    UI_DND_ACTION_CUSTOM
+} UiDndAction;
   
 typedef void(*ui_callback)(UiEvent*, void*); /* event, user data */
 
@@ -441,12 +454,6 @@
     UiObserver *observers;
 };
 
-enum UiTri {
-    UI_DEFAULT = 0,
-    UI_ON,
-    UI_OFF
-};
-
 struct UiFileList {
     char **files;
     size_t nfiles;

mercurial