X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkdebug.h;h=ecc9a70d75193be266f89da1f671d4e013d96e22;hb=d97861bd8b338c3d25d7ffb5496edee9eee9bfbb;hp=ff1c0e74a28211656d97282185e45d3dadadd703;hpb=eabb63be3b323c00beb37af412d2d1e68bf27c8e;p=~andy%2Fgtk

diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index ff1c0e74a..ecc9a70d7 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -12,60 +12,58 @@
  * 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/>.
  */
 
 /*
  * 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/.
  */
 
 #ifndef __GTK_DEBUG_H__
 #define __GTK_DEBUG_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <glib.h>
 
 G_BEGIN_DECLS
 
 typedef enum {
-  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_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,
+  GTK_DEBUG_NO_CSS_CACHE    = 1 << 13
 } 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
+#endif /* G_ENABLE_DEBUG */
 
-GTKVAR guint gtk_debug_flags;
+guint gtk_get_debug_flags (void);
+void  gtk_set_debug_flags  (guint flags);
 
 G_END_DECLS