diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/linkmgr.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/builder.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/messagedialog.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/msgbox.hxx | 29 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 9 |
5 files changed, 24 insertions, 30 deletions
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index a7def55012e5..b1057aef5f1a 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.hxx @@ -37,6 +37,8 @@ namespace com { namespace sun { namespace star { } }}} +namespace weld { class Window; } + namespace sfx2 { // For the link to receive information about the status of graphics that @@ -126,9 +128,9 @@ public: static SvLinkSourceRef CreateObj( SvBaseLink const * ); - void UpdateAllLinks( bool bAskUpdate, - bool bUpdateGrfLinks, - vcl::Window* pParentWin ); + void UpdateAllLinks(bool bAskUpdate, + bool bUpdateGrfLinks, + weld::Window* pParentWin); // Call for list of links (eg for link-dialog) const SvBaseLinks& GetLinks() const { return aLinkTbl; } diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index bb66872e786d..6e47c022b844 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -36,6 +36,7 @@ class Button; class ListBox; +class MessageDialog; class NumericFormatter; class PopupMenu; class SalInstanceBuilder; @@ -276,6 +277,8 @@ private: std::vector< VclPtr<VclExpander> > m_aExpanderWidgets; + std::vector< VclPtr<MessageDialog> > m_aMessageDialogs; + sal_uInt16 m_nLastToolbarId; sal_uInt16 m_nLastMenuItemId; diff --git a/include/vcl/messagedialog.hxx b/include/vcl/messagedialog.hxx index 1cce2f41009e..f7fc3c98bc9b 100644 --- a/include/vcl/messagedialog.hxx +++ b/include/vcl/messagedialog.hxx @@ -23,6 +23,7 @@ private: VclPtr<VclBox> m_pOwnedContentArea; VclPtr<VclButtonBox> m_pOwnedActionArea; VclPtr<VclGrid> m_pGrid; + VclPtr<VclVBox> m_pMessageBox; VclPtr<FixedImage> m_pImage; VclPtr<VclMultiLineEdit> m_pPrimaryMessage; VclPtr<VclMultiLineEdit> m_pSecondaryMessage; @@ -39,7 +40,6 @@ public: VclButtonsType eButtonsType = VclButtonsType::Ok); MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); virtual bool set_property(const OString& rKey, const OUString& rValue) override; - virtual short Execute() override; OUString const& get_primary_text() const; OUString const& get_secondary_text() const; void set_primary_text(const OUString& rPrimaryString); @@ -47,6 +47,9 @@ public: virtual ~MessageDialog() override; virtual void dispose() override; + void create_message_area(); + VclContainer* get_message_area() const { return m_pMessageBox.get(); } + static void SetMessagesWidths(vcl::Window const* pParent, VclMultiLineEdit* pPrimaryMessage, VclMultiLineEdit* pSecondaryMessage); }; diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index 203d3ea36d80..5df7a5f81437 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -105,32 +105,11 @@ public: static OUString GetStandardText(); }; -class VCL_DLLPUBLIC ErrorBox : public MessBox -{ -public: - ErrorBox( vcl::Window* pParent, const OUString& rMessage ); - ErrorBox( vcl::Window* pParent, MessBoxStyle nStyle, - const OUString& rMessage ); - ErrorBox( vcl::Window* pParent, MessBoxStyle nStyle, WinBits n, - const OUString& rMessage ); +VCL_DLLPUBLIC Image const & GetStandardErrorBoxImage(); +VCL_DLLPUBLIC OUString GetStandardErrorBoxText(); - static Image GetStandardImage(); - static OUString GetStandardText(); -}; - -class VCL_DLLPUBLIC QueryBox : public MessBox -{ -public: - QueryBox( vcl::Window* pParent, MessBoxStyle nStyle, - const OUString& rMessage ); - QueryBox( vcl::Window* pParent, MessBoxStyle nStyle, WinBits n, - const OUString& rMessage ); - - void SetDefaultCheckBoxText(); - - static Image const & GetStandardImage(); - static OUString GetStandardText(); -}; +VCL_DLLPUBLIC Image const & GetStandardQueryBoxImage(); +VCL_DLLPUBLIC OUString GetStandardQueryBoxText(); #endif // INCLUDED_VCL_MSGBOX_HXX diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 69674ab9ba17..5c87a005fe61 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -19,6 +19,8 @@ namespace weld { +class Container; + class VCL_DLLPUBLIC Widget { public: @@ -44,13 +46,16 @@ public: virtual Size get_pixel_size(const OUString& rText) const = 0; virtual OString get_buildable_name() const = 0; virtual OString get_help_id() const = 0; - virtual Widget* weld_parent() const = 0; + virtual Container* weld_parent() const = 0; virtual ~Widget() {} }; class VCL_DLLPUBLIC Container : virtual public Widget { +public: + virtual void remove(weld::Widget* pWidget) = 0; + virtual void add(weld::Widget* pWidget) = 0; }; class VCL_DLLPUBLIC Frame : virtual public Container @@ -107,6 +112,7 @@ public: virtual OUString get_primary_text() const = 0; virtual void set_secondary_text(const OUString& rText) = 0; virtual OUString get_secondary_text() const = 0; + virtual Container* weld_message_area() = 0; }; class VCL_DLLPUBLIC ComboBoxText : virtual public Container @@ -160,6 +166,7 @@ public: virtual void insert(const OUString& rText, int pos) = 0; virtual int n_children() const = 0; virtual void select(int pos) = 0; + using Container::remove; virtual void remove(int pos) = 0; virtual int find(const OUString& rText) const = 0; virtual void set_top_entry(int pos) = 0; |