diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-10 13:35:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-10 13:35:36 +0100 |
| commit | e18ebfab7383efc601d3024687f9761419006184 (patch) | |
| tree | e2485ccb083e4420a96db95af591c68e719af580 /src/wx/wx_util.cc | |
| parent | adb9882ec12fecb0bbb1925a46c8e63368f9e2b5 (diff) | |
Remove erroneous trimmer.cc; use copy for FFMpeg filter passthrough.
Diffstat (limited to 'src/wx/wx_util.cc')
| -rw-r--r-- | src/wx/wx_util.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index c5887e17d..1a15b0e98 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -40,7 +40,11 @@ using namespace boost; * @param prop Proportion to pass when calling Add() on the wxSizer. */ wxStaticText * +#ifdef __WXOSX__ add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop) +#else +add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool, int prop) +#endif { int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT; #ifdef __WXOSX__ @@ -55,7 +59,11 @@ add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool left, int prop) } wxStaticText * +#ifdef __WXOSX__ add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span) +#else +add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPosition pos, wxGBSpan span) +#endif { int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT; #ifdef __WXOSX__ |