diff --git a/config.inc b/config.inc index 5c8f1f53..d5b86789 100644 --- a/config.inc +++ b/config.inc @@ -8,6 +8,7 @@ .setcpu "6502" .feature string_escapes + .feature line_continuations ;;; Product Info diff --git a/desk.acc/find.files.s b/desk.acc/find.files.s index a6e41f26..0ede0c66 100644 --- a/desk.acc/find.files.s +++ b/desk.acc/find.files.s @@ -161,15 +161,21 @@ pattern: .res 16 ; null-terminated/upcased version ;;; ============================================================ ;;; List Box - DEFINE_LIST_BOX_WINFO winfo_results, kResultsWindowId, kResultsLeft, kResultsTop, kResultsWidth, kResultsHeight, DEFAULT_FONT - - DEFINE_LIST_BOX listbox_rec, winfo_results, kResultsRows, SELF_MODIFIED_BYTE, DrawListEntryProc, NoOp, NoOp + DEFINE_LIST_BOX_WINFO winfo_results, \ + kResultsWindowId, \ + kResultsLeft, \ + kResultsTop, \ + kResultsWidth, \ + kResultsHeight, \ + DEFAULT_FONT + DEFINE_LIST_BOX listbox_rec, winfo_results, \ + kResultsRows, SELF_MODIFIED_BYTE, \ + DrawListEntryProc, NoOp, NoOp + DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec selected_index := listbox_rec::selected_index num_entries := listbox_rec::num_items - DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec - ;;; ============================================================ .proc Init diff --git a/desk.acc/sounds.s b/desk.acc/sounds.s index f756d891..e6b0c4c1 100644 --- a/desk.acc/sounds.s +++ b/desk.acc/sounds.s @@ -158,8 +158,16 @@ nextwinfo: .addr 0 kListBoxWindowId = kDAWindowId + 1 - DEFINE_LIST_BOX_WINFO winfo_listbox, kListBoxWindowId, kListLeft + kDALeft, kListTop + kDATop, kListRight - kListLeft, kListHeight, DEFAULT_FONT - DEFINE_LIST_BOX listbox_rec, winfo_listbox, kListRows, kNumSounds, DrawListEntryProc, OnListSelectionChange, OnListSelectionChange + DEFINE_LIST_BOX_WINFO winfo_listbox, \ + kListBoxWindowId, \ + kListLeft + kDALeft, \ + kListTop + kDATop, \ + kListRight - kListLeft, \ + kListHeight, \ + DEFAULT_FONT + DEFINE_LIST_BOX listbox_rec, winfo_listbox, \ + kListRows, kNumSounds, \ + DrawListEntryProc, OnListSelectionChange, OnListSelectionChange DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec ;;; ============================================================ diff --git a/disk_copy/auxlc.s b/disk_copy/auxlc.s index f0378a48..c32083e2 100644 --- a/disk_copy/auxlc.s +++ b/disk_copy/auxlc.s @@ -386,13 +386,21 @@ kListBoxWidth = 150 kListBoxHeight = kListItemHeight*kListRows-1 kListBoxWindowId = 2 - DEFINE_LIST_BOX_WINFO winfo_drive_select, kListBoxWindowId, kListBoxLeft, kListBoxTop, kListBoxWidth, kListBoxHeight, DEFAULT_FONT + DEFINE_LIST_BOX_WINFO winfo_drive_select, \ + kListBoxWindowId, \ + kListBoxLeft, \ + kListBoxTop, \ + kListBoxWidth, \ + kListBoxHeight, \ + DEFAULT_FONT + DEFINE_LIST_BOX listbox_rec, winfo_drive_select, \ + kListRows, SELF_MODIFIED_BYTE, \ + DrawListEntryProc, NoOp, NoOp + DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec - DEFINE_LIST_BOX listbox_rec, winfo_drive_select, kListRows, SELF_MODIFIED_BYTE, DrawListEntryProc, NoOp, NoOp num_drives := listbox_rec::num_items current_drive_selection := listbox_rec::selected_index - DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec DEFINE_POINT list_entry_pos, 0, 0 diff --git a/lib/file_dialog_res.s b/lib/file_dialog_res.s index 22d60e0f..7b1157b5 100644 --- a/lib/file_dialog_res.s +++ b/lib/file_dialog_res.s @@ -136,7 +136,13 @@ kEntryListCtlWindowID = $3F kExListBoxTop = kFilePickerDlgExTop + 28 .endif - DEFINE_LIST_BOX_WINFO winfo_listbox, kEntryListCtlWindowID, kListBoxLeft, kListBoxTop, kListBoxWidth, kListBoxHeight, FONT + DEFINE_LIST_BOX_WINFO winfo_listbox, \ + kEntryListCtlWindowID, \ + kListBoxLeft, \ + kListBoxTop, \ + kListBoxWidth, \ + kListBoxHeight, \ + FONT .ifdef FD_EXTENDED ;;; Needed in DeskTop (LBTK in Aux, File Dialog in Main) @@ -155,7 +161,9 @@ DrawEntryProc := ::file_dialog_impl__DrawListEntryProc OnSelChange := ::file_dialog_impl__OnListSelectionChange .endif - DEFINE_LIST_BOX listbox_rec, file_dialog_res::winfo_listbox, file_dialog_res::kListRows, SELF_MODIFIED_BYTE, DrawEntryProc, OnSelChange, NoOp + DEFINE_LIST_BOX listbox_rec, file_dialog_res::winfo_listbox, \ + file_dialog_res::kListRows, SELF_MODIFIED_BYTE, \ + DrawEntryProc, OnSelChange, NoOp DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec NoOp: rts