luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.GTK]

Browse source 
* BUG: Patch the GtkSpinButton class so that it is drawn correctly when 
  not having a normal height.


git-svn-id: svn://localhost/gambas/trunk@6033 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2013-12-29 22:37:06 +00:00
parent 57359c4f2a
commit 1d6a0f896d
1 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gb.gtk/src/gspinbox.cpp
View file

@ -24,12 +24,39 @@
#include "widgets.h" #include "widgets.h"
#include "gspinbox.h" #include "gspinbox.h"
void spin_change(GtkSpinButton *spinbutton,gSpinBox *data) static void cb_change(GtkSpinButton *spinbutton, gSpinBox *data)
{ {
data->selectAll(); data->selectAll();
if (data->onChange) data->onChange(data); if (data->onChange) data->onChange(data);
} }
#ifndef GTK3
/*static gint my_spin_button_expose (GtkWidget *widget, GdkEventExpose *event)
{
GtkWidgetClass *klass = (GtkWidgetClass *)g_type_class_peek(GTK_TYPE_SPIN_BUTTON);
gSpinBox *control = (gSpinBox *)g_object_get_data(G_OBJECT(widget), "gambas-control");
int h, ret;
h = widget->requisition.height;
widget->requisition.height = control->height();
ret = (*(gint (*)(GtkWidget *, GdkEventExpose *))klass->_gtk_reserved5)(widget, event);
widget->requisition.height = h;
return ret;
}*/
static void my_spin_button_size_request(GtkWidget *widget, GtkRequisition *requisition)
{
GtkWidgetClass *klass = (GtkWidgetClass *)g_type_class_peek(GTK_TYPE_SPIN_BUTTON);
gSpinBox *control = (gSpinBox *)g_object_get_data(G_OBJECT(widget), "gambas-control");
(*(void (*)(GtkWidget *, GtkRequisition *))klass->_gtk_reserved5)(widget, requisition);
requisition->height = control->height();
}
#endif
gSpinBox::gSpinBox(gContainer *parent) : gControl(parent) gSpinBox::gSpinBox(gContainer *parent) : gControl(parent)
{ {
g_typ=Type_gSpinBox; g_typ=Type_gSpinBox;
@ -41,12 +68,22 @@ gSpinBox::gSpinBox(gContainer *parent) : gControl(parent)
border = gtk_spin_button_new_with_range(_min, _max, 1); border = gtk_spin_button_new_with_range(_min, _max, 1);
widget = border; widget = border;
#ifndef GTK3
// Patch the class so that the spin button arrows are drawn correctly
GtkWidgetClass *klass = (GtkWidgetClass *)GTK_WIDGET_GET_CLASS(border);
if (klass->size_request != my_spin_button_size_request)
{
klass->_gtk_reserved5 = (void (*)())klass->size_request;
klass->size_request = my_spin_button_size_request;
}
#endif
realize(); realize();
onChange = NULL; onChange = NULL;
g_signal_connect(G_OBJECT(widget),"value-changed",G_CALLBACK(spin_change),(gpointer)this); g_signal_connect(G_OBJECT(widget), "value-changed", G_CALLBACK(cb_change), (gpointer)this);
} }
/* /*
@ -160,4 +197,3 @@ void gSpinBox::setBorder(bool vl)
{ {
gtk_entry_set_has_frame(GTK_ENTRY(widget), vl); gtk_entry_set_has_frame(GTK_ENTRY(widget), vl);
} }