Changeset 9fcc81a in git


Ignore:
Timestamp:
13/08/19 00:59:44 (5 weeks ago)
Author:
Olly Betts <olly@…>
Branches:
master
Children:
9905e22
Parents:
5d7219a4
git-author:
Olly Betts <olly@…> (13/08/19 00:58:37)
git-committer:
Olly Betts <olly@…> (13/08/19 00:59:44)
Message:

Revert "Attempt to work around macOS 10.14 problems"

The we were working around bug is fixed in git ready for wxWidgets 3.0.5
and there's a backported fix in the homebrew wxmac 3.0.4-2 package. We
direct Mac users to use homebrew, so we should no longer need this
workaround.

Closes #101, reported by floho.

This reverts commit 7750c72ceb62e675e3f8be0fdd02a1d42d9b1712.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gfxcore.cc

    r5d7219a4 r9fcc81a  
    376376    // Redraw the window.
    377377
    378 #ifdef __WXMAC__
    379     // Attempt to work around wxPaintDC assertion failure on macOS 10.14:
    380     // https://trac.survex.com/ticket/101
    381     bool reenable_assertions = false;
    382     if (MacGetCGContextRef() == NULL && wxTheAssertHandler != NULL) {
    383         wxTheAssertHandler = NULL;
    384         reenable_assertions = true;
    385     }
    386 #endif
    387 
    388378    // Get a graphics context.
    389379    wxPaintDC dc(this);
    390 
    391 #ifdef __WXMAC__
    392     if (reenable_assertions) {
    393         wxSetDefaultAssertHandler();
    394     }
    395 #endif
    396380
    397381    if (m_HaveData) {
Note: See TracChangeset for help on using the changeset viewer.