From dfbbda5623c0ec92febcd6e2e714fc682e496512 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 1 Nov 2013 12:45:29 +0000 Subject: convert math font dialog to .ui Change-Id: Ib7bf087664b6c8491872dfa37c750485fedabbe2 --- starmath/inc/dialog.hxx | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'starmath/inc/dialog.hxx') diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 423ffed0df89..8b3aae2b5663 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -74,44 +74,39 @@ public: /**************************************************************************/ -class SmShowFont : public Control +class SmShowFont : public Window { - virtual void Paint(const Rectangle&); + virtual void Paint(const Rectangle&); public: - SmShowFont(Window *pParent, const ResId& rResId) : - Control(pParent, rResId) + SmShowFont(Window *pParent, WinBits nStyle) + : Window(pParent, nStyle) { } - + virtual Size GetOptimalSize() const; void SetFont(const Font& rFont); }; class SmFontDialog : public ModalDialog { - FixedText aFixedText1; - ComboBox aFontBox; - CheckBox aBoldCheckBox; - CheckBox aItalicCheckBox; - OKButton aOKButton1; - HelpButton aHelpButton1; - CancelButton aCancelButton1; - SmShowFont aShowFont; - FixedText aFixedText2; + ComboBox* m_pFontBox; + VclContainer* m_pAttrFrame; + CheckBox* m_pBoldCheckBox; + CheckBox* m_pItalicCheckBox; + SmShowFont* m_pShowFont; Font Face; DECL_LINK(FontSelectHdl, ComboBox *); DECL_LINK(FontModifyHdl, ComboBox *); DECL_LINK(AttrChangeHdl, CheckBox *); - DECL_LINK(HelpButtonClickHdl, Button *); void InitColor_Impl(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: - SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes, bool bFreeRes = true); + SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes); const Font& GetFont() const { return Face; } void SetFont(const Font &rFont); -- cgit