Mercurial > dwindows
comparison gtk/dw.c @ 67:ab9b0fa6c66e
Focus fixes and removal of several hack in the OS/2 code base.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Tue, 22 Jan 2002 10:55:20 +0000 |
parents | 664a274a46a6 |
children | 9510897c0b03 |
comparison
equal
deleted
inserted
replaced
66:664a274a46a6 | 67:ab9b0fa6c66e |
---|---|
483 SignalHandler *work = (SignalHandler *)data; | 483 SignalHandler *work = (SignalHandler *)data; |
484 | 484 |
485 if(slider && work) | 485 if(slider && work) |
486 { | 486 { |
487 int (*valuechangedfunc)(HWND, int, void *) = work->func; | 487 int (*valuechangedfunc)(HWND, int, void *) = work->func; |
488 int max = _round_value(adjustment->upper) - 1; | 488 int max = _round_value(adjustment->upper); |
489 int val = _round_value(adjustment->value); | 489 int val = _round_value(adjustment->value); |
490 static int lastval = -1; | 490 static int lastval = -1; |
491 static GtkWidget *lastwidget = 0; | 491 static GtkWidget *lastwidget = 0; |
492 | 492 |
493 if(lastval != val || lastwidget != slider) | 493 if(lastval != val || lastwidget != slider) |
494 { | 494 { |
495 if(GTK_IS_VSCALE(slider)) | 495 if(GTK_IS_VSCALE(slider)) |
496 valuechangedfunc(work->window, max - val, work->data); | 496 valuechangedfunc(work->window, (max - val) - 1, work->data); |
497 else | 497 else |
498 valuechangedfunc(work->window, val, work->data); | 498 valuechangedfunc(work->window, val - 1, work->data); |
499 } | 499 } |
500 } | 500 } |
501 } | 501 } |
502 | 502 |
503 gint _default_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) | 503 gint _default_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data) |
2092 GtkWidget *tmp; | 2092 GtkWidget *tmp; |
2093 GtkAdjustment *adjustment; | 2093 GtkAdjustment *adjustment; |
2094 int _locked_by_me = FALSE; | 2094 int _locked_by_me = FALSE; |
2095 | 2095 |
2096 DW_MUTEX_LOCK; | 2096 DW_MUTEX_LOCK; |
2097 adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, (gfloat)(increments + 1), 1, 1, 1); | 2097 adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, (gfloat)increments, 1, 1, 1); |
2098 if(vertical) | 2098 if(vertical) |
2099 tmp = gtk_vscale_new(adjustment); | 2099 tmp = gtk_vscale_new(adjustment); |
2100 else | 2100 else |
2101 tmp = gtk_hscale_new(adjustment); | 2101 tmp = gtk_hscale_new(adjustment); |
2102 gtk_widget_show(tmp); | 2102 gtk_widget_show(tmp); |