diff options
| -rw-r--r-- | src/gtk2_in_qt4.cpp | 6 | ||||
| -rw-r--r-- | src/host.c | 2 | ||||
| -rw-r--r-- | src/instance.c | 4 | ||||
| -rw-r--r-- | src/qt4_in_gtk2.cpp | 4 | ||||
| -rw-r--r-- | src/suil_internal.h | 4 | ||||
| -rw-r--r-- | src/x11_in_gtk2.c | 13 | ||||
| -rw-r--r-- | src/x11_in_qt4.cpp | 9 |
7 files changed, 14 insertions, 28 deletions
diff --git a/src/gtk2_in_qt4.cpp b/src/gtk2_in_qt4.cpp index 11f0b1c..cc6bdc9 100644 --- a/src/gtk2_in_qt4.cpp +++ b/src/gtk2_in_qt4.cpp @@ -20,8 +20,8 @@ #include <gtk/gtk.h> #include <gdk/gdkx.h> -#include "suil_internal.h" -#include "suil-config.h" +#include "./suil_internal.h" +#include "./suil-config.h" extern "C" { @@ -81,4 +81,4 @@ suil_wrapper_new(SuilHost* host, return wrapper; } -} // extern "C" +} // extern "C" @@ -14,7 +14,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "suil_internal.h" +#include "./suil_internal.h" SUIL_API SuilHost* diff --git a/src/instance.c b/src/instance.c index 92c61f9..3b927db 100644 --- a/src/instance.c +++ b/src/instance.c @@ -20,8 +20,8 @@ #include <stdlib.h> #include <string.h> -#include "suil-config.h" -#include "suil_internal.h" +#include "./suil-config.h" +#include "./suil_internal.h" #define GTK2_UI_URI NS_UI "GtkUI" #define QT4_UI_URI NS_UI "Qt4UI" diff --git a/src/qt4_in_gtk2.cpp b/src/qt4_in_gtk2.cpp index 3e66598..2c0124a 100644 --- a/src/qt4_in_gtk2.cpp +++ b/src/qt4_in_gtk2.cpp @@ -20,7 +20,7 @@ #include <QX11EmbedWidget> #include <QVBoxLayout> -#include "suil_internal.h" +#include "./suil_internal.h" extern "C" { @@ -146,4 +146,4 @@ suil_wrapper_new(SuilHost* host, return wrapper; } -} // extern "C" +} // extern "C" diff --git a/src/suil_internal.h b/src/suil_internal.h index cfb3cd5..52fa7ee 100644 --- a/src/suil_internal.h +++ b/src/suil_internal.h @@ -20,8 +20,6 @@ #include <assert.h> #include <stdlib.h> -#include "lv2/lv2plug.in/ns/extensions/ui/ui.h" - #ifdef _WIN32 #include <windows.h> #define dlopen(path, flags) LoadLibrary(path) @@ -32,6 +30,8 @@ static inline char* dlerror(void) { return "Unknown error"; } #include <dlfcn.h> #endif +#include "lv2/lv2plug.in/ns/extensions/ui/ui.h" + #include "suil/suil.h" #define NS_UI "http://lv2plug.in/ns/extensions/ui#" diff --git a/src/x11_in_gtk2.c b/src/x11_in_gtk2.c index 22f39fc..0fae7a5 100644 --- a/src/x11_in_gtk2.c +++ b/src/x11_in_gtk2.c @@ -17,10 +17,8 @@ #include <string.h> #include <gtk/gtk.h> -//#include <gdk/gdkx.h> -//#include <X11/Xlib.h> -#include "suil_internal.h" +#include "./suil_internal.h" #define SUIL_TYPE_X11_WRAPPER (suil_x11_wrapper_get_type()) #define SUIL_X11_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SUIL_TYPE_X11_WRAPPER, SuilX11Wrapper)) @@ -69,15 +67,6 @@ suil_x11_wrapper_realize(GtkWidget* w, gpointer data) SuilX11Wrapper* const wrap = SUIL_X11_WRAPPER(w); GtkSocket* const socket = GTK_SOCKET(w); - /* - GdkWindow* wrap_win = GTK_WIDGET(wrap)->window; - Display* display = GDK_WINDOW_XDISPLAY(wrap_win); - Window win = wrap->id; - XWindowAttributes attr; - XGetWindowAttributes(display, win, &attr); - printf("WIDTH: %d HEIGHT: %d\n", attr.width, attr.height); - */ - gtk_socket_add_id(socket, gtk_plug_get_id(wrap->plug)); gtk_widget_show_all(GTK_WIDGET(wrap->plug)); } diff --git a/src/x11_in_qt4.cpp b/src/x11_in_qt4.cpp index cfecc04..86e6cc4 100644 --- a/src/x11_in_qt4.cpp +++ b/src/x11_in_qt4.cpp @@ -17,10 +17,8 @@ #include <QX11EmbedContainer> #undef signals -#include "suil_internal.h" -#include "suil-config.h" - -#include <cstdio> +#include "./suil_internal.h" +#include "./suil-config.h" extern "C" { @@ -32,7 +30,6 @@ wrapper_wrap(SuilWrapper* wrapper, QX11EmbedContainer* const wrap = new QX11EmbedContainer(); ew->embedInto(wrap->winId()); - //wrap->embedClient((intptr_t)instance->ui_widget); instance->host_widget = wrap; @@ -69,4 +66,4 @@ suil_wrapper_new(SuilHost* host, return wrapper; } -} // extern "C" +} // extern "C" |