diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-05-13 13:59:11 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-05-20 20:24:16 +0200 |
commit | 68d161c6803654f4ce816af7e79371a2d3497b4f (patch) | |
tree | 97cc8e55906b91ac966d7b1c09bdfcf51e8480f9 /include/svtools/editbrowsebox.hxx | |
parent | 96536d92e8026cebfde11e5539ee90471d0e7933 (diff) |
weld ComboBoxControl
Change-Id: Ie862bb782b4c3e203af88d45c850ce0cab60f2e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94123
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/svtools/editbrowsebox.hxx')
-rw-r--r-- | include/svtools/editbrowsebox.hxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 71f8260fc487..228edb70cf01 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -26,11 +26,11 @@ #include <svtools/svtdllapi.h> #include <tools/ref.hxx> #include <vcl/window.hxx> -#include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> #include <svtools/brwbox.hxx> #include <svtools/brwhead.hxx> +#include <svtools/InterimItemWindow.hxx> #include <vcl/vclmedit.hxx> #include <o3tl/typed_flags_set.hxx> @@ -301,9 +301,7 @@ namespace svt DECL_LINK( OnClick, Button*, void ); }; - //= CheckBoxCellController - class SVT_DLLPUBLIC CheckBoxCellController final : public CellController { public: @@ -319,29 +317,27 @@ namespace svt DECL_LINK(ModifyHdl, LinkParamNone*, void); }; - //= ComboBoxControl - - class SVT_DLLPUBLIC ComboBoxControl final : public ComboBox + class SVT_DLLPUBLIC ComboBoxControl final : public InterimItemWindow { friend class ComboBoxCellController; public: ComboBoxControl(vcl::Window* pParent); + weld::ComboBox& get_widget() { return *m_xWidget; } + private: - virtual bool PreNotify( NotifyEvent& rNEvt ) override; + std::unique_ptr<weld::ComboBox> m_xWidget; }; - //= ComboBoxCellController - class SVT_DLLPUBLIC ComboBoxCellController : public CellController { public: ComboBoxCellController(ComboBoxControl* pParent); - ComboBoxControl& GetComboBox() const { return static_cast<ComboBoxControl &>(GetWindow()); } + weld::ComboBox& GetComboBox() const { return static_cast<ComboBoxControl&>(GetWindow()).get_widget(); } virtual bool IsModified() const override; virtual void ClearModified() override; @@ -349,7 +345,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, weld::ComboBox&, void); }; |