#undef Marker
#define Marker FuckYouAppleAndYourLackOfNameSpaces
+#include <gtkmm/button.h>
+#include <gdk/gdkquartz.h>
+
#include "pbd/convert.h"
#include "pbd/error.h"
#undef check // stupid gtk, stupid apple
-#include <gtkmm/button.h>
-#include <gdk/gdkquartz.h>
-
#include <gtkmm2ext/utils.h>
#include "au_pluginui.h"
using namespace ARDOUR;
using namespace Gtk;
using namespace Gtkmm2ext;
-using namespace sigc;
using namespace std;
using namespace PBD;
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(cocoaParentActivationHandler:)
name:NSWindowDidBecomeMainNotification
- object:nil];
+ object:NULL];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(cocoaParentBecameKeyHandler:)
name:NSWindowDidBecomeKeyNotification
- object:nil];
+ object:NULL];
}
}
}
}
-- (void)auViewResized:(NSNotification *)notification;
+- (void)auViewResized:(NSNotification *)notification
{
(void) notification; // stop complaints about unusued argument
plugin_ui->cocoa_view_resized();
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("tried to create bundle, result = %1\n", viewBundle));
- if (viewBundle == nil) {
+ if (viewBundle == NULL) {
error << _("AUPluginUI: error loading AU view's bundle") << endmsg;
return -1;
} else {
}
// make a factory
id factory = [[[factoryClass alloc] init] autorelease];
- if (factory == nil) {
+ if (factory == NULL) {
error << _("AUPluginUI: Could not create an instance of the AU view factory") << endmsg;
return -1;
}
void
AUPluginUI::cocoa_view_resized ()
{
- GtkRequisition topsize = top_box.size_request ();
NSWindow* window = get_nswindow ();
NSRect windowFrame= [window frame];
NSRect new_frame = [au_view frame];
/* move the au_view down so that it doesn't overlap the top_box contents */
- NSPoint origin = { 0, static_cast<CGFloat> (a.height) };
+ const int spacing = 6; // main vbox spacing
+ const int pad = 4; // box pad
+
+ NSPoint origin = { spacing + pad, static_cast<CGFloat> (a.height) + (2 * spacing) + pad };
[au_view setFrameOrigin:origin];
- [view addSubview:au_view positioned:NSWindowBelow relativeTo:nil];
+ [view addSubview:au_view positioned:NSWindowBelow relativeTo:NULL];
last_au_frame = [au_view frame];
// watch for size changes of the view
- _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:nil andTopLevelParent:win ];
+ _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:NULL andTopLevelParent:win ];
[[NSNotificationCenter defaultCenter] addObserver:_notify
selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification
return 0;
}
+void
+AUPluginUI::grab_focus()
+{
+ if (au_view) {
+ [au_view becomeFirstResponder];
+ }
+}
void
AUPluginUI::forward_key_event (GdkEventKey* ev)
{