GNOME.org
 

[gimp] app/libgimpwidgets: move GimpUnitStore and GimpUnitComboBox to libgimpwidgets

commit 74458f46ee9cdcd7cf49467837c7b9d0a7552c5f
Author: Michael Natterer <mitch gimp org>
Date:   Thu Oct 14 22:15:25 2010 +0200

    app/libgimpwidgets: move GimpUnitStore and GimpUnitComboBox to libgimpwidgets

 app/display/gimpstatusbar.c                        |    2 -
 app/widgets/Makefile.am                            |    4 ---
 app/widgets/widgets-types.h                        |    2 -
 libgimpwidgets/Makefile.am                         |    6 ++++
 {app/widgets => libgimpwidgets}/gimpunitcombobox.c |   25 +++++++++--------
 {app/widgets => libgimpwidgets}/gimpunitcombobox.h |   29 ++++++++++++-------
 {app/widgets => libgimpwidgets}/gimpunitstore.c    |   26 +++++++++---------
 {app/widgets => libgimpwidgets}/gimpunitstore.h    |   29 ++++++++++++-------
 libgimpwidgets/gimpwidgets.h                       |    2 +
 libgimpwidgets/gimpwidgetstypes.h                  |    2 +
 10 files changed, 72 insertions(+), 55 deletions(-)
---
diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
index b756824..480b440 100644
--- a/app/display/gimpstatusbar.c
+++ b/app/display/gimpstatusbar.c
@@ -33,8 +33,6 @@
 #include "core/gimpimage.h"
 #include "core/gimpprogress.h"
 
-#include "widgets/gimpunitstore.h"
-#include "widgets/gimpunitcombobox.h"
 #include "widgets/gimpwidgets-utils.h"
 
 #include "gimpdisplay.h"
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index f90a501..e665462 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -348,10 +348,6 @@ libappwidgets_a_sources = \
 	gimpuimanager.h			\
 	gimpundoeditor.c		\
 	gimpundoeditor.h		\
-	gimpunitcombobox.c		\
-	gimpunitcombobox.h		\
-	gimpunitstore.c			\
-	gimpunitstore.h			\
 	gimpvectorstreeview.c		\
 	gimpvectorstreeview.h		\
 	gimpview.c			\
diff --git a/app/widgets/widgets-types.h b/app/widgets/widgets-types.h
index bb918fa..d2c6c5b 100644
--- a/app/widgets/widgets-types.h
+++ b/app/widgets/widgets-types.h
@@ -196,8 +196,6 @@ typedef struct _GimpTemplateEditor           GimpTemplateEditor;
 typedef struct _GimpTextStyleEditor          GimpTextStyleEditor;
 typedef struct _GimpThumbBox                 GimpThumbBox;
 typedef struct _GimpTranslationStore         GimpTranslationStore;
-typedef struct _GimpUnitStore                GimpUnitStore;
-typedef struct _GimpUnitComboBox             GimpUnitComboBox;
 typedef struct _GimpWindow                   GimpWindow;
 
 
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index aff4728..8b013e3 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -160,8 +160,12 @@ libgimpwidgets_2_0_la_sources = \
 	gimpstock.h			\
 	gimpstringcombobox.c		\
 	gimpstringcombobox.h		\
+	gimpunitcombobox.c		\
+	gimpunitcombobox.h		\
 	gimpunitmenu.c			\
 	gimpunitmenu.h			\
+	gimpunitstore.c			\
+	gimpunitstore.h			\
 	gimpwidgets-error.c		\
 	gimpwidgets-error.h		\
 	gimpwidgets-private.c		\
@@ -235,7 +239,9 @@ libgimpwidgetsinclude_HEADERS = \
 	gimpsizeentry.h			\
 	gimpstock.h			\
 	gimpstringcombobox.h		\
+	gimpunitcombobox.h		\
 	gimpunitmenu.h			\
+	gimpunitstore.h			\
 	gimpwidgets-error.h		\
 	gimpwidgets.h			\
 	gimpwidgetsenums.h		\
diff --git a/app/widgets/gimpunitcombobox.c b/libgimpwidgets/gimpunitcombobox.c
similarity index 84%
rename from app/widgets/gimpunitcombobox.c
rename to libgimpwidgets/gimpunitcombobox.c
index 1e5fe79..ae51a13 100644
--- a/app/widgets/gimpunitcombobox.c
+++ b/libgimpwidgets/gimpunitcombobox.c
@@ -1,28 +1,29 @@
-/* GIMP - The GNU Image Manipulation Program
- * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
  *
  * gimpunitcombobox.c
  * Copyright (C) 2004, 2008  Sven Neumann <sven gimp org>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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 "widgets-types.h"
+#include "gimpwidgetstypes.h"
 
 #include "gimpunitcombobox.h"
 #include "gimpunitstore.h"
diff --git a/app/widgets/gimpunitcombobox.h b/libgimpwidgets/gimpunitcombobox.h
similarity index 67%
rename from app/widgets/gimpunitcombobox.h
rename to libgimpwidgets/gimpunitcombobox.h
index b911a50..bafdfe3 100644
--- a/app/widgets/gimpunitcombobox.h
+++ b/libgimpwidgets/gimpunitcombobox.h
@@ -1,21 +1,22 @@
-/* GIMP - The GNU Image Manipulation Program
- * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
  *
  * gimpunitcombobox.h
  * Copyright (C) 2004  Sven Neumann <sven gimp org>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/>.
  */
 
 #ifndef __GIMP_UNIT_COMBO_BOX_H__
@@ -35,6 +36,12 @@ typedef struct _GimpUnitComboBoxClass  GimpUnitComboBoxClass;
 struct _GimpUnitComboBoxClass
 {
   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
diff --git a/app/widgets/gimpunitstore.c b/libgimpwidgets/gimpunitstore.c
similarity index 95%
rename from app/widgets/gimpunitstore.c
rename to libgimpwidgets/gimpunitstore.c
index 3a01c67..73d2c0f 100644
--- a/app/widgets/gimpunitstore.c
+++ b/libgimpwidgets/gimpunitstore.c
@@ -1,21 +1,22 @@
-/* GIMP - The GNU Image Manipulation Program
- * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
  * gimpunitstore.c
  * Copyright (C) 2004  Sven Neumann <sven gimp org>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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"
@@ -23,9 +24,8 @@
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"
-#include "libgimpwidgets/gimpwidgets.h"
 
-#include "widgets-types.h"
+#include "gimpwidgetstypes.h"
 
 #include "gimpunitstore.h"
 
diff --git a/app/widgets/gimpunitstore.h b/libgimpwidgets/gimpunitstore.h
similarity index 79%
rename from app/widgets/gimpunitstore.h
rename to libgimpwidgets/gimpunitstore.h
index 6aae1af..8e7d89b 100644
--- a/app/widgets/gimpunitstore.h
+++ b/libgimpwidgets/gimpunitstore.h
@@ -1,21 +1,22 @@
-/* GIMP - The GNU Image Manipulation Program
- * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
  * gimpunitstore.h
  * Copyright (C) 2004  Sven Neumann <sven gimp org>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 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 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * 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 General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/>.
  */
 
 #ifndef __GIMP_UNIT_STORE_H__
@@ -50,6 +51,12 @@ typedef struct _GimpUnitStoreClass  GimpUnitStoreClass;
 struct _GimpUnitStoreClass
 {
   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
diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h
index 57f9a25..396ed19 100644
--- a/libgimpwidgets/gimpwidgets.h
+++ b/libgimpwidgets/gimpwidgets.h
@@ -72,7 +72,9 @@
 #include <libgimpwidgets/gimpsizeentry.h>
 #include <libgimpwidgets/gimpstock.h>
 #include <libgimpwidgets/gimpstringcombobox.h>
+#include <libgimpwidgets/gimpunitcombobox.h>
 #include <libgimpwidgets/gimpunitmenu.h>
+#include <libgimpwidgets/gimpunitstore.h>
 #include <libgimpwidgets/gimpwidgets-error.h>
 #include <libgimpwidgets/gimpzoommodel.h>
 
diff --git a/libgimpwidgets/gimpwidgetstypes.h b/libgimpwidgets/gimpwidgetstypes.h
index 4301814..ab5f655 100644
--- a/libgimpwidgets/gimpwidgetstypes.h
+++ b/libgimpwidgets/gimpwidgetstypes.h
@@ -70,7 +70,9 @@ typedef struct _GimpRuler                 GimpRuler;
 typedef struct _GimpScrolledPreview       GimpScrolledPreview;
 typedef struct _GimpSizeEntry             GimpSizeEntry;
 typedef struct _GimpStringComboBox        GimpStringComboBox;
+typedef struct _GimpUnitComboBox          GimpUnitComboBox;
 typedef struct _GimpUnitMenu              GimpUnitMenu;
+typedef struct _GimpUnitStore             GimpUnitStore;
 typedef struct _GimpZoomModel             GimpZoomModel;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]