libgimpwidgets: add gimp3migration.[ch] to help the gtk3-port branch

This is such a hack, but entirely safe when linking against GTK+ 2.x.
Please ignore the uglyness.
This commit is contained in:
Michael Natterer 2011-09-30 10:45:00 +02:00
parent 2b2ecd1af1
commit 030413b9f6
5 changed files with 86 additions and 2 deletions

View file

@ -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)\

View file

@ -0,0 +1,39 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* gimp3migration.c
* Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
*
* 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
* <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <gtk/gtk.h>
#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);
}

View file

@ -0,0 +1,40 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* gimp3migration.h
* Copyright (C) 2011 Michael Natterer <mitch@gimp.org>
*
* 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
* <http://www.gnu.org/licenses/>.
*/
#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
#error "Only <libgimpwidgets/gimpwidgets.h> 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__ */

View file

@ -389,3 +389,4 @@ EXPORTS
gimp_zoom_model_zoom
gimp_zoom_model_zoom_step
gimp_zoom_type_get_type
gtk_box_new

View file

@ -79,6 +79,7 @@
#include <libgimpwidgets/gimpwidgets-error.h>
#include <libgimpwidgets/gimpzoommodel.h>
#include <libgimpwidgets/gimp3migration.h>
#include <libgimpwidgets/gimpoldwidgets.h>
#undef __GIMP_WIDGETS_H_INSIDE__