Mercurial > hg > idav / file diff

--- a/ui/gtk/image.h	Sun Oct 06 18:43:06 2024 +0200
+++ b/ui/gtk/image.h	Sun Oct 20 21:24:13 2024 +0200
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2017 Olaf Wintermann. All rights reserved.
+ * Copyright 2024 Olaf Wintermann. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -27,41 +27,23 @@
  */
 
 #ifndef IMAGE_H
-#define	IMAGE_H
+#define IMAGE_H
 
 #include "../ui/image.h"
+#include "toolkit.h"
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-#if GTK_MAJOR_VERSION >= 3 && GTK_MINOR_VERSION >= 10
-#define UI_SUPPORTS_SCALE
-#endif
 
-    
-struct UiIcon {
-#if GTK_MAJOR_VERSION >= 4
-    GtkIconPaintable *info;
-#else
-    GtkIconInfo *info;
-#endif
-    GdkPixbuf *pixbuf;
-};
+void* ui_imageviewer_get(UiGeneric *g);
+const char* ui_imageviewer_get_type(UiGeneric *g);
+int ui_imageviewer_set(UiGeneric *g, void *value, const char *type);
 
-struct UiImage {
-    GdkPixbuf *pixbuf;
-};
-
-void ui_image_init(void);
-
-GdkPixbuf* ui_get_image(const char *name);
-
-GdkPixbuf* ui_icon_pixbuf(UiIcon *icon);
-
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif
 
-#endif	/* IMAGE_H */
+#endif /* IMAGE_H */