comparison: ui/gtk/container.c
ui/gtk/container.c
- branch
- newapi
- changeset 304
- d554b2a60105
- parent 303
- dc8b504604f4
- child 305
- 98470af75dcf
equal
deleted
inserted
replaced
| 303:dc8b504604f4 | 304:d554b2a60105 |
|---|---|
| 247 | 247 |
| 248 | 248 |
| 249 | 249 |
| 250 static GtkWidget* box_set_margin(GtkWidget *box, int margin) { | 250 static GtkWidget* box_set_margin(GtkWidget *box, int margin) { |
| 251 GtkWidget *ret = box; | 251 GtkWidget *ret = box; |
| 252 #ifdef UI_GTK3 | 252 #if GTK_MAJOR_VERSION >= 3 |
| 253 #if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 12 | 253 #if GTK_MAJOR_VERSION * 1000 + GTK_MINOR_VERSION >= 3012 |
| 254 gtk_widget_set_margin_start(box, margin); | 254 gtk_widget_set_margin_start(box, margin); |
| 255 gtk_widget_set_margin_end(box, margin); | 255 gtk_widget_set_margin_end(box, margin); |
| 256 #else | 256 #else |
| 257 gtk_widget_set_margin_left(box, margin); | 257 gtk_widget_set_margin_left(box, margin); |
| 258 gtk_widget_set_margin_right(box, margin); | 258 gtk_widget_set_margin_right(box, margin); |
| 301 | 301 |
| 302 #if GTK_MAJOR_VERSION >= 3 | 302 #if GTK_MAJOR_VERSION >= 3 |
| 303 GtkWidget *grid = gtk_grid_new(); | 303 GtkWidget *grid = gtk_grid_new(); |
| 304 gtk_grid_set_column_spacing(GTK_GRID(grid), args.columnspacing); | 304 gtk_grid_set_column_spacing(GTK_GRID(grid), args.columnspacing); |
| 305 gtk_grid_set_row_spacing(GTK_GRID(grid), args.rowspacing); | 305 gtk_grid_set_row_spacing(GTK_GRID(grid), args.rowspacing); |
| 306 #if GTK_MAJOR_VERSION >= 3 && GTK_MINOR_VERSION >= 12 | 306 #if GTK_MAJOR_VERSION * 1000 + GTK_MINOR_VERSION >= 3012 |
| 307 gtk_widget_set_margin_start(grid, args.margin); | 307 gtk_widget_set_margin_start(grid, args.margin); |
| 308 gtk_widget_set_margin_end(grid, args.margin); | 308 gtk_widget_set_margin_end(grid, args.margin); |
| 309 #else | 309 #else |
| 310 gtk_widget_set_margin_left(grid, args.margin); | 310 gtk_widget_set_margin_left(grid, args.margin); |
| 311 gtk_widget_set_margin_right(grid, args.margin); | 311 gtk_widget_set_margin_right(grid, args.margin); |
