# HG changeset patch # User Olaf Wintermann # Date 1765098147 -3600 # Node ID c98404829cd30246ba65d781dcb1c17d81197535 # Parent f55630d3006fc53329b4fdd6dc9b83da6510ec0f fix win32 build diff -r f55630d3006f -r c98404829cd3 application/main.c --- a/application/main.c Sat Dec 06 18:17:07 2025 +0100 +++ b/application/main.c Sun Dec 07 10:02:27 2025 +0100 @@ -1257,6 +1257,12 @@ int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) { //int main() { ui_init("app1", 0, NULL); + + ui_menu("File") { + ui_menuitem("Open"); + ui_menuitem("Close"); + } + ui_onstartup(application_startup, NULL); ui_main(); diff -r f55630d3006f -r c98404829cd3 client/app.res Binary file client/app.res has changed diff -r f55630d3006f -r c98404829cd3 client/main.c --- a/client/main.c Sat Dec 06 18:17:07 2025 +0100 +++ b/client/main.c Sun Dec 07 10:02:27 2025 +0100 @@ -26,6 +26,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifndef _WIN32 + #include #include #include @@ -202,3 +204,11 @@ return NULL; } + +#else + +int main(int argc, char **argv) { + return 0; +} + +#endif diff -r f55630d3006f -r c98404829cd3 client/uiclient.c --- a/client/uiclient.c Sat Dec 06 18:17:07 2025 +0100 +++ b/client/uiclient.c Sun Dec 07 10:02:27 2025 +0100 @@ -29,6 +29,8 @@ #include "uiclient.h" #include "args.h" +#include +#include #include #include "../ui/common/args.h" diff -r f55630d3006f -r c98404829cd3 client/uiclient.h --- a/client/uiclient.h Sat Dec 06 18:17:07 2025 +0100 +++ b/client/uiclient.h Sun Dec 07 10:02:27 2025 +0100 @@ -80,5 +80,6 @@ } #endif + #endif /* CLIENT_H */ diff -r f55630d3006f -r c98404829cd3 ui/common/message.c --- a/ui/common/message.c Sat Dec 06 18:17:07 2025 +0100 +++ b/ui/common/message.c Sun Dec 07 10:02:27 2025 +0100 @@ -26,6 +26,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifndef _WIN32 + #include #include #include @@ -200,3 +202,5 @@ return NULL; } + +#endif diff -r f55630d3006f -r c98404829cd3 ui/common/message.h --- a/ui/common/message.h Sat Dec 06 18:17:07 2025 +0100 +++ b/ui/common/message.h Sun Dec 07 10:02:27 2025 +0100 @@ -29,11 +29,14 @@ #ifndef UIC_MESSAGE_H #define UIC_MESSAGE_H + #include #include #include +#ifndef _WIN32 #include +#endif #ifdef __cplusplus @@ -57,11 +60,13 @@ UiMessageHandler handler; int in; int out; +#ifndef _WIN32 pthread_t in_thread; pthread_t out_thread; pthread_mutex_t queue_lock; pthread_mutex_t avlbl_lock; pthread_cond_t available; +#endif CxBuffer *outbuf; int stop; } UiSimpleMessageHandler; diff -r f55630d3006f -r c98404829cd3 ui/win32/toolkit.c --- a/ui/win32/toolkit.c Sat Dec 06 18:17:07 2025 +0100 +++ b/ui/win32/toolkit.c Sun Dec 07 10:02:27 2025 +0100 @@ -169,4 +169,8 @@ default: break;//return DefWindowProc(hwnd, uMsg, wParam, lParam); } return DefWindowProc(hwnd, uMsg, wParam, lParam);; -} \ No newline at end of file +} + +void ui_call_mainthread(ui_threadfunc tf, void* td) { + // TODO +} diff -r f55630d3006f -r c98404829cd3 ui/win32/window.c --- a/ui/win32/window.c Sat Dec 06 18:17:07 2025 +0100 +++ b/ui/win32/window.c Sun Dec 07 10:02:27 2025 +0100 @@ -107,6 +107,9 @@ return create_window(title, window_data, FALSE); } +UiObject *ui_simple_window(const char *title, void *window_data) { + return create_window(title, window_data, TRUE); +} int ui_window_widget_event(W32Widget *widget, HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { //UiWindow *window = (UiWindow*)widget;