From 7f1bc40a84640bc214ad0da8e06081e42e69ddf6 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Mon, 17 Sep 2007 19:53:54 +0000 Subject: [PATCH] svn path=/trunk/; revision=18842 svn path=/trunk/; revision=18842 --- ChangeLog | 12 +++++++ gtk/gtkbuilderparser.c | 4 ++- gtk/gtkselection.c | 2 +- gtk/makefile.msc.in | 64 ++++++++++++++++++-------------------- tests/autotestfilesystem.c | 7 +++++ tests/makefile.msc | 5 +-- 6 files changed, 57 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0eb760b2ef..c2eb850a49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-09-17 Hans Breuer + + * gtk/makefile.msc.in : updated msvc build + * gtk/gtkbuilderparser.c : fixed gccism - stack allocated variable + size array + + * gtk/gtkselection.c(547) : error C4033: 'gtk_target_list_find' + must return a value + + * test/makefile.msc : added some more tests + * tests/autotestfilesystem.c : HAVE_UNISTD_H, _rmdir + 2007-09-17 Amitakhya Phukan * configure.in: Added as to ALL_LINGUAS. diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c index 5c80c10110..8833f397de 100644 --- a/gtk/gtkbuilderparser.c +++ b/gtk/gtkbuilderparser.c @@ -857,8 +857,10 @@ dpgettext (const char *domain, size_t msgctxt_len = strlen (msgctxt) + 1; size_t msgid_len = strlen (msgid) + 1; const char *translation; - char msg_ctxt_id[msgctxt_len + msgid_len]; + char* msg_ctxt_id; + msg_ctxt_id = g_alloca (msgctxt_len + msgid_len); + memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); msg_ctxt_id[msgctxt_len - 1] = '\004'; memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 5100cd9aa0..f655907c11 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -544,7 +544,7 @@ gtk_target_list_find (GtkTargetList *list, { GList *tmp_list; - g_return_if_fail (list != NULL); + g_return_val_if_fail (list != NULL, FALSE); tmp_list = list->list; while (tmp_list) diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in index 412e2c0a88..b4f5bf9d62 100644 --- a/gtk/makefile.msc.in +++ b/gtk/makefile.msc.in @@ -70,9 +70,14 @@ gtkbuiltincache.h: gtk-update-icon-cache.exe gtk-update-icon-cache --force --ignore-theme-index \ --source builtin_icons stock-icons > gtkbuiltincache.h +GENERATED = \ + gtktypebuiltins.h gtktypebuiltins.c \ + gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c \ + gtk.def gtkalias.h gtkaliasdef.c + all : \ ..\config.h \ - generated \ + $(GENERATED) \ gtk-update-icon-cache.exe \ gtkbuiltincache.h \ libgtk-win32-$(GTK_VER)-0.dll \ @@ -98,6 +103,9 @@ gtk_OBJECTS = \ gtkbindings.obj \ gtkbbox.obj \ gtkbox.obj \ + gtkbuildable.obj \ + gtkbuilder.obj \ + gtkbuilderparser.obj \ gtkbutton.obj \ gtkcalendar.obj \ gtkcelleditable.obj \ @@ -322,35 +330,37 @@ gtk_public_h_sources = \ gtkaccelgroup.h \ gtkaccellabel.h \ gtkaccelmap.h \ - gtkaccessible.h \ + gtkaccessible.h \ gtkaction.h \ gtkactiongroup.h \ gtkadjustment.h \ gtkalignment.h \ gtkarrow.h \ gtkaspectframe.h \ - gtkassistant.h \ + gtkassistant.h \ gtkbbox.h \ gtkbin.h \ gtkbindings.h \ gtkbox.h \ + gtkbuilder.h \ + gtkbuildable.h \ gtkbutton.h \ gtkcalendar.h \ gtkcelleditable.h \ gtkcelllayout.h \ gtkcellrenderer.h \ gtkcellrendereraccel.h \ + gtkcellrenderercombo.h \ gtkcellrendererpixbuf.h \ - gtkcellrendererprogress.h \ + gtkcellrendererprogress.h \ gtkcellrendererspin.h \ gtkcellrenderertext.h \ gtkcellrenderertoggle.h \ - gtkcellview.h \ + gtkcellview.h \ gtkcheckbutton.h \ gtkcheckmenuitem.h \ gtkclipboard.h \ gtkclist.h \ - gtkclipboard.h \ gtkcolorbutton.h \ gtkcolorsel.h \ gtkcolorseldialog.h \ @@ -360,17 +370,18 @@ gtk_public_h_sources = \ gtkcontainer.h \ gtkctree.h \ gtkcurve.h \ - gtkdebug.h \ + gtkdebug.h \ gtkdialog.h \ gtkdnd.h \ gtkdrawingarea.h \ - gtkeditable.h \ + gtkeditable.h \ gtkentry.h \ gtkentrycompletion.h \ gtkenums.h \ gtkeventbox.h \ gtkexpander.h \ gtkfilechooser.h \ + gtkfilechooserbutton.h \ gtkfilechooserdialog.h \ gtkfilechooserwidget.h \ gtkfilefilter.h \ @@ -389,8 +400,6 @@ gtk_public_h_sources = \ gtkhscale.h \ gtkhscrollbar.h \ gtkhseparator.h \ - gtkstatusicon.h \ - gtkhsv.h \ gtkiconfactory.h \ gtkicontheme.h \ gtkiconview.h \ @@ -405,19 +414,20 @@ gtk_public_h_sources = \ gtkitem.h \ gtkitemfactory.h \ gtklabel.h \ - gtklayout.h \ + gtklayout.h \ gtklinkbutton.h \ gtklist.h \ gtklistitem.h \ gtkliststore.h \ gtkmain.h \ - gtkmarshal.h \ gtkmenu.h \ gtkmenubar.h \ gtkmenuitem.h \ gtkmenushell.h \ + gtkmenutoolbutton.h \ gtkmessagedialog.h \ gtkmisc.h \ + gtkmodules.h \ gtknotebook.h \ gtkobject.h \ gtkoldeditable.h \ @@ -430,11 +440,11 @@ gtk_public_h_sources = \ gtkpreview.h \ gtkprintcontext.h \ gtkprintoperation.h \ + gtkprintoperationpreview.h \ gtkprintsettings.h \ gtkprivate.h \ gtkprogress.h \ gtkprogressbar.h \ - gtkquery.h \ gtkradioaction.h \ gtkradiobutton.h \ gtkradiomenuitem.h \ @@ -453,29 +463,27 @@ gtk_public_h_sources = \ gtkscalebutton.h \ gtkscrollbar.h \ gtkscrolledwindow.h \ - gtksearchengine.h \ gtkselection.h \ gtkseparator.h \ gtkseparatormenuitem.h \ gtkseparatortoolitem.h \ gtksettings.h \ gtksignal.h \ - gtksizegroup.h \ - gtksignal.h \ + gtksizegroup.h \ gtksocket.h \ gtkspinbutton.h \ gtkstatusbar.h \ + gtkstatusicon.h \ gtkstock.h \ gtkstyle.h \ gtktable.h \ - gtktearoffmenuitem.h \ + gtktearoffmenuitem.h \ gtktext.h \ gtktextbuffer.h \ gtktextbufferrichtext.h \ gtktextchild.h \ gtktextdisplay.h \ gtktextiter.h \ - gtktextlayout.h \ gtktextmark.h \ gtktexttag.h \ gtktexttagtable.h \ @@ -487,6 +495,7 @@ gtk_public_h_sources = \ gtktoolbar.h \ gtktoolbutton.h \ gtktoolitem.h \ + gtktooltip.h \ gtktooltips.h \ gtktree.h \ gtktreednd.h \ @@ -500,7 +509,7 @@ gtk_public_h_sources = \ gtktreeview.h \ gtktreeviewcolumn.h \ gtktypeutils.h \ - gtkuimanager.h \ + gtkuimanager.h \ gtkvbbox.h \ gtkvbox.h \ gtkviewport.h \ @@ -522,17 +531,6 @@ gtk_extra_sources = \ ..\config.h : ..\config.h.win32 copy ..\config.h.win32 ..\config.h -GENERATED = \ - gtktypebuiltins.h gtktypebuiltins.c \ - gtkmarshal.h gtkmarshal.c gtkmarshalers.h gtkmarshalers.c \ - gtk.def gtkalias.h gtkaliasdef.c - -# -# Generated source files: -# -generated : $(GENERATED) - $(TOUCH) generated - gtk.def: gtk.symbols makefile.msc echo EXPORTS > gtk.def cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES \ @@ -569,10 +567,10 @@ gtktypebuiltins.c: $(gtk_public_h_sources) makefile.msc copy xgen-gtbc gtktypebuiltins.c # private marshalers -gtkmarshalers.h : gtkmarshalers.list - $(GLIB)\gobject\glib-genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >>gtkmarshalers.h +gtkmarshalers.h : gtkmarshalers.list makefile.msc + $(GLIB)\gobject\glib-genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >gtkmarshalers.h -gtkmarshalers.c : gtkmarshalers.list +gtkmarshalers.c : gtkmarshalers.list makefile.msc $(GLIB)\gobject\glib-genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >gtkmarshalers.c # public, deprecated marshalers diff --git a/tests/autotestfilesystem.c b/tests/autotestfilesystem.c index 9738fc63a7..6c4519d1a1 100644 --- a/tests/autotestfilesystem.c +++ b/tests/autotestfilesystem.c @@ -25,11 +25,18 @@ #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include #include +#ifdef G_OS_WIN32 +#include +#define rmdir(d) _rmdir(d) +#endif + #define CALLBACK_TIMEOUT_MS 3000 /* Period after which the callback must have been called */ #define CANCEL_TIMEOUT_MS 100 /* We'll sleep for this much time before cancelling */ diff --git a/tests/makefile.msc b/tests/makefile.msc index 2db726f867..37ee07e216 100644 --- a/tests/makefile.msc +++ b/tests/makefile.msc @@ -40,13 +40,14 @@ all : \ # Test programs: # TESTAPPS = \ - autotestfilechooser floatingtest \ + autotestfilechooser autotestfilesystem \ + buildertest floatingtest \ testaccel testactions testassistant \ testbbox \ testcairo testcalendar testcellrenderertext testcombo testcombochange \ testdnd \ testellipsise testentrycompletion \ - testfilechooser testfilechooserbutton \ + testfilechooser testfilechooserbutton testframe \ testgrouping testgtk \ testicontheme testiconview testimage testinput \ testmenus testmenubars testmerge testmultidisplay testmultiscreen \