← Back to branch summary

~ubuntu-branches/ubuntu/wily/wxwidgets3.0/wily-proposed

« back to all changes in this revision

Viewing changes to src/osx/window_osx.cpp

  • Committer: Package Import Robot
  • Author(s): Olly Betts, Olly Betts, Christian Beier
  • Date: 2014-10-07 13:12:10 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20141007131210-3oyq1x092j6fd8ib
Tags: 3.0.2-1
http://bugs.debian.org/762134
http://bugs.debian.org/745887
[ Olly Betts ]

* New upstream release:
  - wxTR_EDIT_LABELS now works again.  (Closes: #762134)
* Disable gcc4.9-workaround.patch, as GCC is now fixed in jessie and this
  bug is new in 4.9 so wheezy was never affected.

[ Christian Beier ]

* debian/control.in: Add BD on libnotify-dev to enable use of libnotify.
  (Closes: #745887)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/osx/window_osx.cpp
1607
1607
    if ( IsTopLevel() )
1608
1608
        return ;
1609
1609
 
1610
 
    bool hasFocus = GetPeer()->NeedsFocusRect() && HasFocus();
1611
 
 
1612
1610
    // back to the surrounding frame rectangle
1613
1611
    int tx,ty,tw,th;
1614
1612
 
1616
1614
    GetPeer()->GetPosition( tx, ty );
1617
1615
 
1618
1616
#if wxOSX_USE_COCOA_OR_CARBON
1619
 
 
1620
1617
    {
 
1618
        const bool hasFocus = GetPeer()->NeedsFocusRect() && HasFocus();
 
1619
 
1621
1620
        CGRect cgrect = CGRectMake( tx-1 , ty-1 , tw+2 ,
1622
1621
            th+2 ) ;
1623
1622