TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename geticonfilename to avoid link conflict

Browse Source
This commit is contained in:
cxgeorge 2001-03-28 22:37:15 +00:00
parent 0e299ff349
commit 4249c71788
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/wgldisplay/config_wgldisplay.cxx
View File

@ -43,7 +43,7 @@ init_libwgldisplay() {
} }
// cant use global var cleanly because global var static init executed after init_libwgl(), incorrectly reiniting var // cant use global var cleanly because global var static init executed after init_libwgl(), incorrectly reiniting var
Filename get_icon_filename() { Filename get_icon_filename_() {
string iconname = config_wgldisplay.GetString("win32-window-icon",""); string iconname = config_wgldisplay.GetString("win32-window-icon","");
return ExecutionEnvironment::expand_string(iconname); return ExecutionEnvironment::expand_string(iconname);
} }

2
panda/src/wgldisplay/config_wgldisplay.h
View File

@ -12,7 +12,7 @@
NotifyCategoryDecl(wgldisplay, EXPCL_PANDAGL, EXPTP_PANDAGL); NotifyCategoryDecl(wgldisplay, EXPCL_PANDAGL, EXPTP_PANDAGL);
extern Filename get_icon_filename(); extern Filename get_icon_filename_();
extern EXPCL_PANDAGL void init_libwgldisplay(); extern EXPCL_PANDAGL void init_libwgldisplay();

2
panda/src/wgldisplay/wglGraphicsPipe.cxx
View File

@ -38,7 +38,7 @@ wglGraphicsPipe::wglGraphicsPipe(const PipeSpecifier& spec)
wc.lpszMenuName = NULL; wc.lpszMenuName = NULL;
wc.lpszClassName = "wglStandard"; wc.lpszClassName = "wglStandard";
string windows_icon_filename = get_icon_filename().to_os_specific(); string windows_icon_filename = get_icon_filename_().to_os_specific();
if(!windows_icon_filename.empty()) { if(!windows_icon_filename.empty()) {
// Note: LoadImage seems to cause win2k internal heap corruption (outputdbgstr warnings) // Note: LoadImage seems to cause win2k internal heap corruption (outputdbgstr warnings)