diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am index a1aac9eb84..1f17b0bab4 100644 --- a/libgimpwidgets/Makefile.am +++ b/libgimpwidgets/Makefile.am @@ -176,7 +176,9 @@ libgimpwidgets_2_0_la_sources = \ gimpwidgetsenums.h \ gimpwidgetstypes.h \ gimpzoommodel.c \ - gimpzoommodel.h + gimpzoommodel.h \ + gimp3migration.c \ + gimp3migration.h libgimpwidgets_2_0_la_built_sources = \ gimp-wilber-pixbufs.h \ @@ -247,7 +249,8 @@ libgimpwidgetsinclude_HEADERS = \ gimpwidgets.h \ gimpwidgetsenums.h \ gimpwidgetstypes.h \ - gimpzoommodel.h + gimpzoommodel.h \ + gimp3migration.h libgimpwidgets_2_0_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO)\ diff --git a/libgimpwidgets/gimp3migration.c b/libgimpwidgets/gimp3migration.c new file mode 100644 index 0000000000..1e6c91a199 --- /dev/null +++ b/libgimpwidgets/gimp3migration.c @@ -0,0 +1,39 @@ +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * gimp3migration.c + * Copyright (C) 2011 Michael Natterer + * + * This library is free software: you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#include "config.h" + +#include + +#include "gimpwidgetstypes.h" + +#include "gimp3migration.h" + + +GtkWidget * +gtk_box_new (GtkOrientation orientation, + gint spacing) +{ + if (orientation == GTK_ORIENTATION_HORIZONTAL) + return gtk_hbox_new (FALSE, spacing); + else + return gtk_vbox_new (FALSE, spacing); +} diff --git a/libgimpwidgets/gimp3migration.h b/libgimpwidgets/gimp3migration.h new file mode 100644 index 0000000000..733e890ce8 --- /dev/null +++ b/libgimpwidgets/gimp3migration.h @@ -0,0 +1,40 @@ +/* LIBGIMP - The GIMP Library + * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball + * + * gimp3migration.h + * Copyright (C) 2011 Michael Natterer + * + * This library is free software: you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) +#error "Only can be included directly." +#endif + +#ifndef __GIMP_3_MIGRATION_H__ +#define __GIMP_3_MIGRATION_H__ + + +/* This file is evil. Its purpose is to keep GIMP's gtk3-port branch + * managable, and contains functions that are only in GTK+ 3.x but + * are *not* in GTK+ 2.x. Please just ignore the uglyness and move + * along. This file will be removed in GIMP 3. + */ + +GtkWidget * gtk_box_new (GtkOrientation orientation, + gint spacing); + + +#endif /* __GIMP_3_MIGRATION_H__ */ diff --git a/libgimpwidgets/gimpwidgets.def b/libgimpwidgets/gimpwidgets.def index eeb39d2460..c07eea1240 100644 --- a/libgimpwidgets/gimpwidgets.def +++ b/libgimpwidgets/gimpwidgets.def @@ -389,3 +389,4 @@ EXPORTS gimp_zoom_model_zoom gimp_zoom_model_zoom_step gimp_zoom_type_get_type + gtk_box_new diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h index 9b0dac59ed..4316dfb910 100644 --- a/libgimpwidgets/gimpwidgets.h +++ b/libgimpwidgets/gimpwidgets.h @@ -79,6 +79,7 @@ #include #include +#include #include #undef __GIMP_WIDGETS_H_INSIDE__