kolan
/
dev
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glade_habr compilation is success

This commit is contained in:
Kolan Sh 2012-08-16 17:08:24 +04:00
parent 24f307bf05
commit 4d32dd63ae
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
c/glade_habr/Example1.cpp
View File

@ -11,9 +11,9 @@ GtkRadioButton *rbutRectangle, *rbutEllipse, *rbutTriangle;
GtkDrawingArea *drawingarea; GtkDrawingArea *drawingarea;
// описание обработчиков сигналов // описание обработчиков сигналов
extern "C" void topWindow_destroy_cb (GtkObject *object, gpointer user_data); extern "C" void topWindow_destroy_cb (GtkWidget *object, gpointer user_data);
extern "C" gboolean drawingarea_draw_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data); extern "C" gboolean drawingarea_draw_event_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data);
extern "C" void rbutton_toggled_cb (GtkObject *object); extern "C" void rbutton_toggled_cb (GtkWidget *object);
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
@ -56,7 +56,7 @@ int main( int argc, char **argv )
} }
// закрытие приложения // закрытие приложения
void topWindow_destroy_cb (GtkObject *object, gpointer user_data) void topWindow_destroy_cb (GtkWidget *object, gpointer user_data)
{ {
// завершаем главный цикл приложения // завершаем главный цикл приложения
gtk_main_quit(); gtk_main_quit();
@ -67,8 +67,7 @@ gboolean drawingarea_draw_event_cb(GtkWidget *widget, GdkEventExpose *event, gpo
{ {
cairo_t *cr; cairo_t *cr;
return TRUE; cr = gdk_cairo_create (gtk_widget_get_window (widget));
cr = gdk_cairo_create (widget->window);
cairo_set_line_width (cr, 7); cairo_set_line_width (cr, 7);
cairo_set_source_rgb (cr, 0, 0, 0); cairo_set_source_rgb (cr, 0, 0, 0);
@ -111,7 +110,7 @@ gboolean drawingarea_draw_event_cb(GtkWidget *widget, GdkEventExpose *event, gpo
return FALSE; return FALSE;
} }
void rbutton_toggled_cb (GtkObject *object) void rbutton_toggled_cb (GtkWidget *object)
{ {
// перерисовка drawingarea // перерисовка drawingarea
gtk_widget_queue_draw (GTK_WIDGET(drawingarea)); gtk_widget_queue_draw (GTK_WIDGET(drawingarea));

2
c/glade_habr/Makefile
View File

@ -1,6 +1,6 @@
CC=g++ CC=g++
LDLIBS=`pkg-config --libs gtk+-3.0 gmodule-2.0` LDLIBS=`pkg-config --libs gtk+-3.0 gmodule-2.0`
CFLAGS=-Wall -g `pkg-config --cflags gtk+-2.0 gmodule-2.0` CFLAGS=-Wall -g `pkg-config --cflags gtk+-3.0 gmodule-2.0`
Example1: Example1.o Example1: Example1.o
$(CC) $(LDLIBS) Example1.o -o Example1 $(CC) $(LDLIBS) Example1.o -o Example1