|
From: | Jeremiah Benham |
Subject: | Re: [Denemo-devel] gtk-3 branch |
Date: | Tue, 29 Nov 2011 08:43:25 -0600 |
User-agent: | Mozilla/5.0 (X11; Linux i686; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 |
On 11/28/2011 12:37 PM, Richard Shann wrote:
When its #if 1, I get these errors now:I have checked in a further version to get the screenshot code for gtk3 into better shape, but it may not be practicable to get this actually working until I have a gtk3 system to work with. I am, on the other hand, quite happy to continue with this "remote development" for now :)screenshot.c: In function ‘empty_rectangle’:...screenshot.c:296:46: error: ‘select_area_filter_data’ has no member named ‘cr’ It does indeed compile screenshot.c with #if 0 also. There are several places that compilation stopped. These were where we had these: scorearea_expose_event(NULL, NULL);These should be draw_score(NULL) now - the name is not very good, better make the globally visible function be called update_drawing_cache(void) or some such. I am checking this change into master. If you put these in the gtk3 branch then all should be well.In my local git I changed them to this: +#if GTK_MAJOR_VERSION==3 + scorearea_draw_event(NULL, NULL); +#else scorearea_expose_event(NULL, NULL); +#endifI have changed the naming of the callback function to be the same for both gtk3 and 2, this avoids having to put more conditionals in (at file.c the callback function is named to turn off drawing during file load), so now both gtk3 and 2 use scorearea_draw_event() as the name of the callback function, but it has different parameters in the two cases. These changes are in master now. If you merge them to gtk3 and all is well then I think the next step should be to work towards making the code in master and gtk3 the same by defining functions to do those things which gtk2 does not support (as you did with the get_widget_width/height). Each time you create such a thing you can common-up master and gtk3 branches and check all is well in both. (So, the first case would be get_widget_width() which is currently only in gtk3 but should work fine on master if you merge it in.)
Does this apply to all code incased in GTK_CHECK_VERSION or GTK_MAJOR_VERSION, or does this apply to commonly recurring gtk functions like gtk_adjustment() (or whatever it is called).
Jeremiah
RichardThis does not seem correct now because if I enter a few notes denemo crashes. JeremiahRichardscreenshot.Tpo -c -o screenshot.o screenshot.c screenshot.c: In function ‘screenshot_select_area_async’: screenshot.c:166:3: error: ‘select_area_key_press’ undeclared (first use in this function) screenshot.c:166:3: note: each undeclared identifier is reported only once for each function it appears in screenshot.c:167:3: error: ‘select_area_button_press’ undeclared (first use in this function) screenshot.c:168:3: error: ‘select_area_motion_notify’ undeclared (first use in this function) screenshot.c: In function ‘select_area_motion_action’: screenshot.c:260:20: error: ‘window’ undeclared (first use in this function) screenshot.c:326:12: error: invalid type argument of ‘->’ (have ‘GdkRectangle’) screenshot.c:326:23: error: ‘event’ undeclared (first use in this function) screenshot.c:327:12: error: invalid type argument of ‘->’ (have ‘GdkRectangle’) screenshot.c:329:12: error: invalid type argument of ‘->’ (have ‘GdkRectangle’) screenshot.c:330:12: error: invalid type argument of ‘->’ (have ‘GdkRectangle’) screenshot.c:332:55: error: invalid type argument of ‘->’ (have ‘GdkRectangle’) screenshot.c:332:69: error: invalid type argument of ‘->’ (have ‘GdkRectangle’) screenshot.c:333:34: error: invalid type argument of ‘->’ (have ‘GdkRectangle’) screenshot.c:333:52: error: invalid type argument of ‘->’ (have ‘GdkRectangle’) screenshot.c: In function ‘select_area_button_press’: screenshot.c:344:27: error: ‘xevent’ undeclared (first use in this function) screenshot.c:350:41: error: ‘select_area_filter_data’ has no member named ‘root’ screenshot.c:350:53: error: ‘select_area_filter_data’ has no member named ‘cr’ screenshot.c: In function ‘select_area_motion_notify’: screenshot.c:372:46: error: ‘select_area_filter_data’ has no member named ‘cr’ screenshot.c:372:36: warning: passing argument 1 of ‘select_area_motion_action’ from incompatible pointer type [enabled by default] screenshot.c:252:1: note: expected ‘union GdkEvent *’ but argument is of type ‘struct GdkEventMotion *’ JeremiahOn Sun, 2011-11-27 at 10:57 -0600, Jeremiah Benham wrote:On 11/27/2011 04:34 AM, Richard Shann wrote:Sorry - I had forgotten to put in a stub for the call to get a screenshot in the case where you have #if 0, I have done this now so it should compile and link against gtk3. I have put in fixes for the errors you list below, in gtk3 branch so if you turn on the screenshot code with #if 1 it *may* compile with gtk3, not likely to execute correctly though...It still does not compile. Here are the errors: screenshot.c: In function ‘screenshot_select_area_async’: screenshot.c:157:7: error: ‘select_area_filter_data’ has no member named ‘aborted’ screenshot.c:158:7: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:163:3: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:163:3: error: ‘select_area_key_press’ undeclared (first use in this function) screenshot.c:163:3: note: each undeclared identifier is reported only once for each function it appears in screenshot.c:164:3: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:164:3: error: ‘select_area_button_press’ undeclared (first use in this function) screenshot.c:165:3: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:165:3: error: ‘select_area_motion_notify’ undeclared (first use in this function) screenshot.c:172:62: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:185:63: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:202:27: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:208:26: error: ‘select_area_filter_data’ has no member named ‘aborted’ screenshot.c: At top level: screenshot.c:252:42: error: conflicting types for ‘unused’ screenshot.c:249:38: note: previous definition of ‘unused’ was here screenshot.c: In function ‘select_area_motion_action’: screenshot.c:255:20: error: ‘window’ undeclared (first use in this function) screenshot.c:255:50: error: request for member ‘x’ in something not a structure or union screenshot.c:255:63: error: request for member ‘y’ in something not a structure or union screenshot.c:256:52: error: request for member ‘width’ in something not a structure or union screenshot.c:256:69: error: request for member ‘height’ in something not a structure or union screenshot.c:264:20: error: request for member ‘width’ in something not a structure or union screenshot.c:264:43: error: request for member ‘height’ in something not a structure or union screenshot.c:269:22: error: request for member ‘width’ in something not a structure or union screenshot.c:269:39: error: request for member ‘height’ in something not a structure or union screenshot.c:288:50: error: request for member ‘x’ in something not a structure or union screenshot.c:288:63: error: request for member ‘y’ in something not a structure or union screenshot.c:289:52: error: request for member ‘width’ in something not a structure or union screenshot.c:289:69: error: request for member ‘height’ in something not a structure or union screenshot.c:297:20: error: request for member ‘width’ in something not a structure or union screenshot.c:297:43: error: request for member ‘height’ in something not a structure or union screenshot.c:302:22: error: request for member ‘width’ in something not a structure or union screenshot.c:302:39: error: request for member ‘height’ in something not a structure or union screenshot.c:321:23: error: ‘event’ undeclared (first use in this function) screenshot.c: In function ‘select_area_button_press’: screenshot.c:339:27: error: ‘xevent’ undeclared (first use in this function) screenshot.c:345:41: error: ‘select_area_filter_data’ has no member named ‘root’ screenshot.c:345:53: error: ‘select_area_filter_data’ has no member named ‘cr’ screenshot.c: In function ‘select_area_motion_notify’: screenshot.c:367:46: error: ‘select_area_filter_data’ has no member named ‘cr’ screenshot.c:367:36: warning: passing argument 1 of ‘select_area_motion_action’ from incompatible pointer type [enabled by default] screenshot.c:249:1: note: expected ‘union GdkEvent *’ but argument is of type ‘struct GdkEventMotion *’ screenshot.c: In function ‘screenshot_select_area’: screenshot.c:391:17: error: invalid type argument of ‘->’ (have ‘GdkRectangle’) JeremiahRichard On Sat, 2011-11-26 at 12:25 -0600, Jeremiah Benham wrote:On 11/26/2011 12:12 PM, Jeremiah Benham wrote:On 11/26/2011 10:01 AM, Richard Shann wrote:Jeremiah, it will be worth merging the changes from master into gtk-3, as there were some ancient tests which would miss-fire on gtk3.I have merged them in my local branch and tried to compile. I got this error: kbd-custom.c: In function ‘keymap_accel_quick_edit_snooper’: kbd-custom.c:1466:45: error: ‘GtkMenuShell’ has no member named ‘active_menu_item’ make[2]: *** [kbd-custom.o] Error 1 The code: action = #if 0 //GTK_MINOR_VERSION<10 g_object_get_data(G_OBJECT(GTK_MENU_SHELL(menu)->active_menu_item), "action"); #else gtk_widget_get_action(GTK_MENU_SHELL(menu)->active_menu_item); I wonder if its GTK_MENU_ITEM instead.I changed it to GTK_MENU_ITEM(menu)); and it compiled. Now I uncommented screenshot.c and got these errors: screenshot.c: In function ‘screenshot_select_area_async’: screenshot.c:157:7: error: ‘select_area_filter_data’ has no member named ‘aborted’ screenshot.c:158:7: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:163:3: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:163:3: error: ‘select_area_key_press’ undeclared (first use in this function) screenshot.c:163:3: note: each undeclared identifier is reported only once for each function it appears in screenshot.c:164:3: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:164:3: error: ‘select_area_button_press’ undeclared (first use in this function) screenshot.c:165:3: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:165:3: error: ‘select_area_motion_notify’ undeclared (first use in this function) screenshot.c:172:62: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:185:63: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:202:27: error: ‘select_area_filter_data’ has no member named ‘window’ screenshot.c:208:26: error: ‘select_area_filter_data’ has no member named ‘aborted’ screenshot.c: At top level: screenshot.c:252:42: error: conflicting types for ‘unused’ screenshot.c:249:38: note: previous definition of ‘unused’ was here screenshot.c: In function ‘select_area_motion_action’: screenshot.c:255:20: error: ‘window’ undeclared (first use in this function) screenshot.c:255:50: error: request for member ‘x’ in something not a structure or union screenshot.c:255:63: error: request for member ‘y’ in something not a structure or union screenshot.c:256:52: error: request for member ‘width’ in something not a structure or union screenshot.c:256:69: error: request for member ‘height’ in something not a structure or union screenshot.c:264:20: error: request for member ‘width’ in something not a structure or union screenshot.c:264:43: error: request for member ‘height’ in something not a structure or union screenshot.c:269:22: error: request for member ‘width’ in something not a structure or union screenshot.c:269:39: error: request for member ‘height’ in something not a structure or union screenshot.c:288:50: error: request for member ‘x’ in something not a structure or union screenshot.c:288:63: error: request for member ‘y’ in something not a structure or union screenshot.c:289:52: error: request for member ‘width’ in something not a structure or union screenshot.c:289:69: error: request for member ‘height’ in something not a structure or union screenshot.c:297:20: error: request for member ‘width’ in something not a structure or union screenshot.c:297:43: error: request for member ‘height’ in something not a structure or union screenshot.c:302:22: error: request for member ‘width’ in something not a structure or union screenshot.c:302:39: error: request for member ‘height’ in something not a structure or union screenshot.c:321:23: error: ‘event’ undeclared (first use in this function) screenshot.c: In function ‘select_area_button_press’: screenshot.c:339:27: error: ‘xevent’ undeclared (first use in this function) screenshot.c:345:41: error: ‘select_area_filter_data’ has no member named ‘root’ screenshot.c:345:53: error: ‘select_area_filter_data’ has no member named ‘cr’ screenshot.c: In function ‘select_area_motion_notify’: screenshot.c:367:46: error: ‘select_area_filter_data’ has no member named ‘cr’ screenshot.c:367:36: warning: passing argument 1 of ‘select_area_motion_action’ from incompatible pointer type [enabled by default] screenshot.c:249:1: note: expected ‘union GdkEvent *’ but argument is of type ‘struct GdkEventMotion *’ screenshot.c: In function ‘screenshot_select_area’: screenshot.c:391:17: error: invalid type argument of ‘->’ (have ‘GdkRectangle’) screenshot.c: At top level: screenshot.c:443:2: error: #else without #if screenshot.c:484:3: error: unknown type name ‘GdkGC’ screenshot.c:485:3: error: conflicting types for ‘select_area_filter_data’ screenshot.c:43:3: note: previous declaration of ‘select_area_filter_data’ was here screenshot.c:491:1: error: redefinition of ‘empty_rectangle’ screenshot.c:220:1: note: previous definition of ‘empty_rectangle’ was here screenshot.c:509:29: error: unknown type name ‘GdkGC’ screenshot.c:524:28: error: unknown type name ‘GdkGC’ screenshot.c: In function ‘select_area_filter’: screenshot.c:572:37: warning: passing argument 5 of ‘fix_rectangle’ from incompatible pointer type [enabled by default] screenshot.c:234:1: note: expected ‘struct cairo_t *’ but argument is of type ‘int *’ screenshot.c:602:36: warning: passing argument 1 of ‘select_area_motion_notify’ from incompatible pointer type [enabled by default] screenshot.c:361:1: note: expected ‘struct GtkWidget *’ but argument is of type ‘struct XButtonEvent *’ screenshot.c:602:36: warning: passing argument 2 of ‘select_area_motion_notify’ from incompatible pointer type [enabled by default] screenshot.c:361:1: note: expected ‘struct GdkEventMotion *’ but argument is of type ‘struct GdkRectangle *’ screenshot.c:602:36: warning: passing argument 3 of ‘select_area_motion_notify’ from incompatible pointer type [enabled by default] screenshot.c:361:1: note: expected ‘struct select_area_filter_data *’ but argument is of type ‘struct GdkRectangle *’ screenshot.c:602:36: error: too many arguments to function ‘select_area_motion_notify’ screenshot.c:361:1: note: declared here screenshot.c: At top level: screenshot.c:630:1: error: redefinition of ‘screenshot_select_area’ screenshot.c:388:1: note: previous definition of ‘screenshot_select_area’ was here screenshot.c: In function ‘screenshot_select_area’: screenshot.c:634:3: error: unknown type name ‘GdkGCValues’ screenshot.c:665:9: error: request for member ‘function’ in something not a structure or union screenshot.c:665:21: error: ‘GDK_XOR’ undeclared (first use in this function) screenshot.c:666:9: error: request for member ‘fill’ in something not a structure or union screenshot.c:666:17: error: ‘GDK_SOLID’ undeclared (first use in this function) screenshot.c:667:9: error: request for member ‘clip_mask’ in something not a structure or union screenshot.c:668:9: error: request for member ‘subwindow_mode’ in something not a structure or union screenshot.c:668:27: error: ‘GDK_INCLUDE_INFERIORS’ undeclared (first use in this function) screenshot.c:669:9: error: request for member ‘clip_x_origin’ in something not a structure or union screenshot.c:670:9: error: request for member ‘clip_y_origin’ in something not a structure or union screenshot.c:671:9: error: request for member ‘graphics_exposures’ in something not a structure or union screenshot.c:672:9: error: request for member ‘line_width’ in something not a structure or union screenshot.c:673:9: error: request for member ‘line_style’ in something not a structure or union screenshot.c:673:23: error: ‘GDK_LINE_SOLID’ undeclared (first use in this function) screenshot.c:674:9: error: request for member ‘cap_style’ in something not a structure or union screenshot.c:674:22: error: ‘GDK_CAP_BUTT’ undeclared (first use in this function) screenshot.c:675:9: error: request for member ‘join_style’ in something not a structure or union screenshot.c:675:23: error: ‘GDK_JOIN_MITER’ undeclared (first use in this function) screenshot.c:678:37: error: ‘GDK_GC_FUNCTION’ undeclared (first use in this function) screenshot.c:678:55: error: ‘GDK_GC_FILL’ undeclared (first use in this function) screenshot.c:679:37: error: ‘GDK_GC_CLIP_MASK’ undeclared (first use in this function) screenshot.c:679:56: error: ‘GDK_GC_SUBWINDOW’ undeclared (first use in this function) screenshot.c:680:37: error: ‘GDK_GC_CLIP_X_ORIGIN’ undeclared (first use in this function) screenshot.c:681:37: error: ‘GDK_GC_CLIP_Y_ORIGIN’ undeclared (first use in this function) screenshot.c:681:60: error: ‘GDK_GC_EXPOSURES’ undeclared (first use in this function) screenshot.c:682:37: error: ‘GDK_GC_LINE_WIDTH’ undeclared (first use in this function) screenshot.c:682:57: error: ‘GDK_GC_LINE_STYLE’ undeclared (first use in this function) screenshot.c:683:37: error: ‘GDK_GC_CAP_STYLE’ undeclared (first use in this function) screenshot.c:683:56: error: ‘GDK_GC_JOIN_STYLE’ undeclared (first use in this function) screenshot.c: At top level: screenshot.c:715:1: error: redefinition of ‘screenshot_find_rectangle’ screenshot.c:405:1: note: previous definition of ‘screenshot_find_rectangle’ was here screenshot.c:729:1: error: redefinition of ‘screenshot_get_pixbuf’ screenshot.c:419:1: note: previous definition of ‘screenshot_get_pixbuf’ was here screenshot.c: In function ‘screenshot_get_pixbuf’: screenshot.c:745:20: warning: assignment makes pointer from integer without a cast [enabled by default] JeremiahJeremiahRichard _______________________________________________ Denemo-devel mailing list address@hidden https://lists.gnu.org/mailman/listinfo/denemo-devel_______________________________________________ Denemo-devel mailing list address@hidden https://lists.gnu.org/mailman/listinfo/denemo-devel_______________________________________________ Denemo-devel mailing list address@hidden https://lists.gnu.org/mailman/listinfo/denemo-devel
[Prev in Thread] | Current Thread | [Next in Thread] |