openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fixed the bug where dialog controls were not drawn.

Browse Source 
git-svn-id: http://openexile.googlecode.com/svn/trunk@25 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-04-19 17:48:22 +00:00
parent 4c78d68b2b
commit 457bbe3e85
13 changed files with 105 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
osx/Blades of Exile Char Editor/pc.fileio.cpp
View File

@@ -112,69 +112,50 @@ void load_file()
BlockMoveData(&typeList, (*type_list)->osType, 2 * sizeof(OSType));
}
if (sys_7_avail == FALSE) {
/* not reached when using Carbon */
if (ae_loading == FALSE) {
//StandardGetFile(NULL,1,type_list,&s_reply);
// StandardGetFile is not available in Carbon -jmr
/* XXX FIXME general lack of error checking in these nav services calls */
NavGetDefaultDialogCreationOptions(&dialogOptions);
NavCreateChooseFileDialog(&dialogOptions, type_list, NULL,
NULL, NULL, NULL, &theDialog);
NavDialogRun(theDialog);
theAction = NavDialogGetUserAction(theDialog);
if (theAction == kNavUserActionCancel || theAction == kNavUserActionNone) {
NavDialogDispose(theDialog);
return;
}
NavDialogGetReply(theDialog, &dialogReply);
/* SFPGetFile(where,message, NULL, 1, type_list, NULL, &reply,-2000,NULL);
if (reply.good == 0) {
return;
}
if ((error = FSOpen(reply.fName,reply.vRefNum,&file_id)) > 0){
FCD(1064,0);
SysBeep(2);
return;
} */
}
else {
if (ae_loading == FALSE) {
//StandardGetFile(NULL,1,type_list,&s_reply);
// StandardGetFile is not available in Carbon -jmr
/* XXX FIXME general lack of error checking in these nav services calls */
NavGetDefaultDialogCreationOptions(&dialogOptions);
NavCreateChooseFileDialog(&dialogOptions, type_list, NULL,
NULL, NULL, NULL, &theDialog);
NavDialogRun(theDialog);
theAction = NavDialogGetUserAction(theDialog);
if (theAction == kNavUserActionCancel || theAction == kNavUserActionNone) {
NavDialogDispose(theDialog);
return;
}
NavDialogGetReply(theDialog, &dialogReply);
AECountItems(&(dialogReply.selection), &descCount);
for (descNum = 1 ; descNum <= descCount ; descNum++) {
DescType returnedType;
Size actualSize;
AEGetNthPtr(&(dialogReply.selection), descNum, typeWildCard,
&dummyKeyword, &returnedType, (Ptr)(&fileRef),
sizeof(fileRef), &actualSize);
/* we'd get typeFSS on classic Mac OS, but I have omitted that check due to laziness -jmr */
if (returnedType == typeFSRef)
break;
}
if (descNum > descCount) {
/* no valid file reference came back from the dialog - shouldn't happen... */
NavDisposeReply(&dialogReply);
NavDialogDispose(theDialog);
return;
}
FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL,
NULL, &file_to_load, NULL);
AECountItems(&(dialogReply.selection), &descCount);
for (descNum = 1 ; descNum <= descCount ; descNum++) {
DescType returnedType;
Size actualSize;
AEGetNthPtr(&(dialogReply.selection), descNum, typeWildCard,
&dummyKeyword, &returnedType, (Ptr)(&fileRef),
sizeof(fileRef), &actualSize);
/* we'd get typeFSS on classic Mac OS, but I have omitted that check due to laziness -jmr */
if (returnedType == typeFSRef)
break;
}
if (descNum > descCount) {
/* no valid file reference came back from the dialog - shouldn't happen... */
NavDisposeReply(&dialogReply);
NavDialogDispose(theDialog);
return;
}
if ((error = FSpOpenDF(&file_to_load,1,&file_id)) != 0) {
FCD(1064,0);
SysBeep(2);
return;
}
FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL,
NULL, &file_to_load, NULL);
NavDisposeReply(&dialogReply);
NavDialogDispose(theDialog);
}
if ((error = FSpOpenDF(&file_to_load,1,&file_id)) != 0) {
FCD(1064,0);
SysBeep(2);
return;
}
file_size = sizeof(party_record_type);

18
osx/Blades of Exile Char Editor/pc.main.cpp
View File

@@ -145,15 +145,13 @@ int main(void)
// register_flag = get_reg_data();
load_sounds();
if (sys_7_avail == TRUE) {
set_up_apple_events();
}
set_up_apple_events();
menu_bar_handle = GetNewMBar(128);
if (menu_bar_handle == NIL) {
SysBeep(2);
ExitToShell();
}
}
SetMenuBar(menu_bar_handle);
DisposeHandle(menu_bar_handle);
@@ -784,12 +782,12 @@ void update_item_menu()
}
}
void set_cursor(CursHandle which_curs)
{
HLock ((Handle) which_curs);
SetCursor (*which_curs);
HUnlock((Handle) which_curs);
}
//void set_cursor(CursHandle which_curs)
//{
// HLock ((Handle) which_curs);
// SetCursor (*which_curs);
// HUnlock((Handle) which_curs);
//}
void find_quickdraw() {
OSErr err;