From c54e7d572b9828f4f76354f466a6eb1dfd92646c Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Tue, 4 Mar 2003 17:21:31 +0000
Subject: [PATCH] add NotifyCategoryDefName

---
 dtool/src/dconfig/notifyCategoryProxy.h        |  8 ++++++--
 .../src/pnmimagetypes/config_pnmimagetypes.cxx | 18 +++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/dtool/src/dconfig/notifyCategoryProxy.h b/dtool/src/dconfig/notifyCategoryProxy.h
index 0445dc1d97..8019133d92 100644
--- a/dtool/src/dconfig/notifyCategoryProxy.h
+++ b/dtool/src/dconfig/notifyCategoryProxy.h
@@ -165,10 +165,11 @@ INLINE ostream &operator << (ostream &out, NotifyCategoryProxy<GetCategory> &pro
 // (e.g. parent_cat), or it may be the quoted fullname of the parent.
 
 #ifdef CPPPARSER
+#define NotifyCategoryDefName(basename, actual_name, parent_category)
 #define NotifyCategoryDef(basename, parent_category)
 
 #else
-#define NotifyCategoryDef(basename, parent_category) \
+#define NotifyCategoryDefName(basename, actual_name, parent_category) \
   NotifyCategoryProxy<NotifyCategoryGetCategory_ ## basename> basename ## _cat; \
   static NotifyCategoryGetCategory_ ## basename force_init_ ## basename ## _cat; \
   NotifyCategoryGetCategory_ ## basename:: \
@@ -177,8 +178,11 @@ INLINE ostream &operator << (ostream &out, NotifyCategoryProxy<GetCategory> &pro
   } \
   NotifyCategory *NotifyCategoryGetCategory_ ## basename:: \
   get_category() { \
-    return Notify::ptr()->get_category(string(#basename), parent_category); \
+    return Notify::ptr()->get_category(string(actual_name), parent_category); \
   }
+#define NotifyCategoryDef(basename, parent_category) \
+  NotifyCategoryDefName(basename, #basename, parent_category);
+
 #endif // CPPPARSER
 
 
diff --git a/panda/src/pnmimagetypes/config_pnmimagetypes.cxx b/panda/src/pnmimagetypes/config_pnmimagetypes.cxx
index 44b33708cb..53538a2e7a 100644
--- a/panda/src/pnmimagetypes/config_pnmimagetypes.cxx
+++ b/panda/src/pnmimagetypes/config_pnmimagetypes.cxx
@@ -40,15 +40,15 @@
 #include "dconfig.h"
 
 Configure(config_pnmimagetypes);
-NotifyCategoryDef(pnmimage_sgi, pnmimage_cat);
-NotifyCategoryDef(pnmimage_alias, pnmimage_cat);
-NotifyCategoryDef(pnmimage_tiff, pnmimage_cat);
-NotifyCategoryDef(pnmimage_tga, pnmimage_cat);
-NotifyCategoryDef(pnmimage_img, pnmimage_cat);
-NotifyCategoryDef(pnmimage_soft, pnmimage_cat);
-NotifyCategoryDef(pnmimage_bmp, pnmimage_cat);
-NotifyCategoryDef(pnmimage_jpg, pnmimage_cat);
-NotifyCategoryDef(pnmimage_jpg2000, pnmimage_cat);
+NotifyCategoryDefName(pnmimage_sgi, "sgi", pnmimage_cat);
+NotifyCategoryDefName(pnmimage_alias, "alias", pnmimage_cat);
+NotifyCategoryDefName(pnmimage_tiff, "tiff", pnmimage_cat);
+NotifyCategoryDefName(pnmimage_tga, "tga", pnmimage_cat);
+NotifyCategoryDefName(pnmimage_img, "img", pnmimage_cat);
+NotifyCategoryDefName(pnmimage_soft, "soft", pnmimage_cat);
+NotifyCategoryDefName(pnmimage_bmp, "bmp", pnmimage_cat);
+NotifyCategoryDefName(pnmimage_jpg, "jpg", pnmimage_cat);
+NotifyCategoryDefName(pnmimage_jpg2000, "jpg2000", pnmimage_cat);
 
 int sgi_storage_type = STORAGE_RLE;
 const string sgi_imagename = config_pnmimagetypes.GetString("sgi-imagename", "");