diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-01-12 19:02:53 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-01-12 19:02:53 +0000 |
| commit | ad38e0a823da469ba8a4866e0d6c46c87ed1b69c (patch) | |
| tree | 10d2a97375a51ad9ab32e9de58a1fb513e82cdef /src/ui/dialog/export.cpp | |
| parent | Update to trunk (diff) | |
| parent | pass class variables by reference for performance (diff) | |
| download | inkscape-ad38e0a823da469ba8a4866e0d6c46c87ed1b69c.tar.gz inkscape-ad38e0a823da469ba8a4866e0d6c46c87ed1b69c.zip | |
update to trunk
(bzr r12588.1.31)
Diffstat (limited to 'src/ui/dialog/export.cpp')
| -rw-r--r-- | src/ui/dialog/export.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index 8ea1a09fa..340a3dad0 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -813,7 +813,7 @@ void Export::onAreaToggled () /* If we still don't have a filename -- let's build one that's nice */ if (filename.empty()) { - const gchar * id = NULL; + const gchar * id = "object"; const GSList * reprlst = sp_desktop_selection(SP_ACTIVE_DESKTOP)->reprList(); for(; reprlst != NULL; reprlst = reprlst->next) { Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data; @@ -1295,8 +1295,8 @@ void Export::onBrowse () fs = gtk_file_chooser_dialog_new (_("Select a filename for exporting"), (GtkWindow*)desktop->getToplevel(), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_Save"), GTK_RESPONSE_ACCEPT, NULL ); #ifdef WITH_GNOME_VFS @@ -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; |