diff options
| author | Moritz Eberl <moritz@semiodesk.com> | 2016-04-13 14:05:30 +0000 |
|---|---|---|
| committer | Moritz Eberl <moritz@semiodesk.com> | 2016-04-13 14:05:30 +0000 |
| commit | 3a1aa63dc5df1aaebe89226e484f49289cae5f7c (patch) | |
| tree | 4afa9d90d2650f27f0411bc52ef608dca5e5a88b /src/widgets/ink-comboboxentry-action.cpp | |
| parent | Merge (diff) | |
| parent | gimpcolorwheel: Fix deprecated gtk_widget_style_attach #Hackfest2016 (diff) | |
| download | inkscape-3a1aa63dc5df1aaebe89226e484f49289cae5f7c.tar.gz inkscape-3a1aa63dc5df1aaebe89226e484f49289cae5f7c.zip | |
Merge and fixed CMake build
(bzr r14761.1.5)
Diffstat (limited to 'src/widgets/ink-comboboxentry-action.cpp')
| -rw-r--r-- | src/widgets/ink-comboboxentry-action.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/widgets/ink-comboboxentry-action.cpp b/src/widgets/ink-comboboxentry-action.cpp index 1114d2cdb..ec5e26cf5 100644 --- a/src/widgets/ink-comboboxentry-action.cpp +++ b/src/widgets/ink-comboboxentry-action.cpp @@ -371,9 +371,16 @@ GtkWidget* create_tool_item( GtkAction* action ) g_free( combobox_name ); { +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(comboBoxEntry, GTK_ALIGN_START); + gtk_widget_set_hexpand(comboBoxEntry, FALSE); + gtk_widget_set_vexpand(comboBoxEntry, FALSE); + gtk_container_add(GTK_CONTAINER(item), comboBoxEntry); +#else GtkWidget *align = gtk_alignment_new(0, 0.5, 0, 0); gtk_container_add( GTK_CONTAINER(align), comboBoxEntry ); gtk_container_add( GTK_CONTAINER(item), align ); +#endif } ink_comboboxentry_action->combobox = GTK_COMBO_BOX (comboBoxEntry); @@ -956,3 +963,14 @@ gboolean keypress_cb( GtkWidget * /*widget*/, GdkEventKey *event, gpointer data return wasConsumed; } + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : |