AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

API: image: Move private struct definitions into private header

Browse Source 
They weren't privatized because the dnd code used them, too. But a
private header can allow the dnd code to be nasty, so go dnd code!
This commit is contained in:
Benjamin Otte 2011-02-08 08:55:25 +01:00
parent c1f8330a28
commit 1483145806
6 changed files with 86 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/Makefile.am
View File

@ -396,6 +396,7 @@ gtk_private_h_sources = \
gtkfilesystem.h \
gtkfilesystemmodel.h \
gtkiconcache.h \
gtkimageprivate.h \
gtkimcontextsimpleseqs.h \
gtkintl.h \
gtkkeyhash.h \

2
gtk/gtkdnd-quartz.c
View File

@ -34,7 +34,7 @@
#include "gtkdnd.h"
#include "gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkimage.h"
#include "gtkimageprivate.h"
#include "gtkinvisible.h"
#include "gtkmain.h"
#include "gtkplug.h"

2
gtk/gtkdnd.c
View File

@ -41,7 +41,7 @@
#include "gtkdnd.h"
#include "gtkiconfactory.h"
#include "gtkicontheme.h"
#include "gtkimage.h"
#include "gtkimageprivate.h"
#include "gtkinvisible.h"
#include "gtkmain.h"
#include "gtkplug.h"

2
gtk/gtkimage.c
View File

@ -30,7 +30,7 @@
#include <string.h>
#include "gtkcontainer.h"
#include "gtkimage.h"
#include "gtkimageprivate.h"
#include "gtkiconfactory.h"
#include "gtkstock.h"
#include "gtkicontheme.h"

43
gtk/gtkimage.h
View File

@ -50,49 +50,6 @@ typedef struct _GtkImage GtkImage;
typedef struct _GtkImagePrivate GtkImagePrivate;
typedef struct _GtkImageClass GtkImageClass;
typedef struct _GtkImagePixbufData GtkImagePixbufData;
typedef struct _GtkImageStockData GtkImageStockData;
typedef struct _GtkImageIconSetData GtkImageIconSetData;
typedef struct _GtkImageAnimationData GtkImageAnimationData;
typedef struct _GtkImageIconNameData GtkImageIconNameData;
typedef struct _GtkImageGIconData GtkImageGIconData;
struct _GtkImagePixbufData
{
GdkPixbuf *pixbuf;
};
struct _GtkImageStockData
{
gchar *stock_id;
};
struct _GtkImageIconSetData
{
GtkIconSet *icon_set;
};
struct _GtkImageAnimationData
{
GdkPixbufAnimation *anim;
GdkPixbufAnimationIter *iter;
guint frame_timeout;
};
struct _GtkImageIconNameData
{
gchar *icon_name;
GdkPixbuf *pixbuf;
guint theme_change_id;
};
struct _GtkImageGIconData
{
GIcon *icon;
GdkPixbuf *pixbuf;
guint theme_change_id;
};
/**
* GtkImageType:
* @GTK_IMAGE_EMPTY: there is no image displayed by the widget

82
gtk/gtkimageprivate.h Normal file
View File

@ -0,0 +1,82 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* 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 2 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, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_IMAGE_PRIVATE_H__
#define __GTK_IMAGE_PRIVATE_H__
#include "gtkimage.h"
G_BEGIN_DECLS
typedef struct _GtkImagePixbufData GtkImagePixbufData;
typedef struct _GtkImageStockData GtkImageStockData;
typedef struct _GtkImageIconSetData GtkImageIconSetData;
typedef struct _GtkImageAnimationData GtkImageAnimationData;
typedef struct _GtkImageIconNameData GtkImageIconNameData;
typedef struct _GtkImageGIconData GtkImageGIconData;
struct _GtkImagePixbufData
{
GdkPixbuf *pixbuf;
};
struct _GtkImageStockData
{
gchar *stock_id;
};
struct _GtkImageIconSetData
{
GtkIconSet *icon_set;
};
struct _GtkImageAnimationData
{
GdkPixbufAnimation *anim;
GdkPixbufAnimationIter *iter;
guint frame_timeout;
};
struct _GtkImageIconNameData
{
gchar *icon_name;
GdkPixbuf *pixbuf;
guint theme_change_id;
};
struct _GtkImageGIconData
{
GIcon *icon;
GdkPixbuf *pixbuf;
guint theme_change_id;
};
G_END_DECLS
#endif /* __GTK_IMAGE_H__ */