Index: tlclient_selectionwindow.cc
===================================================================
--- tlclient_selectionwindow.cc	(revision 33123)
+++ tlclient_selectionwindow.cc	(working copy)
@@ -119,10 +119,11 @@
     browser->value(1);
 
     /* Create buttons */
-    int left, right;
+    int left, right, button_width;
+    button_width = BUTTON_WIDTH + X_MARGIN;
 
     left = X_MARGIN;
-    right = win->w() - BUTTON_WIDTH - X_MARGIN;
+    right = win->w() - button_width - X_MARGIN;
 
     button_widgets.clear();
     for (unsigned int i = 0; i < buttons.size(); i++) {
@@ -134,10 +135,10 @@
             x = right;
 
         if (buttons[i].returnbutton)
-            button = new Fl_Return_Button(x, y, BUTTON_WIDTH, BUTTON_HEIGHT,
+            button = new Fl_Return_Button(x, y, button_width, BUTTON_HEIGHT,
                                           buttons[i].text.c_str());
         else
-            button = new Fl_Button(x, y, BUTTON_WIDTH, BUTTON_HEIGHT,
+            button = new Fl_Button(x, y, button_width, BUTTON_HEIGHT,
                                    buttons[i].text.c_str());
 
         window_int * wb = new window_int(this, i);
@@ -149,9 +150,9 @@
         button_widgets.insert(button_widgets.end(), button);
 
         if (buttons[i].align_left)
-            left += BUTTON_WIDTH + X_MARGIN;
+            left += button_width + X_MARGIN;
         else
-            right -= BUTTON_WIDTH + X_MARGIN;
+            right -= button_width + X_MARGIN;
     }
 
     // Enable/disable buttons