callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/libgimpwidgets: move GimpUnitStore and GimpUnitComboBox to libgimpwidgets

Browse Source
This commit is contained in:
Michael Natterer
2010-10-14 22:15:25 +02:00
parent af518f9e84
commit 74458f46ee
10 changed files with 72 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/display/gimpstatusbar.c
View File

@ -33,8 +33,6 @@
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "core/gimpprogress.h" #include "core/gimpprogress.h"
#include "widgets/gimpunitstore.h"
#include "widgets/gimpunitcombobox.h"
#include "widgets/gimpwidgets-utils.h" #include "widgets/gimpwidgets-utils.h"
#include "gimpdisplay.h" #include "gimpdisplay.h"

4
app/widgets/Makefile.am
View File

@ -348,10 +348,6 @@ libappwidgets_a_sources = \
gimpuimanager.h \ gimpuimanager.h \
gimpundoeditor.c \ gimpundoeditor.c \
gimpundoeditor.h \ gimpundoeditor.h \
gimpunitcombobox.c \
gimpunitcombobox.h \
gimpunitstore.c \
gimpunitstore.h \
gimpvectorstreeview.c \ gimpvectorstreeview.c \
gimpvectorstreeview.h \ gimpvectorstreeview.h \
gimpview.c \ gimpview.c \

2
app/widgets/widgets-types.h
View File

@ -196,8 +196,6 @@ typedef struct _GimpTemplateEditor GimpTemplateEditor;
typedef struct _GimpTextStyleEditor GimpTextStyleEditor; typedef struct _GimpTextStyleEditor GimpTextStyleEditor;
typedef struct _GimpThumbBox GimpThumbBox; typedef struct _GimpThumbBox GimpThumbBox;
typedef struct _GimpTranslationStore GimpTranslationStore; typedef struct _GimpTranslationStore GimpTranslationStore;
typedef struct _GimpUnitStore GimpUnitStore;
typedef struct _GimpUnitComboBox GimpUnitComboBox;
typedef struct _GimpWindow GimpWindow; typedef struct _GimpWindow GimpWindow;

6
libgimpwidgets/Makefile.am
View File

@ -160,8 +160,12 @@ libgimpwidgets_2_0_la_sources = \
gimpstock.h \ gimpstock.h \
gimpstringcombobox.c \ gimpstringcombobox.c \
gimpstringcombobox.h \ gimpstringcombobox.h \
gimpunitcombobox.c \
gimpunitcombobox.h \
gimpunitmenu.c \ gimpunitmenu.c \
gimpunitmenu.h \ gimpunitmenu.h \
gimpunitstore.c \
gimpunitstore.h \
gimpwidgets-error.c \ gimpwidgets-error.c \
gimpwidgets-error.h \ gimpwidgets-error.h \
gimpwidgets-private.c \ gimpwidgets-private.c \
@ -235,7 +239,9 @@ libgimpwidgetsinclude_HEADERS = \
gimpsizeentry.h \ gimpsizeentry.h \
gimpstock.h \ gimpstock.h \
gimpstringcombobox.h \ gimpstringcombobox.h \
gimpunitcombobox.h \
gimpunitmenu.h \ gimpunitmenu.h \
gimpunitstore.h \
gimpwidgets-error.h \ gimpwidgets-error.h \
gimpwidgets.h \ gimpwidgets.h \
gimpwidgetsenums.h \ gimpwidgetsenums.h \

25
app/widgets/gimpunitcombobox.c → libgimpwidgets/gimpunitcombobox.c
View File

@ -1,28 +1,29 @@
/* GIMP - The GNU Image Manipulation Program /* LIBGIMP - The GIMP Library
* Copyright (C) 1995 Spencer Kimball and Peter Mattis * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
* *
* gimpunitcombobox.c * gimpunitcombobox.c
* Copyright (C) 2004, 2008 Sven Neumann <sven@gimp.org> * Copyright (C) 2004, 2008 Sven Neumann <sven@gimp.org>
* *
* This program is free software: you can redistribute it and/or modify * This library is free software: you can redistribute it and/or
* it under the terms of the GNU General Public License as published by * modify it under the terms of the GNU Lesser General Public
* the Free Software Foundation; either version 3 of the License, or * License as published by the Free Software Foundation; either
* (at your option) any later version. * version 3 of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* GNU General Public License for more details. * Library General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU Lesser General Public
* along with this program. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/ */
#include "config.h" #include "config.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "widgets-types.h" #include "gimpwidgetstypes.h"
#include "gimpunitcombobox.h" #include "gimpunitcombobox.h"
#include "gimpunitstore.h" #include "gimpunitstore.h"

29
app/widgets/gimpunitcombobox.h → libgimpwidgets/gimpunitcombobox.h
View File

@ -1,21 +1,22 @@
/* GIMP - The GNU Image Manipulation Program /* LIBGIMP - The GIMP Library
* Copyright (C) 1995 Spencer Kimball and Peter Mattis * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
* *
* gimpunitcombobox.h * gimpunitcombobox.h
* Copyright (C) 2004 Sven Neumann <sven@gimp.org> * Copyright (C) 2004 Sven Neumann <sven@gimp.org>
* *
* This program is free software: you can redistribute it and/or modify * This library is free software: you can redistribute it and/or
* it under the terms of the GNU General Public License as published by * modify it under the terms of the GNU Lesser General Public
* the Free Software Foundation; either version 3 of the License, or * License as published by the Free Software Foundation; either
* (at your option) any later version. * version 3 of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* GNU General Public License for more details. * Library General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU Lesser General Public
* along with this program. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/ */
#ifndef __GIMP_UNIT_COMBO_BOX_H__ #ifndef __GIMP_UNIT_COMBO_BOX_H__
@ -35,6 +36,12 @@ typedef struct _GimpUnitComboBoxClass GimpUnitComboBoxClass;
struct _GimpUnitComboBoxClass struct _GimpUnitComboBoxClass
{ {
GtkComboBoxClass parent_instance; GtkComboBoxClass parent_instance;
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
}; };
struct _GimpUnitComboBox struct _GimpUnitComboBox

26
app/widgets/gimpunitstore.c → libgimpwidgets/gimpunitstore.c
View File

@ -1,21 +1,22 @@
/* GIMP - The GNU Image Manipulation Program /* LIBGIMP - The GIMP Library
* Copyright (C) 1995 Spencer Kimball and Peter Mattis * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
* *
* gimpunitstore.c * gimpunitstore.c
* Copyright (C) 2004 Sven Neumann <sven@gimp.org> * Copyright (C) 2004 Sven Neumann <sven@gimp.org>
* *
* This program is free software: you can redistribute it and/or modify * This library is free software: you can redistribute it and/or
* it under the terms of the GNU General Public License as published by * modify it under the terms of the GNU Lesser General Public
* the Free Software Foundation; either version 3 of the License, or * License as published by the Free Software Foundation; either
* (at your option) any later version. * version 3 of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* GNU General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU Lesser General Public
* along with this program. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/ */
#include "config.h" #include "config.h"
@ -23,9 +24,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h" #include "gimpwidgetstypes.h"
#include "gimpunitstore.h" #include "gimpunitstore.h"

29
app/widgets/gimpunitstore.h → libgimpwidgets/gimpunitstore.h
View File

@ -1,21 +1,22 @@
/* GIMP - The GNU Image Manipulation Program /* LIBGIMP - The GIMP Library
* Copyright (C) 1995 Spencer Kimball and Peter Mattis * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
* *
* gimpunitstore.h * gimpunitstore.h
* Copyright (C) 2004 Sven Neumann <sven@gimp.org> * Copyright (C) 2004 Sven Neumann <sven@gimp.org>
* *
* This program is free software: you can redistribute it and/or modify * This library is free software: you can redistribute it and/or
* it under the terms of the GNU General Public License as published by * modify it under the terms of the GNU Lesser General Public
* the Free Software Foundation; either version 3 of the License, or * License as published by the Free Software Foundation; either
* (at your option) any later version. * version 3 of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* GNU General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU Lesser General Public
* along with this program. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/ */
#ifndef __GIMP_UNIT_STORE_H__ #ifndef __GIMP_UNIT_STORE_H__
@ -50,6 +51,12 @@ typedef struct _GimpUnitStoreClass GimpUnitStoreClass;
struct _GimpUnitStoreClass struct _GimpUnitStoreClass
{ {
GObjectClass parent_class; GObjectClass parent_class;
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
void (*_gtk_reserved4) (void);
}; };
struct _GimpUnitStore struct _GimpUnitStore

2
libgimpwidgets/gimpwidgets.h
View File

@ -72,7 +72,9 @@
#include <libgimpwidgets/gimpsizeentry.h> #include <libgimpwidgets/gimpsizeentry.h>
#include <libgimpwidgets/gimpstock.h> #include <libgimpwidgets/gimpstock.h>
#include <libgimpwidgets/gimpstringcombobox.h> #include <libgimpwidgets/gimpstringcombobox.h>
#include <libgimpwidgets/gimpunitcombobox.h>
#include <libgimpwidgets/gimpunitmenu.h> #include <libgimpwidgets/gimpunitmenu.h>
#include <libgimpwidgets/gimpunitstore.h>
#include <libgimpwidgets/gimpwidgets-error.h> #include <libgimpwidgets/gimpwidgets-error.h>
#include <libgimpwidgets/gimpzoommodel.h> #include <libgimpwidgets/gimpzoommodel.h>

2
libgimpwidgets/gimpwidgetstypes.h
View File

@ -70,7 +70,9 @@ typedef struct _GimpRuler GimpRuler;
typedef struct _GimpScrolledPreview GimpScrolledPreview; typedef struct _GimpScrolledPreview GimpScrolledPreview;
typedef struct _GimpSizeEntry GimpSizeEntry; typedef struct _GimpSizeEntry GimpSizeEntry;
typedef struct _GimpStringComboBox GimpStringComboBox; typedef struct _GimpStringComboBox GimpStringComboBox;
typedef struct _GimpUnitComboBox GimpUnitComboBox;
typedef struct _GimpUnitMenu GimpUnitMenu; typedef struct _GimpUnitMenu GimpUnitMenu;
typedef struct _GimpUnitStore GimpUnitStore;
typedef struct _GimpZoomModel GimpZoomModel; typedef struct _GimpZoomModel GimpZoomModel;