← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/osx/cocoa/button.mm

  • Committer: Package Import Robot
  • Author(s): Olly Betts
  • Date: 2014-06-18 12:42:22 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140618124222-y7t2vpsije1cesxy
Tags: 3.0.1-1
* New upstream release
  + Incorporates most of the patches we were carrying - only one left is:
    wx-config-conditionalise-webview-in-std.patch
* Drop versioning of dependencies from run-time libraries to wx-common -
  this will make the transition to the next wx version harder, and also
  makes backporting to wheezy more work.
* Mark -dbg packages as "Multi-Arch: same".
* Correct short descriptions of the webview packages to not just be
  copies of the corresponding media package's short description.
* Wrap 81 character line in package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/osx/cocoa/button.mm
127
127
{
128
128
    NSButton* button = GetNSButton();
129
129
    [button setAlternateImage: bitmap.GetNSImage()];
 
130
#if wxUSE_TOGGLEBTN
130
131
    if ( GetWXPeer()->IsKindOf(wxCLASSINFO(wxToggleButton)) )
131
132
    {
132
133
        [button setButtonType:NSToggleButton];
133
134
    }
134
135
    else
 
136
#endif
135
137
    {
136
138
        [button setButtonType:NSMomentaryChangeButton];
137
139
    }