Fix make check

[~andy/gtk] / gtk / gtkaccelmap.h

diff --git a/gtk/gtkaccelmap.h b/gtk/gtkaccelmap.h
index 208704920bafcb53b2d8be50299d96c6b288765f..8612f18017a92b042aae82f1c0a16492a369f825 100644 (file)
--- a/gtk/gtkaccelmap.h
+++ b/gtk/gtkaccelmap.h
@@ -12,19 +12,17 @@
  * 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_ACCEL_MAP_H__
 #define __GTK_ACCEL_MAP_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkaccelgroup.h>
 
 G_BEGIN_DECLS
@@ -41,6 +39,16 @@ typedef struct _GtkAccelMap      GtkAccelMap;
 typedef struct _GtkAccelMapClass GtkAccelMapClass;
 
 /* --- notifier --- */
+/**
+ * GtkAccelMapForeach:
+ * @data: User data passed to gtk_accel_map_foreach() or
+ *  gtk_accel_map_foreach_unfiltered()
+ * @accel_path: Accel path of the current accelerator
+ * @accel_key: Key of the current accelerator
+ * @accel_mods: Modifiers of the current accelerator
+ * @changed: Changed flag of the accelerator (if %TRUE, accelerator has changed
+ *  during runtime and would need to be saved during an accelerator dump)
+ */
 typedef void (*GtkAccelMapForeach)             (gpointer        data,
                                                 const gchar    *accel_path,
                                                 guint           accel_key,
@@ -50,12 +58,6 @@ typedef void (*GtkAccelMapForeach)           (gpointer        data,
 
 /* --- public API --- */
 
-#ifdef G_OS_WIN32
-/* Reserve old names for DLL ABI backward compatibility */
-#define gtk_accel_map_load gtk_accel_map_load_utf8
-#define gtk_accel_map_save gtk_accel_map_save_utf8
-#endif
-
 void      gtk_accel_map_add_entry      (const gchar            *accel_path,
                                         guint                   accel_key,
                                         GdkModifierType         accel_mods);
@@ -86,16 +88,6 @@ GType        gtk_accel_map_get_type (void) G_GNUC_CONST;
 GtkAccelMap *gtk_accel_map_get      (void);
 
 
-/* --- internal API --- */
-void           _gtk_accel_map_init             (void);
-
-void            _gtk_accel_map_add_group        (const gchar   *accel_path,
-                                                 GtkAccelGroup *accel_group);
-void            _gtk_accel_map_remove_group     (const gchar   *accel_path,
-                                                 GtkAccelGroup *accel_group);
-gboolean       _gtk_accel_path_is_valid         (const gchar   *accel_path);
-
-
 G_END_DECLS
 
 #endif /* __GTK_ACCEL_MAP_H__ */