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

[GB.GTK]

Browse source 
* BUG: Should compile again with older version of librsvg.


git-svn-id: svn://localhost/gambas/trunk@5473 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2012-12-29 13:22:30 +00:00
parent d8d9e98961
commit 3206720671
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gb.gtk/src/csvgimage.h
View file

@ -29,6 +29,11 @@
#include <cairo.h>
#include <librsvg/rsvg.h>
#if LIBRSVG_CHECK_VERSION(2,36,0)
#else
#include <librsvg/rsvg-cairo.h>
#endif
typedef
struct
{

12
gb.gtk/src/gslider.cpp
View file

@ -27,7 +27,7 @@
#include "gscrollbar.h"
#include "gslider.h"
void slider_Change(GtkRange *range,gSlider *data)
static void cb_change(GtkRange *range,gSlider *data)
{
data->_value = gtk_range_get_value(GTK_RANGE(data->widget));
if (data->onChange) data->onChange(data);
@ -72,7 +72,7 @@ gSlider::gSlider(gContainer *par, bool scrollbar) : gControl(par)
_max = 100;
_tracking = true;
border = gtk_alignment_new(0,0,1,1);
border = gtk_alignment_new(0, 0, 1, 1);
if (scrollbar)
return;
@ -86,7 +86,7 @@ gSlider::gSlider(gContainer *par, bool scrollbar) : gControl(par)
onChange = NULL;
g_signal_connect(G_OBJECT(widget),"value-changed",G_CALLBACK(slider_Change),(gpointer)this);
g_signal_connect(G_OBJECT(widget), "value-changed", G_CALLBACK(cb_change), (gpointer)this);
//g_signal_connect_after(G_OBJECT(border),"expose-event",G_CALLBACK(slider_Expose),(gpointer)this);
}
@ -100,7 +100,7 @@ gScrollBar::gScrollBar(gContainer *par) : gSlider(par, true)
onChange = NULL;
gtk_range_set_update_policy(GTK_RANGE(widget),GTK_UPDATE_CONTINUOUS);
g_signal_connect(G_OBJECT(widget),"value-changed",G_CALLBACK(slider_Change),(gpointer)this);
g_signal_connect(G_OBJECT(widget), "value-changed", G_CALLBACK(cb_change), (gpointer)this);
}
bool gSlider::mark()
@ -246,7 +246,7 @@ void gSlider::orientation(int w,int h)
gtk_scale_set_draw_value(GTK_SCALE(widget), false);
gtk_widget_show(widget);
widgetSignals();
g_signal_connect(G_OBJECT(widget),"value-changed",G_CALLBACK(slider_Change),(gpointer)this);
g_signal_connect(G_OBJECT(widget), "value-changed", G_CALLBACK(cb_change), (gpointer)this);
g_object_unref(adj);
@ -284,7 +284,7 @@ void gScrollBar::resize(int w, int h)
gtk_container_add(GTK_CONTAINER(border), widget);
gtk_widget_show(widget);
widgetSignals();
g_signal_connect(G_OBJECT(widget),"value-changed",G_CALLBACK(slider_Change),(gpointer)this);
g_signal_connect(G_OBJECT(widget), "value-changed", G_CALLBACK(cb_change), (gpointer)this);
g_object_unref(adj);