DESKADV: Update for changes in upstream master graphics API.

Also, fixed set-but-not used warning on unfinished inventory scroll bar
code.