Changeset 5875f955 in git


Ignore:
Timestamp:
17/06/10 16:44:24 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
svn/1.0, svn/tags/1.0.40
Children:
e30c2a3
Parents:
866a9a5
Message:

src/gfxcore.cc: wxDC::BeginDrawing?() and wxDC::EndDrawing?() are
deprecated in wx2.6 and removed in wx2.8 if you disable 2.6
compatibility. Still needed in wx2.4 for wxmsw so wrap them
in wx version checks.

git-svn-id: file:///home/survex-svn/survex/branches/1.0@3446 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r866a9a5 r5875f955  
     1Thu Jun 17 15:43:04 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * src/gfxcore.cc: wxDC::BeginDrawing() and wxDC::EndDrawing() are
     4          deprecated in wx2.6 and removed in wx2.8 if you disable 2.6
     5          compatibility.  Still needed in wx2.4 for wxmsw so wrap them
     6          in wx version checks.
     7
    18Thu Jun 17 15:42:29 GMT 2010  Olly Betts <olly@survex.com>
    29
  • src/gfxcore.cc

    r866a9a5 r5875f955  
    55//
    66//  Copyright (C) 2000-2001, Mark R. Shinwell.
    7 //  Copyright (C) 2001-2003,2004,2005 Olly Betts
     7//  Copyright (C) 2001-2003,2004,2005,2010 Olly Betts
    88//
    99//  This program is free software; you can redistribute it and/or modify
     
    1919//  You should have received a copy of the GNU General Public License
    2020//  along with this program; if not, write to the Free Software
    21 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     21//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    2222//
    2323
     
    655655    m_HitTestGridValid = false;
    656656
     657#if !wxCHECK_VERSION(2,6,0)
    657658    m_DrawDC.BeginDrawing();
     659#endif
    658660
    659661    // Set the font.
     
    818820    }
    819821
     822#if !wxCHECK_VERSION(2,6,0)
    820823    m_DrawDC.EndDrawing();
     824#endif
    821825
    822826    drawtime = timer.Time();
     
    843847    const wxRegion& region = GetUpdateRegion();
    844848
     849#if !wxCHECK_VERSION(2,6,0)
    845850    dc.BeginDrawing();
     851#endif
    846852
    847853    // Get the areas to redraw and update them.
     
    882888    }
    883889
     890#if !wxCHECK_VERSION(2,6,0)
    884891    dc.EndDrawing();
     892#endif
    885893}
    886894
Note: See TracChangeset for help on using the changeset viewer.