merge from trunk (r11734)

(bzr r11668.1.22)

4 files changed, 11 insertions, 7 deletions

diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp
index a0bc1ef15..e0c5d9eac 100644
--- a/src/widgets/eek-preview.cpp
+++ b/src/widgets/eek-preview.cpp
@@ -550,7 +550,8 @@ static gboolean eek_preview_button_press_cb( GtkWidget* widget, GdkEventButton*
             gtk_widget_grab_focus(widget);
         }
 
-        if ( event->button == PRIME_BUTTON_MAGIC_NUMBER ) {
+        if ( event->button == PRIME_BUTTON_MAGIC_NUMBER ||
+                event->button == 2 ) {
             preview->_hot = TRUE;
             if ( preview->_within ) {
                 gtk_widget_set_state( widget, GTK_STATE_ACTIVE );
@@ -567,8 +568,10 @@ static gboolean eek_preview_button_release_cb( GtkWidget* widget, GdkEventButton
         EekPreview* preview = EEK_PREVIEW(widget);
         preview->_hot = FALSE;
         gtk_widget_set_state( widget, GTK_STATE_NORMAL );
-        if ( preview->_within && event->button == PRIME_BUTTON_MAGIC_NUMBER ) {
-            gboolean isAlt = (event->state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK;
+        if ( preview->_within &&
+            (event->button == PRIME_BUTTON_MAGIC_NUMBER || event->button == 2)) {
+            gboolean isAlt = ( ((event->state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK) ||
+                                (event->button == 2));
 
             if ( isAlt ) {
                 g_signal_emit( widget, eek_preview_signals[ALTCLICKED_SIGNAL], 0, 2 );
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index 0244621bf..61c6261bf 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -349,7 +349,7 @@ static void sp_font_selector_set_sizes( SPFontSelector *fsel )
 #if GTK_CHECK_VERSION(2, 24,0)
         gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(fsel->size), Glib::ustring::format(size).c_str());
 #else
-        gtk_combo_box_append_text (GTK_COMBO_BOX(fsel->size), size);
+        gtk_combo_box_append_text (GTK_COMBO_BOX(fsel->size), Glib::ustring::format(size).c_str());
 #endif
     }
 
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index bafc75b18..f2ae0425f 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -287,7 +287,7 @@ void ColorNotebook::init()
     sp_set_font_size_smaller (_buttonbox);
     gtk_table_attach (GTK_TABLE (table), _buttonbox, 0, 2, row, row + 1,
                       static_cast<GtkAttachOptions>(GTK_EXPAND|GTK_FILL),
-                      static_cast<GtkAttachOptions>(GTK_EXPAND|GTK_FILL),
+                      static_cast<GtkAttachOptions>(0),
                       XPAD, YPAD);
     row++;
 
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index 4cc9f9e4a..bb8bba328 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -109,7 +109,8 @@ static void resizeHSVWheel( GtkHSV *hsv, GtkAllocation *allocation )
     gint diam = std::min(allocation->width, allocation->height);
 
     // drop a little for resizing
-    diam -= 4;
+    // This magic number stops the dialog expanding in width when resizing height
+    diam -= 16;
 
     GtkStyle *style = gtk_widget_get_style( GTK_WIDGET(hsv) );
     if ( style ) {
@@ -161,7 +162,7 @@ void ColorWheelSelector::init()
     _wheel = gtk_hsv_new();
     gtk_hsv_set_metrics( GTK_HSV(_wheel), 48, 8 );
     gtk_widget_show( _wheel );
-    gtk_table_attach( GTK_TABLE(t), _wheel, 0, 3, row, row + 1,  (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), XPAD, YPAD);
+    gtk_table_attach( GTK_TABLE(t), _wheel, 0, 3, row, row + 1,  (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0);
 
     row++;