Bug 131920 – gtkNotebook sends incorrect switch_page value

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

diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h
index 86935ee1bb18fcb36a9ed1766122d42bc985d3d1..690cc8a34f80802870408fc3c9346156707f1184 100644 (file)
--- a/gtk/gtkprivate.h
+++ b/gtk/gtkprivate.h
@@ -32,10 +32,7 @@
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 /* The private flags that are used in the private_flags member of GtkWidget.
  */
@@ -80,11 +77,14 @@ typedef enum
 
 #ifdef G_OS_WIN32
 
+const gchar *_gtk_get_datadir ();
 const gchar *_gtk_get_libdir ();
 const gchar *_gtk_get_sysconfdir ();
 const gchar *_gtk_get_localedir ();
 const gchar *_gtk_get_data_prefix ();
 
+#undef GTK_DATADIR
+#define GTK_DATADIR _gtk_get_datadir ()
 #undef GTK_LIBDIR
 #define GTK_LIBDIR _gtk_get_libdir ()
 #undef GTK_LOCALEDIR
@@ -96,8 +96,14 @@ const gchar *_gtk_get_data_prefix ();
 
 #endif /* G_OS_WIN32 */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+gboolean _gtk_fnmatch (const char *pattern,
+                      const char *string,
+                      gboolean    no_leading_period);
+
+#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+
+G_END_DECLS
 
 #endif /* __GTK_PRIVATE_H__ */