diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/fpguicombobox.inc | 8 | ||||
| -rw-r--r-- | gui/fpguiedit.inc | 4 | ||||
| -rw-r--r-- | gui/fpguiform.inc | 1 | ||||
| -rw-r--r-- | gui/fpguimenus.inc | 4 | ||||
| -rw-r--r-- | gui/fpguiscrollbar.inc | 6 | ||||
| -rw-r--r-- | gui/fpguiscrollbox.inc | 4 |
6 files changed, 16 insertions, 11 deletions
diff --git a/gui/fpguicombobox.inc b/gui/fpguicombobox.inc index 862f7297..5eef10d8 100644 --- a/gui/fpguicombobox.inc +++ b/gui/fpguicombobox.inc @@ -105,16 +105,16 @@ begin WidgetStyle := WidgetStyle + [wsCaptureMouse, wsClickable, wsOpaque]; BorderWidth := 1; Color := clBlack; - Name := '#ComboBoxPopup'; + Name := '_ComboBoxPopup'; FLayout := TFBoxLayout.Create(self); - FLayout.Name := '#VBoxLayout'; + FLayout.Name := '_VBoxLayout'; FLayout.Orientation := Vertical; FLayout.Spacing := 0; InsertChild(FLayout); FListBox := TFListBox.Create(self); - FListBox.Name := '#Listbox'; + FListBox.Name := '_Listbox'; FListBox.HotTrack := True; FLayout.InsertChild(FListBox); end; @@ -133,7 +133,7 @@ begin FItemIndex := -1; ComboBoxButton := TFArrowButton.Create(Self); - ComboBoxButton.Name := '#ComboBoxButton'; + ComboBoxButton.Name := '_ComboBoxButton'; ComboBoxButton.Embedded := True; ComboBoxButton.CanExpandWidth := False; ComboBoxButton.CanExpandHeight := False; diff --git a/gui/fpguiedit.inc b/gui/fpguiedit.inc index 82ab9edd..8cd3268c 100644 --- a/gui/fpguiedit.inc +++ b/gui/fpguiedit.inc @@ -388,6 +388,10 @@ var lBorders: TRect; lSideMargins: integer; begin + // This is not pretty and needs to change, but if these two tests are not + // here it throws a AV when loading forms + if not Assigned(FindForm) then + Exit; //==> if not Assigned(FindForm.FWnd) then Exit; //==> diff --git a/gui/fpguiform.inc b/gui/fpguiform.inc index 5c3b3c06..2ff0ad37 100644 --- a/gui/fpguiform.inc +++ b/gui/fpguiform.inc @@ -145,6 +145,7 @@ begin LAYOUTTRACE('TFCustomForm.Show for %s:%s', [Name, ClassName]); FVisible := True; +// GFApplication.AddWindow(Wnd); Wnd.Show; end; diff --git a/gui/fpguimenus.inc b/gui/fpguimenus.inc index 7a59f318..94a61e03 100644 --- a/gui/fpguimenus.inc +++ b/gui/fpguimenus.inc @@ -181,10 +181,10 @@ begin WidgetStyle := WidgetStyle + [wsCaptureMouse, wsClickable, wsOpaque]; BorderWidth := 1; Color := clBlack; - Name := '#MenuPopup'; + Name := '_MenuPopup'; FMenu := TFMenuBar.Create(self); - FMenu.Name := '#VBoxMenu'; + FMenu.Name := '_VBoxMenu'; FMenu.Orientation := Vertical; FMenu.Spacing := 0; InsertChild(FMenu); diff --git a/gui/fpguiscrollbar.inc b/gui/fpguiscrollbar.inc index 08e1ecc8..c3dfa195 100644 --- a/gui/fpguiscrollbar.inc +++ b/gui/fpguiscrollbar.inc @@ -439,7 +439,7 @@ begin FSmallChange := 1; ButtonUp := TFScrollBarButton.Create(Self); - ButtonUp.Name := '#ScrollBarButtonUp'; + ButtonUp.Name := '_ScrollBarButtonUp'; TFScrollBarButton(ButtonUp).Direction := arrowLeft; ButtonUp.Embedded := True; ButtonUp.CanExpandWidth := False; @@ -448,11 +448,11 @@ begin ButtonUp.SetEmbeddedParent(Self); Slider := TFScrollBarSlider.Create(Self); - Slider.Name := '#ScrollBarSlider'; + Slider.Name := '_ScrollBarSlider'; Slider.SetEmbeddedParent(Self); ButtonDown := TFScrollBarButton.Create(Self); - ButtonDown.Name := '#ScrollBarButtonDown'; + ButtonDown.Name := '_ScrollBarButtonDown'; TFScrollBarButton(ButtonDown).Direction := arrowRight; ButtonDown.Embedded := True; ButtonDown.CanExpandWidth := False; diff --git a/gui/fpguiscrollbox.inc b/gui/fpguiscrollbox.inc index 81ce48db..d6b22a24 100644 --- a/gui/fpguiscrollbox.inc +++ b/gui/fpguiscrollbox.inc @@ -83,12 +83,12 @@ begin Parent := AParent; FHorzScrollBar := TFScrollBar.Create(Parent); - HorzScrollBar.Name := '#Scrolling_HorzBar'; + HorzScrollBar.Name := '_Scrolling_HorzBar'; HorzScrollBar.Embedded := True; HorzScrollBar.SetEmbeddedParent(Parent); FVerTFScrollBar := TFScrollBar.Create(Parent); - VerTFScrollBar.Name := '#Scrolling_VertBar'; + VerTFScrollBar.Name := '_Scrolling_VertBar'; VerTFScrollBar.Orientation := Vertical; VerTFScrollBar.Embedded := True; VerTFScrollBar.SetEmbeddedParent(Parent); |