mirror of
https://github.com/cookiengineer/audacity
synced 2025-08-03 01:19:24 +02:00
Merge branch 'master' into HEAD
This commit is contained in:
commit
fe06ab2dbb
@ -11,7 +11,7 @@ Paul Licameli split from TrackPanel.cpp
|
||||
#ifndef __AUDACITY_TRACK_PANEL_RESIZE_HANDLE__
|
||||
#define __AUDACITY_TRACK_PANEL_RESIZE_HANDLE__
|
||||
|
||||
#include "CommonTrackPanelCell.h"
|
||||
#include "tracks/ui/CommonTrackPanelCell.h"
|
||||
#include "UIHandle.h"
|
||||
|
||||
struct HitTestResult;
|
||||
|
@ -144,7 +144,7 @@ AButton *ControlToolBar::MakeButton(teBmps eEnabledUp, teBmps eEnabledDown, teBm
|
||||
r->SetLabel(label);
|
||||
enum { deflation =
|
||||
#ifdef __WXMAC__
|
||||
3
|
||||
6
|
||||
#else
|
||||
12
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user