diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj index 8f443d329..f5b1f13cc 100644 --- a/mac/Audacity.xcodeproj/project.pbxproj +++ b/mac/Audacity.xcodeproj/project.pbxproj @@ -2675,7 +2675,7 @@ 28D540040FD1912A00FA7C75 /* ScriptCommandRelay.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = ScriptCommandRelay.h; sourceTree = ""; tabWidth = 3; }; 28D587C70E264CF3009C7DEA /* LoadLV2.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = LoadLV2.cpp; path = lv2/LoadLV2.cpp; sourceTree = ""; tabWidth = 3; }; 28D587C80E264CF3009C7DEA /* LoadLV2.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = LoadLV2.h; path = lv2/LoadLV2.h; sourceTree = ""; tabWidth = 3; }; - 28D587C90E264CF4009C7DEA /* LV2Effect.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; name = LV2Effect.cpp; path = lv2/LV2Effect.cpp; sourceTree = ""; tabWidth = 3; }; + 28D587C90E264CF4009C7DEA /* LV2Effect.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 5; indentWidth = 3; name = LV2Effect.cpp; path = lv2/LV2Effect.cpp; sourceTree = ""; tabWidth = 3; }; 28D587CA0E264CF4009C7DEA /* LV2Effect.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; name = LV2Effect.h; path = lv2/LV2Effect.h; sourceTree = ""; tabWidth = 3; }; 28D65C700B97E54B000E001A /* AutoDuck.cpp */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.cpp.cpp; path = AutoDuck.cpp; sourceTree = ""; tabWidth = 3; }; 28D65C710B97E54B000E001A /* AutoDuck.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 3; lastKnownFileType = sourcecode.c.h; path = AutoDuck.h; sourceTree = ""; tabWidth = 3; }; diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp index 22ce5c54b..dd48c3bd0 100644 --- a/src/effects/lv2/LV2Effect.cpp +++ b/src/effects/lv2/LV2Effect.cpp @@ -54,6 +54,10 @@ #include #endif +#if defined(__WXMAC__) +#include +#endif + // Define the static URI nodes #undef URI #define URI(n, u) LilvNode *LV2Effect::n = NULL; @@ -104,7 +108,6 @@ LV2EffectMeter::~LV2EffectMeter() { } - void LV2EffectMeter::OnIdle(wxIdleEvent & WXUNUSED(evt)) { if (mLastValue != mCtrl.mVal) @@ -1478,10 +1481,6 @@ bool LV2Effect::BuildFancy() return false; } -// wxBoxSizer *hs = new wxBoxSizer(wxVERTICAL); -// vs->Add(mContainer, 0, wxALIGN_CENTER); -// mParent->SetSizer(vs); -//wxWindow *mContainer = mParent; #if defined(__WXGTK__) // Make sure the parent has a window if (!gtk_widget_get_window(GTK_WIDGET(mContainer->m_wxwindow))) @@ -1493,6 +1492,7 @@ bool LV2Effect::BuildFancy() #elif defined(__WXMSW__) mParentFeature->data = mContainer->GetHandle(); #elif defined(__WXMAC__) + mParentFeature->data = mContainer->GetHandle(); #endif mInstanceAccessFeature->data = lilv_instance_get_handle(mMaster); @@ -1554,7 +1554,9 @@ bool LV2Effect::BuildFancy() GetWindowRect(widget, &rect); si->SetMinSize(wxSize(rect.right - rect.left, rect.bottom - rect.top)); #elif defined(__WXMAC__) -// si->SetMinSize(wxSize(sz.width, sz.height)); + NSView *view = (NSView *) suil_instance_get_widget(mSuilInstance); + NSSize sz = [view frame].size; + si->SetMinSize(sz.width, sz.height); #endif mParent->SetSizerAndFit(vs);