gtk: clean up the private horror

- add gtkmodulesprivate.h and move stuff there from gtkprivate.h
- add gtkprivate.c and move stuff there from gtkmain.c
- add gtkwin32.c and move stuff there from gtkmain.c
- don't redefine GTK_DATADIR and friends in gtkprivate.h
- have _gtk_get_datadir() and friends on all platforms
- remove the horrid hacks where gtkprivate.h can't be included,
  or must be included later due to redefinition of the compile-time
  directories

1 files changed, 44 insertions, 0 deletions

diff --git a/gtk/gtkmodulesprivate.h b/gtk/gtkmodulesprivate.h
new file mode 100644
index 0000000000..88f1c5e7cf
--- /dev/null
+++ b/gtk/gtkmodulesprivate.h
@@ -0,0 +1,44 @@
+/* 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_MODULES_PRIVATE_H__
+#define __GTK_MODULES_PRIVATE_H__
+
+G_BEGIN_DECLS
+
+gchar  * _gtk_find_module              (const gchar  *name,
+                                        const gchar  *type);
+gchar ** _gtk_get_module_path          (const gchar  *type);
+
+void     _gtk_modules_init             (gint          *argc,
+                                        gchar       ***argv,
+                                        const gchar   *gtk_modules_args);
+void     _gtk_modules_settings_changed (GtkSettings   *settings,
+                                        const gchar   *modules);
+
+G_END_DECLS
+
+#endif /* __GTK_MODULES_PRIVATE_H__ */