2 files changed, 11 insertions, 15 deletions
diff --git a/src/corelib/x11/gfx_x11.pas b/src/corelib/x11/gfx_x11.pas
index 014efc8b..6a1531bd 100644
--- a/src/corelib/x11/gfx_x11.pas
+++ b/src/corelib/x11/gfx_x11.pas
@@ -1501,38 +1501,34 @@ var
   aCapStyle: Longint;
 begin
   aCapStyle := CapNotLast;
-  if awidth < 0 then
-  begin
-    { Alternative line drawing - Using X algorithm instead of hardware algorithm }
-    awidth := -awidth;
-    if (awidth > 1) and (astyle = lsSolid) then
-      aCapStyle := CapButt;
-  end
-  else
-    awidth := 0;
+  // Is this still needed??  I don't think so
+  //if (awidth > 1) and (astyle = lsSolid) then
+  //  aCapStyle := CapButt;
+  if awidth = 1 then
+    awidth := 0;  // switch to hardware algorithm
 
   case AStyle of
     lsDot:
         begin
-          XSetLineAttributes(xapplication.display, Fgc, 1,
+          XSetLineAttributes(xapplication.display, Fgc, awidth,
             LineOnOffDash, aCapStyle, JoinMiter);
           XSetDashes(xapplication.display, Fgc, 0, cDot, 2);
         end;
     lsDash:
         begin
-          XSetLineAttributes(xapplication.display, Fgc, 1,
+          XSetLineAttributes(xapplication.display, Fgc, awidth,
             LineOnOffDash, aCapStyle, JoinMiter);
           XSetDashes(xapplication.display, Fgc, 0, cDash, 2);
         end;
     lsDashDot:
         begin
-          XSetLineAttributes(xapplication.display, Fgc, 1,
+          XSetLineAttributes(xapplication.display, Fgc, awidth,
             LineOnOffDash, aCapStyle, JoinMiter);
           XSetDashes(xapplication.display, Fgc, 0, cDashDot, 4);
         end;
     lsDashDotDot:
         begin
-          XSetLineAttributes(xapplication.display, Fgc, 1,
+          XSetLineAttributes(xapplication.display, Fgc, awidth,
             LineOnOffDash, aCapStyle, JoinMiter);
           XSetDashes(xapplication.display, Fgc, 0, cDashDotDot, 6);
         end;
diff --git a/src/gui/gui_popupcalendar.pas b/src/gui/gui_popupcalendar.pas
index 462feace..89e2a9b2 100644
--- a/src/gui/gui_popupcalendar.pas
+++ b/src/gui/gui_popupcalendar.pas
@@ -246,7 +246,7 @@ procedure TfpgPopupCalendar.AfterCreate;
 begin
   {@VFD_BODY_BEGIN: fpgPopupCalendar}
   Name := 'fpgPopupCalendar';
-  SetPosition(100, 268, 233, 138);
+  SetPosition(285, 249, 233, 142);
   //  WindowTitle := 'fpgPopupCalendar';
   //    WindowPosition := wpUser;
   //    Sizeable := False;
@@ -329,7 +329,7 @@ begin
   with grdName1 do
   begin
     Name := 'grdName1';
-    SetPosition(0, 23, 233, 114);
+    SetPosition(0, 23, 233, 119);
     AddColumn('Mon', 33, taLeftJustify);
     AddColumn('Tue', 32, taLeftJustify);
     AddColumn('Wed', 33, taLeftJustify);