comparison: ui/gtk/display.c
ui/gtk/display.c
- branch
- newapi
- changeset 298
- c5e207d01ff2
- parent 272
- 1a30bf64cb22
equal
deleted
inserted
replaced
| 297:a73c60adf188 | 298:c5e207d01ff2 |
|---|---|
| 34 #include "../common/context.h" | 34 #include "../common/context.h" |
| 35 #include "../common/object.h" | 35 #include "../common/object.h" |
| 36 #include "../ui/display.h" | 36 #include "../ui/display.h" |
| 37 | 37 |
| 38 static void set_alignment(GtkWidget *widget, float xalign, float yalign) { | 38 static void set_alignment(GtkWidget *widget, float xalign, float yalign) { |
| 39 #if GTK_MAJOR_VERSION >= 3 && GTK_MINOR_VERSION >= 16 | 39 #if GTK_MAJOR_VERSION >= 4 || (GTK_MAJOR_VERSION >= 3 && GTK_MINOR_VERSION >= 16) |
| 40 gtk_label_set_xalign(GTK_LABEL(widget), xalign); | 40 gtk_label_set_xalign(GTK_LABEL(widget), xalign); |
| 41 gtk_label_set_yalign(GTK_LABEL(widget), yalign); | 41 gtk_label_set_yalign(GTK_LABEL(widget), yalign); |
| 42 #else | 42 #else |
| 43 gtk_misc_set_alignment(GTK_MISC(widget), xalign, yalign); | 43 gtk_misc_set_alignment(GTK_MISC(widget), xalign, yalign); |
| 44 #endif | 44 #endif |
| 104 | 104 |
| 105 return widget; | 105 return widget; |
| 106 } | 106 } |
| 107 | 107 |
| 108 UIWIDGET ui_separator_deprecated(UiObject *obj) { | 108 UIWIDGET ui_separator_deprecated(UiObject *obj) { |
| 109 #if UI_GTK3 | 109 #if GTK_MAJOR_VERSION >= 3 |
| 110 GtkWidget *widget = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); | 110 GtkWidget *widget = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); |
| 111 #else | 111 #else |
| 112 GtkWidget *widget = gtk_hseparator_new(); | 112 GtkWidget *widget = gtk_hseparator_new(); |
| 113 #endif | 113 #endif |
| 114 UiContainer *ct = uic_get_current_container(obj); | 114 UiContainer *ct = uic_get_current_container(obj); |
