diff --git a/src/interface.cpp b/src/interface.cpp
index f7a2bc47fd799b4ff903dcf6c389c5cd5101df74..1ad90c58c5746f1dfde172fc477b812407357fd3 100644 (file)
--- a/src/interface.cpp
+++ b/src/interface.cpp
#include "event-context.h"
#include "gradient-drag.h"
+// Include Mac OS X menu synchronization on native OSX build
+#ifdef GDK_WINDOWING_QUARTZ
+#include "ige-mac-menu.h"
+#endif
+
using Inkscape::IO::StringOutputStream;
using Inkscape::IO::Base64OutputStream;
} ui_drop_target_info;
static GtkTargetEntry ui_drop_target_entries [] = {
- {"text/uri-list", 0, URI_LIST},
- {"image/svg+xml", 0, SVG_XML_DATA},
- {"image/svg", 0, SVG_DATA},
- {"image/png", 0, PNG_DATA},
- {"image/jpeg", 0, JPEG_DATA},
+ {(gchar *)"text/uri-list", 0, URI_LIST },
+ {(gchar *)"image/svg+xml", 0, SVG_XML_DATA },
+ {(gchar *)"image/svg", 0, SVG_DATA },
+ {(gchar *)"image/png", 0, PNG_DATA },
+ {(gchar *)"image/jpeg", 0, JPEG_DATA },
#if ENABLE_MAGIC_COLORS
- {"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
+ {(gchar *)"application/x-inkscape-color", 0, APP_X_INKY_COLOR},
#endif // ENABLE_MAGIC_COLORS
- {"application/x-color", 0, APP_X_COLOR}
+ {(gchar *)"application/x-color", 0, APP_X_COLOR }
};
static GtkTargetEntry *completeDropTargets = 0;
desktop_widget->window = win;
- /* fixme: doesn't allow making window any smaller than this */
- win->set_default_size(640, 480);
-
win->set_data("desktop", desktop);
win->set_data("desktopwidget", desktop_widget);
{
GtkWidget *mbar = gtk_menu_bar_new();
+#ifdef GDK_WINDOWING_QUARTZ
+ ige_mac_menu_set_menu_bar(GTK_MENU_SHELL(mbar));
+#endif
+
sp_ui_build_dyn_menus(inkscape_get_menus(INKSCAPE), mbar, view);
+#ifdef GDK_WINDOWING_QUARTZ
+ return NULL;
+#else
return mbar;
+#endif
}
static void leave_group(GtkMenuItem *, SPDesktop *desktop) {
( !SP_OBJECT_STYLE(item)->stroke.isNone() ?
desktop->current_zoom() *
SP_OBJECT_STYLE (item)->stroke_width.computed *
- sp_item_i2d_affine (item).expansion() * 0.5
+ NR::expansion(from_2geom(sp_item_i2d_affine(item))) * 0.5
: 0.0)
+ prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);