--- np2/macosx/dialog/aboutdlg.cpp 2003/11/13 18:17:43 1.3 +++ np2/macosx/dialog/aboutdlg.cpp 2004/05/23 04:07:57 1.6 @@ -12,6 +12,7 @@ #include "np2ver.h" #include "np2info.h" #include "aboutdlg.h" +#include static WindowRef aboutWin; static PicHandle pict; @@ -19,15 +20,15 @@ const EventTypeSpec list[]={ { kEventCla { kEventClassWindow, kEventWindowShowing }, }; static const char np2infostr[] = \ - "CPU: !CPU !CLOCK\r" \ - "MEM: !MEM1\r" \ - "GDC: !GDC\r" \ - "TEXT: !TEXT\r" \ - "GRPH: !GRPH\r" \ - "SOUND: !EXSND\r" \ + "CPU: %CPU% %CLOCK%\r" \ + "MEM: %MEM1%\r" \ + "GDC: %GDC%\r" \ + "TEXT: %TEXT%\r" \ + "GRPH: %GRPH%\r" \ + "SOUND: %EXSND%\r" \ "\r" \ - "BIOS: !BIOS\r" \ - "RHYTHM: !RHYTHM\r" + "BIOS: %BIOS%\r" \ + "RHYTHM: %RHYTHM%\r" ; static void closeAboutDialog(void) { @@ -57,8 +58,7 @@ static pascal OSStatus cfWinproc(EventHa SizeWindow(aboutWin, 292, 230, true); } else { - ZeroMemory(infostr, sizeof(infostr)); - np2info(infostr, np2infostr, sizeof(infostr)); + np2info(infostr, np2infostr, sizeof(infostr), NULL); SetControlData(more,kControlNoPart,kControlEditTextTextTag,sizeof(infostr), infostr); SetControl32BitValue(getControlRefByID('detl',0,aboutWin),3); SizeWindow(aboutWin, 292, 441, true); @@ -80,10 +80,13 @@ static pascal OSStatus cfWinproc(EventHa switch (GetEventKind(event)) { case kEventWindowShowing: +#if defined(SUPPORT_PC9821) + SetWindowTitleWithCFString(aboutWin, CFSTR("About Neko Project 21x")); +#endif image = getControlRefByID('logo', 0, aboutWin); pict = getBMPfromResource("np2logo.tiff", &bounds); SetControlData(image, kControlNoPart, kControlPictureHandleTag, sizeof(PicHandle), &pict); - version = getControlRefByID('vers', 0, aboutWin); + version = getControlRefByID('vers', 0, aboutWin); SetControlData(version, kControlNoPart, kControlStaticTextTextTag, sizeof(NP2VER_CORE), NP2VER_CORE); err=noErr; break;