mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-06 06:44:57 +01:00
merge 3.0 from 2.0-ongoing@3243
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
9aa8af5a28
commit
cb41314642
100 changed files with 17534 additions and 4036 deletions
|
|
@ -39,9 +39,9 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
|
|||
bool start_updating(GdkEventAny*);
|
||||
bool stop_updating(GdkEventAny*);
|
||||
|
||||
virtual void activate ();
|
||||
virtual void deactivate ();
|
||||
|
||||
void activate ();
|
||||
void deactivate ();
|
||||
|
||||
void lower_box_realized ();
|
||||
void on_realize ();
|
||||
void on_show ();
|
||||
|
|
@ -57,7 +57,7 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
|
|||
boost::shared_ptr<ARDOUR::AUPlugin> au;
|
||||
int prefheight;
|
||||
int prefwidth;
|
||||
|
||||
|
||||
Gtk::HBox top_box;
|
||||
Gtk::EventBox low_box;
|
||||
Gtk::VBox vpacker;
|
||||
|
|
@ -81,6 +81,7 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
|
|||
WindowRef carbon_window;
|
||||
EventHandlerRef carbon_event_handler;
|
||||
bool _activating_from_app;
|
||||
NSView* packView;
|
||||
|
||||
bool test_cocoa_view_support ();
|
||||
bool test_carbon_view_support ();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue