TreeView.Items.GetFirstNode のつもりで

TreeView.TopItem と間違えて呼び出している箇所がいくつかあったので修正。
※これにより履歴がおかしな位置に追加されるバグも解消される。

diff --git a/Giko.pas b/Giko.pas
index de82108..e95ff57 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -3717,9 +3717,9 @@ begin
 //                             SetContent(ThreadItem);
                                FHistoryList.Move(i, 0);
                                if FTreeType = gttHistory then
-                                       if TreeView.TopItem <> TreeView.Items[ i ] then
-                                               TreeView.Items[ i ].MoveTo( TreeView.TopItem, naInsert );
-                Result := false;
+                                       if TreeView.Items.GetFirstNode <> TreeView.Items[ i ] then
+                                               TreeView.Items[ i ].MoveTo( TreeView.Items.GetFirstNode, naInsert );
+                                                               Result := false;
                                Exit;
                        end;
                end;
@@ -3733,7 +3733,7 @@ begin
 
        if FTreeType = gttHistory then begin
                Node := TreeView.Items.Add( nil, favItem.Title );
-               Node.MoveTo( TreeView.TopItem, naInsert );
+               Node.MoveTo( TreeView.Items.GetFirstNode, naInsert );
                {
                if favItem.NewArrival then begin
                        Node.ImageIndex := ITEM_ICON_THREADNEW1;
@@ -3899,7 +3899,7 @@ begin
                        FTreeType := gtt2ch;
                        HistoryToolBar.Hide;
                        SetBoardTreeNode( inBBS );
-                       TreeView.TopItem.Expanded := True;                              //?c???[?g?b?v???????J??
+                       TreeView.Items.GetFirstNode.Expanded := True;                           //?c???[?g?b?v???????J??
                        //?c???[??g?b?v?????I????
                        if GetActiveList = nil then
                                TreeView.Selected := TreeView.Items[0]
@@ -3956,7 +3956,7 @@ begin
                        FTreeType := gtt2ch;
                        HistoryToolBar.Hide;
                        SetBoardTreeNode( inBBS );
-                       TreeView.TopItem.Expanded := True;                              //\83c\83\8a\81[\83g\83b\83v\8d\80\96Ú\82¾\82¯\82ð\8aJ\82­
+                       TreeView.Items.GetFirstNode.Expanded := True;                           //\83c\83\8a\81[\83g\83b\83v\8d\80\96Ú\82¾\82¯\82ð\8aJ\82­
                        //\83c\83\8a\81[\82Ì\83g\83b\83v\8d\80\96Ú\82ð\91I\91ð\82·\82é
                        if GetActiveList = nil then begin
                                try
@@ -7743,7 +7743,7 @@ var
 begin
 
        LinkToolButton := TLinkToolButton( Sender );
-       SenderNode := TreeNodeDataFind( FavoriteTreeView.TopItem, LinkToolButton.Data );
+       SenderNode := TreeNodeDataFind( FavoriteTreeView.Items.GetFirstNode, LinkToolButton.Data );
 
        FavoriteDragDrop( SenderNode, Source );
 
@@ -8813,7 +8813,7 @@ begin
        CabinetHistoryAction.Checked := False;
 
        // \82¨\8bC\82É\93ü\82è\82Ì\83c\83\8a\81[\82ð\93W\8aJ
-       FavoriteTreeView.TopItem.Expanded := True;
+       FavoriteTreeView.Items.GetFirstNode.Expanded := True;
 
 end;
 
@@ -8914,7 +8914,7 @@ begin
 
                LinkToolButton := TLinkToolButton( Source );
                //ShowMessage(LinkToolButton.Text);
-               SourceNode := TreeNodeDataFind( FavoriteTreeView.TopItem, LinkToolButton.Data );
+               SourceNode := TreeNodeDataFind( FavoriteTreeView.Items.GetFirstNode, LinkToolButton.Data );
                FavoriteMoveTo( SenderNode, SourceNode );
 
        end else if Source = BrowserTab then begin
@@ -10035,22 +10035,23 @@ begin
                end;}
 
        WM_XBUTTONDOWN:
-       case Msg.wParam shr 16 of
-               XBUTTON1:
-               begin
-                               if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
-                                       if IsDialogMessage( FActiveContent.Browser.Handle, Msg ) then begin
-                                               UpBoardAction.Execute;
-                                               Handled := True;
-                                               Break;
+               case Msg.wParam shr 16 of
+                       XBUTTON1:
+                       begin
+                                       if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
+                                               if IsDialogMessage( FActiveContent.Browser.Handle, Msg ) then begin
+                                                       UpBoardAction.Execute;
+                                                       Handled := True;
+                                               end;
                                        end;
-                               end;
-                               if IsDialogMessage( ListView.Handle, Msg ) then begin
-                                       UpFolderAction.Execute;
-                                       Handled := True;
-                               end;
-               end;
-               XBUTTON2:
+                                       if not Handled then begin
+                                               if IsDialogMessage( ListView.Handle, Msg ) then begin
+                                                       UpFolderAction.Execute;
+                                                       Handled := True;
+                                               end;
+                                       end;
+                       end;
+                       XBUTTON2:
                end;
        end;
 end;