3 files changed, 14 insertions, 6 deletions
diff --git a/lib/debugger/src/dbg_wx_filedialog_win.erl b/lib/debugger/src/dbg_wx_filedialog_win.erl
index d883438639..946e23e797 100644
--- a/lib/debugger/src/dbg_wx_filedialog_win.erl
+++ b/lib/debugger/src/dbg_wx_filedialog_win.erl
@@ -375,7 +375,8 @@ show_completion(Wanted, State = #state{text=TC, win=Win, list=LC, completion=Com
 	    Start = length(Wanted),
 	    wxTextCtrl:setValue(TC, Path++"/"),
 	    wxTextCtrl:setInsertionPoint(TC, Start),
-	    wxTextCtrl:setSelection(TC, Start, -1),	    
+	    Last = wxTextCtrl:getLastPosition(TC),
+	    wxTextCtrl:setSelection(TC, Start, Last),
 	    destroy_completion(Comp),
 	    wxWindow:setFocus(TC),
 	    State#state{ptext=Path, completion=undefined};
@@ -399,7 +400,7 @@ show_completion(Wanted, State = #state{text=TC, win=Win, list=LC, completion=Com
 	    LB = wxListBox:new(Temp, ?COMPLETION_WIN, 
 			       [{style, ?wxLB_SINGLE}, {choices, Files}, {size, Size}]),
 
-	    wxListBox:connect(LB, command_listbox_doubleclicked),
+	    %% wxListBox:connect(LB, command_listbox_doubleclicked),
 	    wxListBox:connect(LB, command_listbox_selected),
 	    wxWindow:show(Temp),
 	    wxWindow:setFocus(TC),
diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
index d81069ec90..3ffdeeaea2 100644
--- a/lib/debugger/src/dbg_wx_mon.erl
+++ b/lib/debugger/src/dbg_wx_mon.erl
@@ -144,7 +144,7 @@ init2(CallingPid, Mode, SFile, GS) ->
 
 		    win     = Win,
 		    focus   = undefined,
-		    coords  = {0,0},
+		    coords  = {20,20},
 
 		    intdir  = element(2, file:get_cwd()),
 		    pinfos  = [],
diff --git a/lib/debugger/src/dbg_wx_win.erl b/lib/debugger/src/dbg_wx_win.erl
index f029990aa4..a93b562a81 100644
--- a/lib/debugger/src/dbg_wx_win.erl
+++ b/lib/debugger/src/dbg_wx_win.erl
@@ -75,7 +75,8 @@ create_menus(MB, [{Title,Items}|Ms], Win, Id0) ->
     Id = create_menu_item(Menu, Items, Win, Id0, true),
     wxMenuBar:append(MB,Menu,menu_name(Title,ignore)),
     create_menus(MB,Ms,Win,Id);
-create_menus(_MB,[], _Win,Id) -> Id.
+create_menus(_MB,[], _Win,Id) ->
+    Id.
 
 create_menu_item(Menu, [separator|Is], Win, Id,Connect) ->
     wxMenu:appendSeparator(Menu),
@@ -102,10 +103,14 @@ create_menu_item(Menu, [{Name, _N, cascade, Items}|Is], Win, Id0,Connect) ->
 		   [{id,Id0},{lastId, Id-1},{callback,Filter}]),
     create_menu_item(Menu, Is, Win, Id, Connect);
 create_menu_item(Menu, [{Name,Pos}|Is], Win, Id, Connect) -> 
-    Item = wxMenu:append(Menu, Id, menu_name(Name,Pos)), 
+    MenuId = case lists:member(Name, ['Debugger']) of
+		 true -> ?wxID_HELP;
+		 _ ->    Id
+	     end,
+    Item = wxMenu:append(Menu, MenuId, menu_name(Name,Pos)),
     put(Name,Item),
     if Connect -> 
-	    wxMenu:connect(Win, command_menu_selected, [{id,Id},{userData, Name}]);
+	    wxMenu:connect(Win, command_menu_selected, [{id,MenuId},{userData, Name}]);
        true -> ignore
     end,
     create_menu_item(Menu,Is,Win,Id+1, Connect);
@@ -308,6 +313,8 @@ to_string(Format,Args) ->
 
 menu_name(Atom, N) when is_atom(Atom) -> 
     menu_name(atom_to_list(Atom),N);
+menu_name("Help", _) -> %% Mac needs this to be exactly this
+    "&Help";
 menu_name(Str, Pos) when is_integer(Pos) ->
     {S1,S2} = lists:split(Pos,Str),
     S1 ++ [$&|S2];