X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkdebug.h;h=b9fb21803fc31db13ad293181caf9e123fe85d37;hb=8605a2a10a51d5f46e7169358199f2eeb440a0e2;hp=9b7933f66a630db1d7cd0223e44b5750419101fa;hpb=e0833cd52ae264a760fcae04978a245ebdb6ef3a;p=~andy%2Fgtk

diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index 9b7933f66..b9fb21803 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -21,52 +21,51 @@
  * 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/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_DEBUG_H__
 #define __GTK_DEBUG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <glib.h>
+
+G_BEGIN_DECLS
 
 typedef enum {
-  GTK_DEBUG_OBJECTS    = 1 << 0,
-  GTK_DEBUG_MISC       = 1 << 1,
-  GTK_DEBUG_SIGNALS    = 1 << 2,
-  GTK_DEBUG_DND        = 1 << 3,
-  GTK_DEBUG_PLUGSOCKET = 1 << 4,
-  GTK_DEBUG_TEXT =       1 << 5
+  GTK_DEBUG_MISC            = 1 << 0,
+  GTK_DEBUG_PLUGSOCKET      = 1 << 1,
+  GTK_DEBUG_TEXT            = 1 << 2,
+  GTK_DEBUG_TREE            = 1 << 3,
+  GTK_DEBUG_UPDATES         = 1 << 4,
+  GTK_DEBUG_KEYBINDINGS     = 1 << 5,
+  GTK_DEBUG_MULTIHEAD       = 1 << 6,
+  GTK_DEBUG_MODULES         = 1 << 7,
+  GTK_DEBUG_GEOMETRY        = 1 << 8,
+  GTK_DEBUG_ICONTHEME       = 1 << 9,
+  GTK_DEBUG_PRINTING        = 1 << 10,
+  GTK_DEBUG_BUILDER         = 1 << 11,
+  GTK_DEBUG_SIZE_REQUEST    = 1 << 12
 } GtkDebugFlag;
 
 #ifdef G_ENABLE_DEBUG
 
 #define GTK_NOTE(type,action)                G_STMT_START { \
-    if (gtk_debug_flags & GTK_DEBUG_##type)                 \
+    if (gtk_get_debug_flags () & GTK_DEBUG_##type)		    \
        { action; };                          } G_STMT_END
 
 #else /* !G_ENABLE_DEBUG */
 
 #define GTK_NOTE(type, action)
-      
-#endif /* G_ENABLE_DEBUG */
 
-#ifdef G_OS_WIN32
-#  ifdef GTK_COMPILATION
-#    define GTKVAR __declspec(dllexport)
-#  else
-#    define GTKVAR extern __declspec(dllimport)
-#  endif
-#else
-#  define GTKVAR extern
-#endif
-
-GTKVAR guint gtk_debug_flags;
+#endif /* G_ENABLE_DEBUG */
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+guint gtk_get_debug_flags (void);
+void  gtk_set_debug_flags  (guint flags);
 
+G_END_DECLS
 
 #endif /* __GTK_DEBUG_H__ */