diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-12-08 23:09:46 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-12-08 23:09:46 +0000 |
| commit | b57dcebd2f4efb8babd1219d5344400640cb1ac7 (patch) | |
| tree | f1349cbf7ab26d4ec5242d3cbc36a4ef2672ebe4 /src/ui | |
| parent | Fix a bug delete BSpline LPE from a path retain some BSpline properties (diff) | |
| parent | patch by Adolf Mathias and ~suv for Bug 1136495 (diff) | |
| download | inkscape-b57dcebd2f4efb8babd1219d5344400640cb1ac7.tar.gz inkscape-b57dcebd2f4efb8babd1219d5344400640cb1ac7.zip | |
Update to trunk
(bzr r11950.1.207)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/export.cpp | 10 | ||||
| -rw-r--r-- | src/ui/dialog/swatches.cpp | 2 | ||||
| -rw-r--r-- | src/ui/tool/transform-handle-set.cpp | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index 8ea1a09fa..2cfdacb3d 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -1343,7 +1343,15 @@ void Export::onBrowse () wcsncpy(_filename, reinterpret_cast<wchar_t*>(utf16_path_string), _MAX_PATH); g_free(utf16_path_string); - opf.hwndOwner = (HWND)(GDK_WINDOW_HWND(gtk_widget_get_window(GTK_WIDGET(this)))); + SPDesktop *desktop = SP_ACTIVE_DESKTOP; + Glib::RefPtr<const Gdk::Window> parentWindow = desktop->getToplevel()->get_window(); + g_assert(parentWindow->gobj() != NULL); + +#if WITH_GTKMM_3_0 + opf.hwndOwner = (HWND)gdk_win32_window_get_handle((GdkWindow*)parentWindow->gobj()); +#else + opf.hwndOwner = (HWND)gdk_win32_drawable_get_handle((GdkDrawable*)parentWindow->gobj()); +#endif opf.lpstrFilter = filter_string; opf.lpstrCustomFilter = 0; opf.nMaxCustFilter = 0L; diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index d4d80c9b1..1e5baffd2 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -247,7 +247,7 @@ gboolean colorItemHandleButtonPress( GtkWidget* widget, GdkEventButton* event, g { gboolean handled = FALSE; - if ( (event->button == 3) && (event->type == GDK_BUTTON_PRESS) ) { + if ( event && (event->button == 3) && (event->type == GDK_BUTTON_PRESS) ) { SwatchesPanel* swp = findContainingPanel( widget ); if ( !popupMenu ) { diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp index f21e1661a..7d5c9bf0c 100644 --- a/src/ui/tool/transform-handle-set.cpp +++ b/src/ui/tool/transform-handle-set.cpp @@ -450,7 +450,7 @@ protected: virtual Glib::ustring _getDragTip(GdkEventMotion */*event*/) const { return format_tip(C_("Transform handle tip", "Rotate by %.2f°"), - _last_angle * 360.0); + _last_angle * 180.0 / M_PI); } virtual bool _hasDragTips() const { return true; } |