diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-12-01 16:35:17 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-12-01 16:35:17 +0000 |
| commit | 9d5f30ea047d7595967b22d9819cb4c11460a938 (patch) | |
| tree | 07d83eb16d07fa3cd59e63bf2f139957222527bf /src/desktop.cpp | |
| parent | Fix merge to master and add shortcut (diff) | |
| download | inkscape-9d5f30ea047d7595967b22d9819cb4c11460a938.tar.gz inkscape-9d5f30ea047d7595967b22d9819cb4c11460a938.zip | |
Fix merging
Diffstat (limited to '')
| -rw-r--r-- | src/desktop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index 45026102b..f857ed236 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -949,7 +949,7 @@ SPDesktop::get_hscroll_thickness() if (parent) { SPDesktopWidget *dtw = static_cast<SPDesktopWidget *>(parent->get_data("desktopwidget")); GtkAllocation allocation; - gtk_widget_get_allocation(dtw->hscrollbar, &allocation); + gtk_widget_get_allocation(GTK_WIDGET(dtw->hscrollbar), &allocation); return allocation.height; } return 0; @@ -962,7 +962,7 @@ SPDesktop::get_vscroll_thickness() if (parent) { SPDesktopWidget *dtw = static_cast<SPDesktopWidget *>(parent->get_data("desktopwidget")); GtkAllocation allocation; - gtk_widget_get_allocation(dtw->vscrollbar_box, &allocation); + gtk_widget_get_allocation(GTK_WIDGET(dtw->vscrollbar_box), &allocation); return allocation.width; } return 0; |