TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

add NotifyCategoryDefName

Browse Source
This commit is contained in:
David Rose 2003-03-04 17:21:31 +00:00
parent 962ad397c3
commit c54e7d572b
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dtool/src/dconfig/notifyCategoryProxy.h
View File

@ -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

18
panda/src/pnmimagetypes/config_pnmimagetypes.cxx
View File

@ -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", "");