# HG changeset patch # User Olaf Wintermann # Date 1779632787 -7200 # Node ID 5e60c784ad5b42cbe2573727db10227f69a9c0a2 # Parent 999911de398b0a2c273a1540669c7a481ca84350 allow usage of toolkit.h without defining a specific UI toolkit diff -r 999911de398b -r 5e60c784ad5b ui/ui/toolkit.h --- a/ui/ui/toolkit.h Sun May 24 14:12:39 2026 +0200 +++ b/ui/ui/toolkit.h Sun May 24 16:26:27 2026 +0200 @@ -47,6 +47,7 @@ #include #define UIWIDGET GtkWidget* +#define UIWINDOW void* #if UI_GTK2 || UI_GTK3 #define UIMENU GtkMenu* @@ -83,6 +84,7 @@ #include #define UIWIDGET Widget +#define UIWINDOW void* #define UIMENU Widget @@ -154,6 +156,13 @@ #define UIWINDOW UiWidget* #define UIMENU void* +#else + +#define UI_GENERIC +#define UIWIDGET void* +#define UIWINDOW void* +#define UIMENU void* + #endif #ifndef TRUE @@ -270,12 +279,10 @@ */ UIWIDGET widget; -#if defined(UI_COCOA) || defined(UI_WINUI) /* * native window object */ UIWINDOW wobj; -#endif /* * user window data @@ -289,7 +296,6 @@ /* * container list - * TODO: remove old UiContainer and rename UiContainerX to UiContainer */ UiContainer *container_begin; UiContainer *container_end;