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

gtk: Empty gtkimmodule.h

Browse Source 
Move the remaining struct definition into gtkimcontextinfo.h and include
that header in gtk.h. gtkimmodule.h is now an empty header. We should
probably deprecate it somehow.

This is also necessary so headers used in gtk .c files don't include
gtk.h which in turn includes all the deprecated headers which we want to
avoid so we can include them with deprecation warnings turned off.
This commit is contained in:
Benjamin Otte 2011-11-08 20:22:57 +01:00
parent ba05093fe7
commit e1f4bd6495
7 changed files with 50 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/Makefile.am
View File

@ -249,6 +249,7 @@ gtk_public_h_sources = \
gtkimage.h \
gtkimagemenuitem.h \
gtkimcontext.h \
gtkimcontextinfo.h \
gtkimcontextsimple.h \
gtkimmodule.h \
gtkimmulticontext.h \

1
gtk/gtk.h
View File

@ -114,6 +114,7 @@
#include <gtk/gtkimage.h>
#include <gtk/gtkimagemenuitem.h>
#include <gtk/gtkimcontext.h>
#include <gtk/gtkimcontextinfo.h>
#include <gtk/gtkimcontextsimple.h>
#include <gtk/gtkimmulticontext.h>
#include <gtk/gtkinfobar.h>

46
gtk/gtkimcontextinfo.h Normal file
View File

@ -0,0 +1,46 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 2000 Red Hat Software
*
* 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.
*/
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#ifndef __GTK_IM_CONTEXT_INFO_H__
#define __GTK_IM_CONTEXT_INFO_H__
#include <glib.h>
G_BEGIN_DECLS
typedef struct _GtkIMContextInfo GtkIMContextInfo;
struct _GtkIMContextInfo
{
const gchar *context_id;
const gchar *context_name;
const gchar *domain;
const gchar *domain_dirname;
const gchar *default_locales;
};
G_END_DECLS
#endif /* __GTK_IM_CONTEXT_INFO_H__ */

1
gtk/gtkimmodule.c
View File

@ -32,7 +32,6 @@
#include <glib/gstdio.h>
#include <gmodule.h>
#include "gtkimmodule.h"
#include "gtkimmoduleprivate.h"
#include "gtkimcontextsimple.h"
#include "gtksettings.h"

15
gtk/gtkimmodule.h
View File

@ -22,19 +22,6 @@
#include <gtk/gtk.h>
G_BEGIN_DECLS
typedef struct _GtkIMContextInfo GtkIMContextInfo;
struct _GtkIMContextInfo
{
const gchar *context_id;
const gchar *context_name;
const gchar *domain;
const gchar *domain_dirname;
const gchar *default_locales;
};
/* The following entry points are exported by each input method module
*/
@ -46,6 +33,4 @@ void im_module_exit (void);
GtkIMContext *im_module_create (const gchar *context_id);
*/
G_END_DECLS
#endif /* __GTK_IM_MODULE_H__ */

3
gtk/gtkimmoduleprivate.h
View File

@ -21,7 +21,8 @@
#define __GTK_IM_MODULE_PRIVATE_H__
#include <gdk/gdk.h>
#include <gtk/gtkimmodule.h>
#include <gtk/gtkimcontext.h>
#include <gtk/gtkimcontextinfo.h>
G_BEGIN_DECLS

1
gtk/gtkimmulticontext.c
View File

@ -23,7 +23,6 @@
#include <locale.h>
#include "gtkimmulticontext.h"
#include "gtkimmodule.h"
#include "gtkimmoduleprivate.h"
#include "gtklabel.h"
#include "gtkmain.h"