X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/2a3fe554189ec0e25f65ccb7c06b9705794d0f15..54156c626b7377cd012b1de85679801d59da8a09:/disobedience/disobedience.h

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 29215cd..21f3bf6 100644
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -47,6 +47,7 @@
 #include "selection.h"
 #include "kvp.h"
 #include "eventdist.h"
+#include "split.h"
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -86,13 +87,14 @@ struct callbackdata {
  * have some callbacks to set them appropriately.
  */
 struct tabtype {
-  int (*properties_sensitive)(GtkWidget *tab);
-  int (*selectall_sensitive)(GtkWidget *tab);
-  int (*selectnone_sensitive)(GtkWidget *tab);
-  void (*properties_activate)(GtkWidget *tab);
-  void (*selectall_activate)(GtkWidget *tab);
-  void (*selectnone_activate)(GtkWidget *tab);
+  int (*properties_sensitive)(void *extra);
+  int (*selectall_sensitive)(void *extra);
+  int (*selectnone_sensitive)(void *extra);
+  void (*properties_activate)(void *extra);
+  void (*selectall_activate)(void *extra);
+  void (*selectnone_activate)(void *extra);
   void (*selected)(void);
+  void *extra;
 };
 
 /** @brief Button definitions */
@@ -264,35 +266,6 @@ void load_settings(void);
 void set_tool_colors(GtkWidget *w);
 void popup_settings(void);
 
-/* Widget leakage debugging rubbish ---------------------------------------- */
-
-#if MDEBUG
-#define NW(what) do {                                   \
-  if(++current##what % 100 > max##what) {               \
-    fprintf(stderr, "%s:%d: %d %s\n",                   \
-            __FILE__, __LINE__, current##what, #what);  \
-    max##what = current##what;                          \
-  }                                                     \
-} while(0)
-#define WT(what) static int current##what, max##what
-#define DW(what) (--current##what)
-#else
-#define NW(what) do { } while(0)
-#define DW(what) do { } while(0)
-#define WT(what) struct neverused
-#endif
-
-#if MTRACK
-extern const char *mtag;
-#define MTAG(x) do { mtag = x; } while(0)
-#define MTAG_PUSH(x) do { const char *save_mtag = mtag; mtag = x; (void)0
-#define MTAG_POP() mtag = save_mtag; } while(0)
-#else
-#define MTAG(x) do { } while(0)
-#define MTAG_PUSH(x) do {} while(0)
-#define MTAG_POP() do {} while(0)
-#endif
-
 #endif /* DISOBEDIENCE_H */
 
 /*