4 files changed, 10 insertions, 17 deletions
diff --git a/src/corelib/gfxbase.pas b/src/corelib/gfxbase.pas
index 43f6bdfb..5687daf9 100644
--- a/src/corelib/gfxbase.pas
+++ b/src/corelib/gfxbase.pas
@@ -793,7 +793,6 @@ begin
   { What was not handled: underline }
   if Pos('UNDERLINE', UpperCase(Font.FontDesc)) > 0 then
   begin
-    writeln('underline detected in font');
     underline := (Font.Descent div 2) + 1;
     if underline = 0 then
       underline := 1;
diff --git a/src/corelib/keys.inc b/src/corelib/keys.inc
index 832a6a16..756ea4aa 100644
--- a/src/corelib/keys.inc
+++ b/src/corelib/keys.inc
@@ -14,6 +14,7 @@ const
   keyTab		      = $09;
   keyLinefeed		  = $0a;
   keyReturn		    = $0d;
+  keyEnter        = keyReturn;  // alias
   keyEscape		    = $1b;
   keyDelete		    = $7f;
   keySpace        = $20;
diff --git a/src/corelib/x11/gfx_x11.pas b/src/corelib/x11/gfx_x11.pas
index 66722790..0a763d63 100644
--- a/src/corelib/x11/gfx_x11.pas
+++ b/src/corelib/x11/gfx_x11.pas
@@ -689,11 +689,11 @@ begin
           msgp.mouse.shiftstate := ConvertShiftState(ev.xbutton.state);
 
           w := FindWindowByHandle(ev.xbutton.window);
-          if fpgTopModalForm <> nil then
+          if xapplication.TopModalForm <> nil then
           begin
             // This is ugly!!!!!!!!!!!!!!!
             ew := TfpgWindowImpl(WidgetParentForm(TfpgWidget(w)));
-            if (ew <> nil) and (fpgTopModalForm <> ew) then
+            if (ew <> nil) and (xapplication.TopModalForm <> ew) then
               blockmsg := true;
           end;
       
@@ -756,11 +756,11 @@ begin
           until not XCheckTypedWindowEvent(display, ev.xbutton.window, X.MotionNotify, @ev);
 
           w := FindWindowByHandle(ev.xany.window);
-          if fpgTopModalForm <> nil then
+          if xapplication.TopModalForm <> nil then
           begin
             // This is ugly!!!!!!!!!!!!!!!
             ew := TfpgWindowImpl(WidgetParentForm(TfpgWidget(w)));
-            if (ew <> nil) and (fpgTopModalForm <> ew) then
+            if (ew <> nil) and (xapplication.TopModalForm <> ew) then
               blockmsg := true;
           end;
 
@@ -778,11 +778,11 @@ begin
     X.ClientMessage:
         begin
           w := FindWindowByHandle(ev.xany.window);
-          if fpgTopModalForm <> nil then
+          if xapplication.TopModalForm <> nil then
           begin
             // This is ugly!!!!!!!!!!!!!!!
             ew := TfpgWindowImpl(WidgetParentForm(TfpgWidget(w)));
-            if (ew <> nil) and (fpgTopModalForm <> ew) then
+            if (ew <> nil) and (xapplication.TopModalForm <> ew) then
               blockmsg := true;
           end;
           
diff --git a/src/gui/gui_combobox.pas b/src/gui/gui_combobox.pas
index 6e09a6ca..9ca2c7ef 100644
--- a/src/gui/gui_combobox.pas
+++ b/src/gui/gui_combobox.pas
@@ -108,17 +108,12 @@ end;
 procedure TDropDownWindow.HandleKeyPress(var keycode: word;
   var shiftstate: TShiftState; var consumed: boolean);
 begin
-  writeln('DropDownWindow - KeyPress');
+  inherited HandleKeyPress(keycode, shiftstate, consumed);
   if keycode = keyEscape then
   begin
     Close;
     consumed := True;
   end;
-  
-  inherited HandleKeyPress(keycode, shiftstate, consumed);
-//  if consumed then
-//    Exit; //==>
-    
 end;
 
 procedure TDropDownWindow.HandleShow;
@@ -131,12 +126,11 @@ begin
   ListBox.Height := Height;
 
   inherited HandleShow;
-//  CaptureMouse;
+  CaptureMouse;
 end;
 
 procedure TDropDownWindow.HandleHide;
 begin
-  writeln('handlehide');
   FocusRootWidget := OriginalFocusRoot;
   OriginalFocusRoot := nil;
   inherited HandleHide;
@@ -157,7 +151,7 @@ end;
 
 destructor TDropDownWindow.Destroy;
 begin
-//  ReleaseMouse;
+  ReleaseMouse;
   inherited Destroy;
 end;
   
@@ -226,7 +220,6 @@ begin
   end
   else
   begin
-    writeln('DoDropDown - closing dropdown');
     FDropDown.Close;
     FreeAndNil(FDropDown);
   end;