Move declaration of wxOwnerDrawnBase::ms_defaultMargin to correct file. Do not include headers when wxUSE_UIACTIONSIMULATOR is disabled. Add guards for wxUSE_DRAG_AND_DROP. Use a different wxFont constructor in printing sample, which is also available in WXQT.