Commit 931eac64 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

libgimp/gimpuitypes.h moved the GimpDrawablePreview typedef to the header

2004-08-31  Sven Neumann  <sven@gimp.org>

	* libgimp/gimpuitypes.h
	* libgimpwidgets/gimpwidgetstypes.h: moved the GimpDrawablePreview
	typedef to the header file that it belongs to.

	* libgimp/gimpdrawablepreview.[ch]: minor include cleanups and
	gtk-doc fixes.

2004-08-31  Sven Neumann  <sven@gimp.org>

	* libgimp/Makefile.am
	* libgimp/libgimp-docs.sgml
	* libgimp/libgimp-sections.txt
	* libgimp/libgimp.types
	* libgimp/tmpl/gimpdrawablepreview.sgml: updated for
	GimpDrawablePreview

	* libgimpwidgets/Makefile.am
	* libgimpwidgets/libgimpwidgets-include.c: removed this file, it
	isn't needed since libgimpwidgets doesn't need to be linked
	against libgimp.

	* libgimpwidgets/libgimpwidgets-docs.sgml
	* libgimpwidgets/libgimpwidgets-sections.txt
	* libgimpwidgets/libgimpwidgets.types
	* libgimpwidgets/tmpl/gimppreview.sgml: updated for GimpPreview.
parent e80ba517
2004-08-31 Sven Neumann <sven@gimp.org>
* libgimp/gimpuitypes.h
* libgimpwidgets/gimpwidgetstypes.h: moved the GimpDrawablePreview
typedef to the header file that it belongs to.
* libgimp/gimpdrawablepreview.[ch]: minor include cleanups and
gtk-doc fixes.
2004-08-31 Sven Neumann <sven@gimp.org>
* plug-ins/common/gauss.c (gauss_dialog): update the preview when
......
2004-08-31 Sven Neumann <sven@gimp.org>
* libgimp/Makefile.am
* libgimp/libgimp-docs.sgml
* libgimp/libgimp-sections.txt
* libgimp/libgimp.types
* libgimp/tmpl/gimpdrawablepreview.sgml: updated for
GimpDrawablePreview
* libgimpwidgets/Makefile.am
* libgimpwidgets/libgimpwidgets-include.c: removed this file, it
isn't needed since libgimpwidgets doesn't need to be linked
against libgimp.
* libgimpwidgets/libgimpwidgets-docs.sgml
* libgimpwidgets/libgimpwidgets-sections.txt
* libgimpwidgets/libgimpwidgets.types
* libgimpwidgets/tmpl/gimppreview.sgml: updated for GimpPreview.
2004-08-30 Michael Natterer <mitch@gimp.org>
* libgimp/libgimp-sections.txt
......
......@@ -3,6 +3,8 @@ Makefile.in
deprecated
libgimp.args
libgimp.hierarchy
libgimp.interfaces
libgimp.prerequisites
libgimp.signals
libgimp-decl.txt
libgimp-decl-list.txt
......
......@@ -43,8 +43,20 @@ extra_files =
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
GTKDOC_CFLAGS =
GTKDOC_LIBS =
GTKDOC_CFLAGS = \
@CFLAGS@ \
-I$(top_srcdir) \
-I$(top_builddir) \
@GTK_CFLAGS@
GTKDOC_LIBS = \
$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la \
$(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la \
$(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la \
$(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la \
$(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la \
@GTK_LIBS@
GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC)
GTKDOC_LD = $(LIBTOOL) --mode=link $(CC)
......
......@@ -71,8 +71,15 @@
<part id="libgimpui">
<title>GIMP User Interface Library</title>
<chapter id="libgimpui-hierarchy">
<title>Object Hierarchy</title>
<xi:include href="xml/tree_index.sgml" />
</chapter>
<xi:include href="xml/gimpui.xml" />
<xi:include href="xml/gimpexport.xml" />
<xi:include href="xml/gimpdrawablepreview.xml" />
<xi:include href="xml/gimpdrawablecombobox.xml" />
<xi:include href="xml/gimpimagecombobox.xml" />
<xi:include href="xml/gimppixbuf.xml" />
......
......@@ -682,6 +682,24 @@ gimp_image_get_thumbnail
gimp_drawable_get_thumbnail
</SECTION>
<SECTION>
<FILE>gimpdrawablepreview</FILE>
<TITLE>GimpDrawablePreview</TITLE>
GimpDrawablePreview
gimp_drawable_preview_new
gimp_drawable_preview_new_with_toggle
gimp_drawable_preview_draw
<SUBSECTION Standard>
GimpDrawablePreviewClass
GIMP_DRAWABLE_PREVIEW
GIMP_IS_DRAWABLE_PREVIEW
GIMP_TYPE_DRAWABLE_PREVIEW
gimp_drawable_preview_get_type
GIMP_DRAWABLE_PREVIEW_CLASS
GIMP_IS_DRAWABLE_PREVIEW_CLASS
GIMP_DRAWABLE_PREVIEW_GET_CLASS
</SECTION>
<SECTION>
<FILE>gimpdrawablecombobox</FILE>
GimpDrawableConstraintFunc
......
#include <gtk/gtk.h>
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
gimp_drawable_preview_get_type
<!-- ##### SECTION Title ##### -->
GimpDrawablePreview
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### STRUCT GimpDrawablePreview ##### -->
<para>
</para>
<!-- ##### FUNCTION gimp_drawable_preview_new ##### -->
<para>
</para>
@drawable:
@Returns:
<!-- ##### FUNCTION gimp_drawable_preview_new_with_toggle ##### -->
<para>
</para>
@drawable:
@toggle:
@Returns:
<!-- ##### FUNCTION gimp_drawable_preview_draw ##### -->
<para>
</para>
@preview:
@buf:
......@@ -39,7 +39,7 @@ HTML_IMAGES = \
content_files =
# Other files to distribute
extra_files = libgimpwidgets-include.c
extra_files =
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
......@@ -54,8 +54,6 @@ GTKDOC_LIBS = \
$(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la \
$(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la \
$(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la \
$(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la \
@GTK_LIBS@
GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC)
......
......@@ -37,6 +37,7 @@
<xi:include href="xml/gimppickbutton.xml" />
<xi:include href="xml/gimppixmap.xml" />
<xi:include href="xml/gimppreviewarea.xml" />
<xi:include href="xml/gimppreview.xml" />
<xi:include href="xml/gimpunitmenu.xml" />
</part>
......
/*
* gtk-doc can't build libgimpwidgets-scan.c without PLUG_IN_INFO being defined
* so we include this file as a workaround
*/
#include <glib.h>
#include <libgimp/gimp.h>
GimpPlugInInfo PLUG_IN_INFO =
{
NULL,
NULL,
NULL,
NULL,
};
......@@ -793,6 +793,25 @@ GIMP_IS_PREVIEW_AREA_CLASS
GIMP_PREVIEW_AREA_GET_CLASS
</SECTION>
<SECTION>
<FILE>gimppreview</FILE>
<TITLE>GimpPreview</TITLE>
GimpPreview
gimp_preview_get_width
gimp_preview_get_height
gimp_preview_get_position
gimp_preview_show_update_toggle
<SUBSECTION Standard>
GimpPreviewClass
GIMP_PREVIEW
GIMP_IS_PREVIEW
GIMP_TYPE_PREVIEW
gimp_preview_get_type
GIMP_PREVIEW_CLASS
GIMP_IS_PREVIEW_CLASS
GIMP_PREVIEW_GET_CLASS
</SECTION>
<SECTION>
<FILE>gimpoldwidgets</FILE>
gimp_int_option_menu_new
......
#include <gtk/gtk.h>
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
#include "devel-docs/libgimpwidgets/libgimpwidgets-include.c"
#include <libgimpwidgets/gimpwidgets.h>
gimp_button_get_type
gimp_cell_renderer_color_get_type
......@@ -30,5 +27,6 @@ gimp_path_editor_get_type
gimp_pick_button_get_type
gimp_pixmap_get_type
gimp_preview_area_get_type
gimp_preview_get_type
gimp_size_entry_get_type
gimp_unit_menu_get_type
<!-- ##### SECTION Title ##### -->
GimpPreview
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### STRUCT GimpPreview ##### -->
<para>
</para>
<!-- ##### SIGNAL GimpPreview::updated ##### -->
<para>
</para>
@gimppreview: the object which received the signal.
<!-- ##### ARG GimpPreview:show-toggle-preview ##### -->
<para>
</para>
<!-- ##### ARG GimpPreview:update-preview ##### -->
<para>
</para>
<!-- ##### FUNCTION gimp_preview_get_width ##### -->
<para>
</para>
@preview:
@Returns:
<!-- ##### FUNCTION gimp_preview_get_height ##### -->
<para>
</para>
@preview:
@Returns:
<!-- ##### FUNCTION gimp_preview_get_position ##### -->
<para>
</para>
@preview:
@x:
@y:
<!-- ##### FUNCTION gimp_preview_show_update_toggle ##### -->
<para>
</para>
@preview:
@show_update:
......@@ -23,9 +23,12 @@
#include <gtk/gtk.h>
#include "gimpuitypes.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gimpuitypes.h"
#include "gimp.h"
#include "gimpdrawablepreview.h"
......@@ -224,25 +227,28 @@ gimp_drawable_preview_new_with_toggle (GimpDrawable *drawable,
/**
* gimp_drawable_preview_draw:
* @preview: a #GimpDrawablePreview widget
* @buf:
*
* Since: GIMP 2.2
**/
void
gimp_drawable_preview_draw (GimpDrawablePreview *drawable_preview,
gimp_drawable_preview_draw (GimpDrawablePreview *preview,
guchar *buf)
{
GimpPreview *preview;
GimpPreview *gimp_preview;
GimpDrawable *drawable;
g_return_if_fail (GIMP_IS_DRAWABLE_PREVIEW (drawable_preview));
g_return_if_fail (GIMP_IS_DRAWABLE_PREVIEW (preview));
g_return_if_fail (buf != NULL);
preview = GIMP_PREVIEW (drawable_preview);
drawable = drawable_preview->drawable;
gimp_preview = GIMP_PREVIEW (preview);
drawable = preview->drawable;
gimp_preview_area_draw (GIMP_PREVIEW_AREA (preview->area),
0, 0, preview->width, preview->height,
gimp_preview_area_draw (GIMP_PREVIEW_AREA (gimp_preview->area),
0, 0, gimp_preview->width, gimp_preview->height,
gimp_drawable_type (drawable->drawable_id),
buf,
preview->width * drawable->bpp);
gimp_preview->width * drawable->bpp);
}
......@@ -22,8 +22,7 @@
#ifndef __GIMP_DRAWABLE_PREVIEW_H__
#define __GIMP_DRAWABLE_PREVIEW_H__
#include "libgimp/gimp.h"
#include "libgimpwidgets/gimppreview.h"
#include <libgimpwidgets/gimppreview.h>
G_BEGIN_DECLS
......
......@@ -22,15 +22,15 @@
#ifndef __GIMP_UI_TYPES_H__
#define __GIMP_UI_TYPES_H__
#include <libgimpwidgets/gimpwidgetstypes.h>
G_BEGIN_DECLS
/* For information look into the html documentation */
/* empty at the moment because most stuff went to libgimpwidgets.
*
* left here because it will contain stuff again --Mitch
*/
typedef struct _GimpDrawablePreview GimpDrawablePreview;
G_END_DECLS
......
......@@ -72,7 +72,6 @@ typedef struct _GimpColorSelect GimpColorSelect;
typedef struct _GimpColorSelection GimpColorSelection;
typedef struct _GimpController GimpController;
typedef struct _GimpDialog GimpDialog;
typedef struct _GimpDrawablePreview GimpDrawablePreview;
typedef struct _GimpFileEntry GimpFileEntry;
typedef struct _GimpFrame GimpFrame;
typedef struct _GimpIntComboBox GimpIntComboBox;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment