したらばJBBSの板検索のHTMLが変わっていたので対応した。

[gikonavigoeson/gikonavi.git] / ToolBarSetting.pas

diff --git a/ToolBarSetting.pas b/ToolBarSetting.pas
index d1b3918..1e45aa7 100644 (file)
--- a/ToolBarSetting.pas
+++ b/ToolBarSetting.pas
@@ -144,7 +144,8 @@ begin
        ToolBarItem.ToolBar := ToolBar;
        ToolBarItem.ToolType := ToolType;
        for i := 0 to ToolBar.ControlCount - 1 do
-                if ToolBar.Controls[ i ] is TToolButton Then
+               if ToolBar.Controls[ i ] is TToolButton Then
+                       if not (ToolBar.Controls[ i ].Name = 'SelectComboBoxDummy') Then
                        ToolBarITem.ButtonActionList.Add(ToolBar.Controls[i].Action);
        ToolBarComboBox.Items.AddObject(ToolBar.Caption, ToolBarItem);
 end;
@@ -176,7 +177,7 @@ begin
                ToolBarItem := TToolBarItem(ToolBarComboBox.Items.Objects[i]);
 
                for j := ToolBarItem.ToolBar.ButtonCount - 1 downto 0 do
-                       ToolBarItem.ToolBar.RemoveControl(ToolBarItem.ToolBar.Buttons[j]);
+                       ToolBarItem.ToolBar.Buttons[j].HostDockSite := nil;
 
                for j := 0 to ToolBarItem.ButtonActionList.Count - 1 do begin
                        if ToolBarItem.ButtonActionList[j] = nil then begin
@@ -188,6 +189,9 @@ begin
                        end else if TObject(ToolBarItem.ButtonActionList[j]) is TCustomAction then begin
                                ToolButton := TToolButton.Create(ToolBarItem.ToolBar);
                                ToolButton.Action := TCustomAction(ToolBarItem.ButtonActionList[j]);
+                               if ToolButton.ImageIndex = -1 then
+                                       ToolButton.ImageIndex := 51;
+
                                ToolButton.Left := 10000;
                                SetButtonStyle(ToolBarItem.ButtonActionList[j], ToolButton);
                                ToolBarItem.ToolBar.InsertControl(ToolButton);