Merge branch 'master' of ssh://staflik/projects/git/tuxcmd

2 files changed, 4 insertions, 3 deletions

diff --git a/UMain.pas b/UMain.pas
index f7cfea6..f8af9c5 100644
--- a/UMain.pas
+++ b/UMain.pas
@@ -1306,7 +1306,7 @@ begin
     Accept := False;
     gtk_widget_get_pointer(LeftPanelBox.FWidget, @XLeft, nil);
     gtk_widget_get_pointer(RightPanelBox.FWidget, @XRight, nil);
-    if (XLeft > LeftPanelBox.Width) and (XRight < 0) then SplitterPopupMenu.PopUp;
+    if (XLeft >= LeftPanelBox.Width) and (XRight < 0) then SplitterPopupMenu.PopUp;
   end;
 end;
 
@@ -2782,7 +2782,8 @@ begin
           PanelRightMouseInProgress := True;
         end;
       end;
-    end else FilePopupMenu.PopUp;
+    end else 
+      if (Item <> nil) then FilePopupMenu.PopUp;
     Accept := False;
   end;
   finally
diff --git a/libgtk_kylix/GTKMenus.pas b/libgtk_kylix/GTKMenus.pas
index 2c5a4a3..45bde23 100644
--- a/libgtk_kylix/GTKMenus.pas
+++ b/libgtk_kylix/GTKMenus.pas
@@ -400,7 +400,7 @@ end;
 procedure TGTKMenuItem.PopUp;
 begin
   if Assigned(FOnPopup) then FOnPopup(Self);
-  if (FItems <> nil) and (FItems.Count > 0) then gtk_menu_popup(PGtkMenu(FMenu), nil, nil, nil, nil, 3, 0);
+  if (FItems <> nil) and (FItems.Count > 0) then gtk_menu_popup(PGtkMenu(FMenu), nil, nil, nil, nil, 3, gtk_get_current_event_time);
 end;
 
 procedure TGTKMenuItem.PopDown;