summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/aqua/atsui/salgdi.h1
-rw-r--r--vcl/inc/helpwin.hxx14
-rw-r--r--vcl/inc/outfont.hxx3
-rw-r--r--vcl/inc/printdlg.hxx8
-rw-r--r--vcl/inc/svids.hrc1
-rw-r--r--vcl/inc/vcl/arrange.hxx387
-rw-r--r--vcl/inc/vcl/builder.hxx133
-rw-r--r--vcl/inc/vcl/dialog.hxx3
-rw-r--r--vcl/inc/vcl/fixed.hxx10
-rw-r--r--vcl/inc/vcl/help.hxx32
-rw-r--r--vcl/inc/vcl/keycod.hxx4
-rw-r--r--vcl/inc/vcl/layout.hxx9
-rw-r--r--vcl/inc/vcl/menu.hxx1
-rw-r--r--vcl/inc/vcl/menubtn.hxx17
-rw-r--r--vcl/inc/vcl/msgbox.hxx4
-rw-r--r--vcl/inc/vcl/outdev.hxx14
-rw-r--r--vcl/inc/vcl/scrbar.hxx2
-rw-r--r--vcl/inc/vcl/tabctrl.hxx1
-rw-r--r--vcl/inc/vcl/vclmedit.hxx14
-rw-r--r--vcl/inc/vcl/window.hxx46
-rw-r--r--vcl/inc/window.h2
21 files changed, 146 insertions, 560 deletions
diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h
index eeb7aa43f2b3..19fe1f48b9f7 100644
--- a/vcl/inc/aqua/atsui/salgdi.h
+++ b/vcl/inc/aqua/atsui/salgdi.h
@@ -353,7 +353,6 @@ private:
bool GetRawFontData( const PhysicalFontFace* pFontData,
std::vector<unsigned char>& rBuffer,
bool* pJustCFF );
- void ResetFontStyle();
};
// --- some trivial inlines
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 40a969f5b40c..7dd0c31ba964 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -44,8 +44,8 @@ private:
Rectangle maTextRect; // For wrapped text in QuickHelp
- String maHelpText;
- String maStatusText;
+ OUString maHelpText;
+ OUString maStatusText;
Timer maShowTimer;
Timer maHideTimer;
@@ -61,16 +61,16 @@ protected:
void ImplShow();
public:
- HelpTextWindow( Window* pParent, const String& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle );
+ HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle );
~HelpTextWindow();
- const String& GetHelpText() const { return maHelpText; }
- void SetHelpText( const String& rHelpText );
+ const OUString& GetHelpText() const { return maHelpText; }
+ void SetHelpText( const OUString& rHelpText );
sal_uInt16 GetWinStyle() const { return mnHelpWinStyle; }
sal_uInt16 GetStyle() const { return mnStyle; }
// Nur merken:
- void SetStatusText( const String& rStatusText ) { maStatusText = rStatusText; }
+ void SetStatusText( const OUString& rStatusText ) { maStatusText = rStatusText; }
void SetHelpArea( const Rectangle& rRect ) { maHelpArea = rRect; }
void ShowHelp( sal_uInt16 nDelayMode );
@@ -82,7 +82,7 @@ public:
};
void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
- const String& rHelpText, const String& rStatusText,
+ const OUString& rHelpText, const OUString& rStatusText,
const Point& rScreenPos, const Rectangle* pHelpArea = NULL );
void ImplDestroyHelpWindow( bool bUpdateHideTime );
void ImplSetHelpWindowPos( Window* pHelpWindow, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index bb40f86fdc24..39bc2a2e1009 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -269,9 +269,6 @@ private:
// --------------------
// - ImplKernPairData -
// --------------------
-// TODO: get rid of ImplKernPairData and use outdev.hxx's KerningPair struct
-// the problem is that outdev.hxx is too high level for the device layers
-// and outdev.hxx's customers depend on KerningPair being defined there
struct ImplKernPairData
{
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 7de6ff9ba17f..d4d88fb8bc50 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -42,7 +42,6 @@
#include "vcl/field.hxx"
#include "vcl/tabctrl.hxx"
#include "vcl/tabpage.hxx"
-#include "vcl/arrange.hxx"
#include "vcl/virdev.hxx"
#include <boost/shared_ptr.hpp>
@@ -136,9 +135,6 @@ namespace vcl
// border around each page
CheckBox* mpBorderCB;
- boost::shared_ptr< vcl::RowOrColumn > mxBrochureDep;
- boost::shared_ptr< vcl::LabeledElement >mxPagesBtnLabel;
-
void setupLayout();
NUpTabPage( VclBuilder* );
@@ -184,8 +180,6 @@ namespace vcl
CheckBox* mpToFileBox;
CheckBox* mpCollateSingleJobsBox;
- boost::shared_ptr<vcl::RowOrColumn> mxOptGroup;
-
OutputOptPage( VclBuilder* );
void readFromSettings();
@@ -231,8 +225,6 @@ namespace vcl
rtl::OUString maPrintText;
rtl::OUString maDefPrtText;
- boost::shared_ptr<vcl::RowOrColumn> mxPreviewCtrls;
-
Size maDetailsCollapsedSize;
Size maDetailsExpandedSize;
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 76fc51ff57e6..4951c5c5ac35 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -150,6 +150,7 @@
#define SV_BUTTONTEXT_RESET 10111
#define SV_BUTTONTEXT_ADD 10112
#define SV_BUTTONTEXT_DELETE 10113
+#define SV_BUTTONTEXT_REMOVE 10114
#define SV_STDTEXT_FIRST SV_STDTEXT_SERVICENOTAVAILABLE
#define SV_STDTEXT_SERVICENOTAVAILABLE 10200
diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx
deleted file mode 100644
index 2197f10dfd80..000000000000
--- a/vcl/inc/vcl/arrange.hxx
+++ /dev/null
@@ -1,387 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _VCL_ARRANGE_HXX
-#define _VCL_ARRANGE_HXX
-
-#include "vcl/window.hxx"
-
-#include <vector>
-#include <map>
-#include <boost/shared_ptr.hpp>
-
-namespace vcl
-{
- /* some helper classes for simple window layouting
- guidelines:
- - a WindowArranger is not a Window
- - a WindowArranger hierarchy manages exactly one level of child windows inside a common parent
- this is to keep the vcl Window hierarchy flat, as some code like accelerators depend on such behavior
- - a WindowArranger never becomes owner of a Window, windows need to be destroyed separately
- - a WindowArranger however always is owner of its child WindowArrangers, that is the
- WindowArranger hierarchy will keep track of its objects and delete them
- - a managed element of a WindowArranger can either be a Window (a leaf in the hierarchy)
- or a child WindowArranger (a node in the hierarchy), but never both
- */
-
- class VCL_DLLPUBLIC WindowArranger
- {
- protected:
- struct Element
- {
- Window* m_pElement;
- boost::shared_ptr<WindowArranger> m_pChild;
- sal_Int32 m_nExpandPriority;
- Size m_aMinSize;
- bool m_bHidden;
- long m_nLeftBorder;
- long m_nTopBorder;
- long m_nRightBorder;
- long m_nBottomBorder;
-
- Element()
- : m_pElement( NULL )
- , m_pChild()
- , m_nExpandPriority( 0 )
- , m_bHidden( false )
- , m_nLeftBorder( 0 )
- , m_nTopBorder( 0 )
- , m_nRightBorder( 0 )
- , m_nBottomBorder( 0 )
- {}
-
- Element( Window* i_pWin,
- boost::shared_ptr<WindowArranger> const & i_pChild = boost::shared_ptr<WindowArranger>(),
- sal_Int32 i_nExpandPriority = 0,
- const Size& i_rMinSize = Size()
- )
- : m_pElement( i_pWin )
- , m_pChild( i_pChild )
- , m_nExpandPriority( i_nExpandPriority )
- , m_aMinSize( i_rMinSize )
- , m_bHidden( false )
- , m_nLeftBorder( 0 )
- , m_nTopBorder( 0 )
- , m_nRightBorder( 0 )
- , m_nBottomBorder( 0 )
- {}
-
- void deleteChild() { m_pChild.reset(); }
-
- sal_Int32 getExpandPriority() const;
- Size getOptimalSize( WindowSizeType ) const;
- bool isVisible() const;
- void setPosSize( const Point&, const Size& );
- };
-
- Window* m_pParentWindow;
- WindowArranger* m_pParentArranger;
- Rectangle m_aManagedArea;
- long m_nOuterBorder;
-
- rtl::OUString m_aIdentifier;
-
- virtual Element* getElement( size_t i_nIndex ) = 0;
- const Element* getConstElement( size_t i_nIndex ) const
- { return const_cast<WindowArranger*>(this)->getElement( i_nIndex ); }
-
-
- public:
- static long getDefaultBorder();
-
- static long getBorderValue( long nBorder )
- { return nBorder >= 0 ? nBorder : -nBorder * getDefaultBorder(); }
-
- WindowArranger( WindowArranger* i_pParent = NULL )
- : m_pParentWindow( i_pParent ? i_pParent->m_pParentWindow : NULL )
- , m_pParentArranger( i_pParent )
- , m_nOuterBorder( 0 )
- {}
- virtual ~WindowArranger();
-
- // ask what would be the optimal size
- virtual Size getOptimalSize( WindowSizeType ) const = 0;
- // call Resize to trigger layouting inside the managed area
- // without function while parent window is unset
- virtual void resize() = 0;
- // avoid this if possible, using the constructor instead
- // there can be only one parent window and all managed windows MUST
- // be direct children of that window
- // violating that condition will result in undefined behavior
- virtual void setParentWindow( Window* );
-
- virtual void setParent( WindowArranger* );
-
- virtual size_t countElements() const = 0;
- boost::shared_ptr<WindowArranger> getChild( size_t i_nIndex ) const
- {
- const Element* pEle = getConstElement( i_nIndex );
- return pEle ? pEle->m_pChild : boost::shared_ptr<WindowArranger>();
- }
- Window* getWindow( size_t i_nIndex ) const
- {
- const Element* pEle = getConstElement( i_nIndex );
- return pEle ? pEle->m_pElement : NULL;
- }
-
- virtual bool isVisible() const; // true if any element is visible
-
- virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getProperties() const;
- virtual void setProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& );
-
- sal_Int32 getExpandPriority( size_t i_nIndex ) const
- {
- const Element* pEle = getConstElement( i_nIndex );
- return pEle ? pEle->getExpandPriority() : 0;
- }
-
- Size getMinimumSize( size_t i_nIndex ) const
- {
- const Element* pEle = getConstElement( i_nIndex );
- return pEle ? pEle->m_aMinSize : Size();
- }
-
- bool setMinimumSize( size_t i_nIndex, const Size& i_rMinSize )
- {
- Element* pEle = getElement( i_nIndex );
- if( pEle )
- pEle->m_aMinSize = i_rMinSize;
- return pEle != NULL;
- }
-
- void setBorders( size_t i_nIndex, long i_nLeft, long i_nTop, long i_nRight, long i_nBottom )
- {
- Element* pEle = getElement( i_nIndex );
- if( pEle )
- {
- pEle->m_nLeftBorder = i_nLeft;
- pEle->m_nRightBorder = i_nRight;
- pEle->m_nTopBorder = i_nTop;
- pEle->m_nBottomBorder = i_nBottom;
- }
- }
-
- void getBorders( size_t i_nIndex, long* i_pLeft = NULL, long* i_pTop = NULL, long* i_pRight = NULL, long* i_pBottom = NULL ) const
- {
- const Element* pEle = getConstElement( i_nIndex );
- if( pEle )
- {
- if( i_pLeft ) *i_pLeft = pEle->m_nLeftBorder;
- if( i_pTop ) *i_pTop = pEle->m_nTopBorder;
- if( i_pRight ) *i_pRight = pEle->m_nRightBorder;
- if( i_pBottom ) *i_pBottom = pEle->m_nBottomBorder;
- }
- }
-
-
- void show( bool i_bShow = true, bool i_bImmediateUpdate = true );
-
- void setManagedArea( const Rectangle& i_rArea )
- {
- m_aManagedArea = i_rArea;
- resize();
- }
- const Rectangle& getManagedArea() const { return m_aManagedArea; }
-
- void setOuterBorder( long i_nBorder )
- {
- m_nOuterBorder = i_nBorder;
- resize();
- }
-
- const rtl::OUString getIdentifier() const
- { return m_aIdentifier; }
-
- void setIdentifier( const rtl::OUString& i_rId )
- { m_aIdentifier = i_rId; }
- };
-
- class VCL_DLLPUBLIC RowOrColumn : public WindowArranger
- {
- long m_nBorderWidth;
- bool m_bColumn;
-
- std::vector< WindowArranger::Element > m_aElements;
-
- void distributeRowWidth( std::vector< Size >& io_rSizes, long i_nUsedWidth, long i_nExtraWidth );
- void distributeColumnHeight( std::vector< Size >& io_rSizes, long i_nUsedHeight, long i_nExtraHeight );
- protected:
- virtual Element* getElement( size_t i_nIndex )
- { return i_nIndex < m_aElements.size() ? &m_aElements[ i_nIndex ] : 0; }
-
- public:
- RowOrColumn( WindowArranger* i_pParent = NULL,
- bool bColumn = true, long i_nBorderWidth = -1 )
- : WindowArranger( i_pParent )
- , m_nBorderWidth( i_nBorderWidth )
- , m_bColumn( bColumn )
- {}
-
- virtual ~RowOrColumn();
-
- virtual Size getOptimalSize( WindowSizeType ) const;
- virtual void resize();
- virtual size_t countElements() const { return m_aElements.size(); }
-
- // add a managed window at the given index
- // an index smaller than zero means add the window at the end
- size_t addWindow( Window*, sal_Int32 i_nExpandPrio = 0, const Size& i_rMinSize = Size(), size_t i_nIndex = ~0 );
-
- size_t addChild( boost::shared_ptr<WindowArranger> const &, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 );
- // convenience: use for addChild( new WindowArranger( ... ) ) constructs
- size_t addChild( WindowArranger* i_pNewChild, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 )
- { return addChild( boost::shared_ptr<WindowArranger>( i_pNewChild ), i_nExpandPrio, i_nIndex ); }
-
- long getBorderWidth() const { return m_nBorderWidth; }
- };
-
- class VCL_DLLPUBLIC LabeledElement : public WindowArranger
- {
- WindowArranger::Element m_aLabel;
- WindowArranger::Element m_aElement;
- long m_nDistance;
- long m_nLabelColumnWidth;
- int m_nLabelStyle;
- protected:
- virtual Element* getElement( size_t i_nIndex )
- {
- if( i_nIndex == 0 )
- return &m_aLabel;
- else if( i_nIndex == 1 )
- return &m_aElement;
- return 0;
- }
-
- public:
- LabeledElement( WindowArranger* i_pParent = NULL, int i_nLabelStyle = 0, long i_nDistance = -1 )
- : WindowArranger( i_pParent )
- , m_nDistance( i_nDistance )
- , m_nLabelColumnWidth( 0 )
- , m_nLabelStyle( i_nLabelStyle )
- {}
-
- virtual ~LabeledElement();
-
- virtual Size getOptimalSize( WindowSizeType ) const;
- virtual void resize();
- virtual size_t countElements() const { return 2; }
-
- void setLabel( Window* );
- void setElement( Window* );
- void setElement( boost::shared_ptr<WindowArranger> const & );
- void setLabelColumnWidth( long i_nWidth )
- { m_nLabelColumnWidth = i_nWidth; }
-
- Size getLabelSize( WindowSizeType i_eType ) const
- { return m_aLabel.getOptimalSize( i_eType ); }
- Size getElementSize( WindowSizeType i_eType ) const
- { return m_aElement.getOptimalSize( i_eType ); }
- };
-
- class VCL_DLLPUBLIC LabelColumn : public RowOrColumn
- {
- long getLabelWidth() const;
- public:
- LabelColumn( WindowArranger* i_pParent = NULL, long i_nBorderWidth = -1 )
- : RowOrColumn( i_pParent, true, i_nBorderWidth )
- {}
- virtual ~LabelColumn();
-
- virtual Size getOptimalSize( WindowSizeType ) const;
- virtual void resize();
-
- // returns the index of the added label
- size_t addRow( Window* i_pLabel, boost::shared_ptr<WindowArranger> const& i_rElement, long i_nIndent = 0 );
- size_t addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent = 0, const Size& i_rElementMinSize = Size() );
- };
-
- class VCL_DLLPUBLIC Indenter : public WindowArranger
- {
- long m_nIndent;
- WindowArranger::Element m_aElement;
-
- protected:
- virtual Element* getElement( size_t i_nIndex )
- { return i_nIndex == 0 ? &m_aElement : NULL; }
-
- public:
- Indenter( WindowArranger* i_pParent = NULL, long i_nIndent = 3*getDefaultBorder() )
- : WindowArranger( i_pParent )
- , m_nIndent( i_nIndent )
- {}
-
- virtual ~Indenter();
-
- virtual Size getOptimalSize( WindowSizeType ) const;
- virtual void resize();
- virtual size_t countElements() const { return (m_aElement.m_pElement != 0 || m_aElement.m_pChild != 0) ? 1 : 0; }
-
- void setIndent( long i_nIndent )
- {
- m_nIndent = i_nIndent;
- resize();
- }
-
- void setWindow( Window*, sal_Int32 i_nExpandPrio = 0 );
- void setChild( boost::shared_ptr<WindowArranger> const &, sal_Int32 i_nExpandPrio = 0 );
- // convenience: use for setChild( new WindowArranger( ... ) ) constructs
- void setChild( WindowArranger* i_pChild, sal_Int32 i_nExpandPrio = 0 )
- { setChild( boost::shared_ptr<WindowArranger>( i_pChild ), i_nExpandPrio ); }
- };
-
- class VCL_DLLPUBLIC Spacer : public WindowArranger
- {
- WindowArranger::Element m_aElement;
- Size m_aSize;
-
- protected:
- virtual Element* getElement( size_t i_nIndex )
- { return i_nIndex == 0 ? &m_aElement : NULL; }
-
- public:
- Spacer( WindowArranger* i_pParent = NULL, sal_Int32 i_nPrio = 20, const Size& i_rSize = Size( 0, 0 ) )
- : WindowArranger( i_pParent )
- , m_aElement( NULL, boost::shared_ptr<WindowArranger>(), i_nPrio )
- , m_aSize( i_rSize )
- {}
-
- virtual ~Spacer() {}
-
- virtual Size getOptimalSize( WindowSizeType ) const
- { return m_aSize; }
- virtual void resize() {}
- virtual void setParentWindow( Window* ) {}
- virtual size_t countElements() const { return 1; }
- virtual bool isVisible() const { return true; }
- };
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index a84f6d10285c..8ef33278acc2 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -14,25 +14,27 @@
#include <vcl/window.hxx>
#include <xmlreader/xmlreader.hxx>
#include <map>
+#include <set>
#include <stack>
#include <vector>
class ListBox;
class NumericFormatter;
+class ScrollBar;
class VCL_DLLPUBLIC VclBuilder
{
public:
- typedef std::map<rtl::OString, rtl::OString> stringmap;
+ typedef std::map<OString, OString> stringmap;
typedef Window* (*customMakeWidget)(Window *pParent, stringmap &rVec);
private:
struct WinAndId
{
- rtl::OString m_sID;
+ OString m_sID;
Window *m_pWindow;
sal_Int32 m_nPosition;
bool m_bOwned;
- WinAndId(const rtl::OString &rId, Window *pWindow)
+ WinAndId(const OString &rId, Window *pWindow)
: m_sID(rId)
, m_pWindow(pWindow)
, m_nPosition(-1)
@@ -44,15 +46,15 @@ private:
struct ListStore
{
- typedef std::vector<rtl::OString> row;
+ typedef std::vector<OString> row;
std::vector<row> m_aEntries;
};
struct ModelAndId
{
- rtl::OString m_sID;
+ OString m_sID;
ListStore *m_pModel;
- ModelAndId(const rtl::OString &rId, ListStore *pListStore)
+ ModelAndId(const OString &rId, ListStore *pListStore)
: m_sID(rId)
, m_pModel(pListStore)
{
@@ -61,9 +63,9 @@ private:
struct StringPair
{
- rtl::OString m_sID;
- rtl::OString m_sValue;
- StringPair(const rtl::OString &rId, const rtl::OString &rValue)
+ OString m_sID;
+ OString m_sValue;
+ StringPair(const OString &rId, const OString &rValue)
: m_sID(rId)
, m_sValue(rValue)
{
@@ -72,96 +74,105 @@ private:
typedef StringPair RadioButtonGroupMap;
typedef StringPair ComboBoxModelMap;
+ typedef StringPair ButtonImageWidgetMap;
- ListStore *get_model_by_name(rtl::OString sID);
+ ListStore *get_model_by_name(OString sID);
static void mungemodel(ListBox &rTarget, ListStore &rStore);
typedef stringmap Adjustment;
struct AdjustmentAndId
{
- rtl::OString m_sID;
+ OString m_sID;
Adjustment m_aAdjustment;
- AdjustmentAndId(const rtl::OString &rId, Adjustment &rAdjustment)
+ AdjustmentAndId(const OString &rId, Adjustment &rAdjustment)
: m_sID(rId)
{
m_aAdjustment.swap(rAdjustment);
}
};
- typedef StringPair SpinButtonAdjustmentMap;
+ typedef StringPair WidgetAdjustmentMap;
- Adjustment *get_adjustment_by_name(rtl::OString sID);
- static void mungeadjustment(NumericFormatter &rTarget, Adjustment &rAdjustment);
+ Adjustment *get_adjustment_by_name(OString sID);
+ static void mungeSpinAdjustment(NumericFormatter &rTarget, Adjustment &rAdjustment);
+ static void mungeScrollAdjustment(ScrollBar &rTarget, Adjustment &rAdjustment);
- typedef std::map<rtl::OString, rtl::OString> WidgetTranslations;
- typedef std::map<rtl::OString, WidgetTranslations> Translations;
+ typedef std::map<OString, OString> WidgetTranslations;
+ typedef std::map<OString, WidgetTranslations> Translations;
+ typedef std::map<OString, OString> StockMap;
struct ParserState
{
std::vector<RadioButtonGroupMap> m_aGroupMaps;
std::vector<ComboBoxModelMap> m_aModelMaps;
std::vector<ModelAndId> m_aModels;
std::vector<AdjustmentAndId> m_aAdjustments;
- std::vector<SpinButtonAdjustmentMap> m_aAdjustmentMaps;
+ std::vector<WidgetAdjustmentMap> m_aSpinAdjustmentMaps;
+ std::vector<WidgetAdjustmentMap> m_aScrollAdjustmentMaps;
+ std::vector<ButtonImageWidgetMap> m_aButtonImageWidgetMaps;
+ StockMap m_aStockMap;
Translations m_aTranslations;
+ std::set<Window*> m_aRedundantParentWidgets;
};
- rtl::OString getTranslation(const rtl::OString &rId, const rtl::OString &rProperty) const;
+ OString getTranslation(const OString &rId, const OString &rProperty) const;
- rtl::OString m_sID;
- rtl::OString m_sHelpRoot;
+ OString m_sID;
+ OString m_sHelpRoot;
Window *m_pParent;
+ bool m_bToplevelHasDeferredInit;
ParserState *m_pParserState;
- Window *get_by_name(rtl::OString sID);
+ Window *get_by_name(OString sID);
+ void delete_by_name(OString sID);
+
+ class sortIntoBestTabTraversalOrder
+ : public std::binary_function<const Window*, const Window*, bool>
+ {
+ VclBuilder *m_pBuilder;
+ public:
+ sortIntoBestTabTraversalOrder(VclBuilder *pBuilder)
+ : m_pBuilder(pBuilder)
+ {
+ }
+ bool operator()(const Window *pA, const Window *pB) const;
+ };
public:
- VclBuilder(Window *pParent, rtl::OUString sUIRootDir, rtl::OUString sUIFile, rtl::OString sID = rtl::OString());
+ VclBuilder(Window *pParent, OUString sUIRootDir, OUString sUIFile, OString sID = OString());
~VclBuilder();
Window *get_widget_root();
- template <typename T> T* get(T*& ret, rtl::OString sID)
+ //sID must exist and be of type T
+ template <typename T> T* get(T*& ret, OString sID)
{
Window *w = get_by_name(sID);
+ assert(w && dynamic_cast<T*>(w));
ret = static_cast<T*>(w);
-
-#if OSL_DEBUG_LEVEL > 0
- if (w)
- {
- ret = dynamic_cast<T*>(w);
- assert(ret);
- }
-#endif
-
return ret;
}
- template <typename T /*=Window if we had c++11*/> T* get(rtl::OString sID)
+ //sID may not exist, but must be of type T if it does
+ template <typename T /*=Window if we had c++11*/> T* get(OString sID)
{
Window *w = get_by_name(sID);
- T* ret = static_cast<T*>(w);
-
-#if OSL_DEBUG_LEVEL > 0
- if (w)
- {
- ret = dynamic_cast<T*>(w);
- assert(ret);
- }
-#endif
-
- return ret;
+ assert(!w || dynamic_cast<T*>(w));
+ return static_cast<T*>(w);
}
-
- rtl::OString get_by_window(const Window *pWindow) const;
+ OString get_by_window(const Window *pWindow) const;
+ void delete_by_window(const Window *pWindow);
//for the purposes of retrofitting this to the existing code
//look up sID, clone its properties into replacement and
//splice replacement into the tree instead of it, without
//taking ownership of it
- bool replace(rtl::OString sID, Window &rReplacement);
+ bool replace(OString sID, Window &rReplacement);
private:
- Window *insertObject(Window *pParent, const rtl::OString &rClass, const rtl::OString &rID, stringmap &rVec);
- Window *makeObject(Window *pParent, const rtl::OString &rClass, const rtl::OString &rID, stringmap &rVec);
- bool extractGroup(const rtl::OString &id, stringmap &rVec);
- bool extractModel(const rtl::OString &id, stringmap &rVec);
- bool extractAdjustment(const rtl::OString &id, stringmap &rVec);
+ Window *insertObject(Window *pParent, const OString &rClass, const OString &rID, stringmap &rVec);
+ Window *makeObject(Window *pParent, const OString &rClass, const OString &rID, stringmap &rVec);
+ bool extractGroup(const OString &id, stringmap &rVec);
+ bool extractModel(const OString &id, stringmap &rVec);
+ bool extractSpinAdjustment(const OString &id, stringmap &rVec);
+ bool extractScrollAdjustment(const OString &id, stringmap &rVec);
+ bool extractImage(const OString &id, stringmap &rMap);
+ bool extractStock(const OString &id, stringmap &rMap);
void handleTranslations(xmlreader::XmlReader &reader);
@@ -169,11 +180,11 @@ private:
Window* handleObject(Window *pParent, xmlreader::XmlReader &reader);
void handlePacking(Window *pCurrent, xmlreader::XmlReader &reader);
void applyPackingProperty(Window *pCurrent, xmlreader::XmlReader &reader);
- void collectProperty(xmlreader::XmlReader &reader, const rtl::OString &rID, stringmap &rVec);
+ void collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rVec);
- void handleListStore(xmlreader::XmlReader &reader, const rtl::OString &rID);
- void handleRow(xmlreader::XmlReader &reader, const rtl::OString &rID, sal_Int32 nRowIndex);
- void handleAdjustment(const rtl::OString &rID, stringmap &rProperties);
+ void handleListStore(xmlreader::XmlReader &reader, const OString &rID);
+ void handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex);
+ void handleAdjustment(const OString &rID, stringmap &rProperties);
void handleTabChild(Window *pParent, xmlreader::XmlReader &reader);
sal_Int32 get_window_packing_position(const Window *pWindow) const;
@@ -205,14 +216,14 @@ protected:
public:
VclBuilderContainer();
virtual ~VclBuilderContainer();
- static rtl::OUString getUIRootDir();
+ static OUString getUIRootDir();
static VclBuilder* overrideResourceWithUIXML(Window *pWindow, const ResId& rResId);
static bool replace_buildable(Window *pParent, const ResId& rResId, Window &rReplacement);
- template <typename T> T* get(T*& ret, rtl::OString sID)
+ template <typename T> T* get(T*& ret, OString sID)
{
return m_pUIBuilder->get<T>(ret, sID);
}
- template <typename T /*=Window if we had c++11*/> T* get(rtl::OString sID)
+ template <typename T /*=Window if we had c++11*/> T* get(OString sID)
{
return m_pUIBuilder->get<T>(sID);
}
@@ -221,7 +232,7 @@ public:
/*
* @return true if rValue is "True", "true", "1", etc.
*/
-bool VCL_DLLPUBLIC toBool(const rtl::OString &rValue);
+bool VCL_DLLPUBLIC toBool(const OString &rValue);
#endif
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 63163225fb6d..22ca60951970 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -58,6 +58,7 @@ private:
sal_Bool mbOldSaveBack;
sal_Bool mbInClose;
sal_Bool mbModalMode;
+ bool mbIsDefferedInit;
Timer maLayoutTimer;
SAL_DLLPRIVATE void ImplInitDialogData();
@@ -81,6 +82,7 @@ public:
SAL_DLLPRIVATE sal_Bool IsInClose() const { return mbInClose; }
SAL_DLLPRIVATE bool hasPendingLayout() const { return maLayoutTimer.IsActive(); }
SAL_DLLPRIVATE void doDeferredInit(bool bResizable);
+ SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; }
protected:
Dialog( WindowType nType );
@@ -89,7 +91,6 @@ protected:
public:
Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG );
- Dialog( Window* pParent, const ResId& rResId );
Dialog( Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription );
virtual ~Dialog();
diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index a3834af6d9dc..397e3cf0c507 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.hxx
@@ -44,6 +44,8 @@ class UserDrawEvent;
class VCL_DLLPUBLIC FixedText : public Control
{
private:
+ sal_Int32 m_nMaxWidthChars;
+
using Control::ImplInitSettings;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
@@ -71,10 +73,14 @@ public:
virtual void StateChanged( StateChangedType nType );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- static Size CalcMinimumTextSize( Control const* pControl, long nMaxWidth = 0 );
- Size CalcMinimumSize( long nMaxWidth = 0 ) const;
+ void setMaxWidthChars(sal_Int32 nWidth);
+ sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; }
+ static Size CalcMinimumTextSize(Control const* pControl, long nMaxWidth = 0x7fffffff);
+ static Size getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth);
+ Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const;
virtual Size GetOptimalSize(WindowSizeType eType) const;
virtual void take_properties(Window &rOther);
+ virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue);
};
// -------------
diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx
index 1906bcaa7e56..8753c3c8fd08 100644
--- a/vcl/inc/vcl/help.hxx
+++ b/vcl/inc/vcl/help.hxx
@@ -29,7 +29,7 @@
#ifndef _SV_HELP_HXX
#define _SV_HELP_HXX
-#include <tools/string.hxx>
+#include <rtl/ustring.hxx>
#include <tools/solar.h>
#include <vcl/dllapi.h>
@@ -69,19 +69,19 @@ class Window;
class VCL_DLLPUBLIC Help
{
private:
- String maHelpFile;
+ OUString maHelpFile;
public:
Help();
virtual ~Help();
- void SetHelpFile( const String& rFileName ) { maHelpFile = rFileName; }
- const String& GetHelpFile() const { return maHelpFile; }
+ void SetHelpFile( const OUString& rFileName ) { maHelpFile = rFileName; }
+ const OUString& GetHelpFile() const { return maHelpFile; }
- virtual sal_Bool Start( const XubString& rHelpId, const Window* pWindow );
- virtual sal_Bool SearchKeyword( const XubString& rKeyWord );
- virtual void OpenHelpAgent( const rtl::OString& rHelpId );
- virtual XubString GetHelpText( const String& aHelpURL, const Window* pWindow );
+ virtual sal_Bool Start( const OUString& rHelpId, const Window* pWindow );
+ virtual sal_Bool SearchKeyword( const OUString& rKeyWord );
+ virtual void OpenHelpAgent( const OString& rHelpId );
+ virtual OUString GetHelpText( const OUString& aHelpURL, const Window* pWindow );
static void EnableContextHelp();
static void DisableContextHelp();
@@ -98,35 +98,35 @@ public:
static sal_Bool IsBalloonHelpEnabled();
static sal_Bool ShowBalloon( Window* pParent,
const Point& rScreenPos,
- const XubString& rHelpText );
+ const OUString& rHelpText );
static sal_Bool ShowBalloon( Window* pParent,
const Point& rScreenPos,
const Rectangle&,
- const XubString& rHelpText );
+ const OUString& rHelpText );
static void EnableQuickHelp();
static void DisableQuickHelp();
static sal_Bool IsQuickHelpEnabled();
static sal_Bool ShowQuickHelp( Window* pParent,
const Rectangle& rScreenRect,
- const XubString& rHelpText,
- const XubString& rLongHelpText,
+ const OUString& rHelpText,
+ const OUString& rLongHelpText,
sal_uInt16 nStyle = 0 );
static sal_Bool ShowQuickHelp( Window* pParent,
const Rectangle& rScreenRect,
- const XubString& rHelpText,
+ const OUString& rHelpText,
sal_uInt16 nStyle = 0 )
- { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, XubString(), nStyle ); }
+ { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, OUString(), nStyle ); }
static void HideBalloonAndQuickHelp();
static sal_uLong ShowTip( Window* pParent,
const Rectangle& rScreenRect,
- const XubString& rText, sal_uInt16 nStyle = 0 );
+ const OUString& rText, sal_uInt16 nStyle = 0 );
static void UpdateTip( sal_uLong nId,
Window* pParent,
const Rectangle& rScreenRect,
- const XubString& rText );
+ const OUString& rText );
static void HideTip( sal_uLong nId );
};
diff --git a/vcl/inc/vcl/keycod.hxx b/vcl/inc/vcl/keycod.hxx
index a29b30843507..0d22720029df 100644
--- a/vcl/inc/vcl/keycod.hxx
+++ b/vcl/inc/vcl/keycod.hxx
@@ -101,8 +101,8 @@ inline KeyCode::KeyCode( sal_uInt16 nKey, sal_Bool bShift, sal_Bool bMod1, sal_B
nCode |= KEY_MOD1;
if( bMod2 )
nCode |= KEY_MOD2;
- if( bMod3 )
- nCode |= KEY_MOD3;
+ if( bMod3 )
+ nCode |= KEY_MOD3;
eFunc = KEYFUNC_DONTKNOW;
}
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index 9e869a3ae258..43fc7a9c60bd 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -53,7 +53,6 @@ public:
, m_bHomogeneous(bHomogeneous)
, m_nSpacing(nSpacing)
{
- Show();
}
void set_spacing(int nSpacing)
{
@@ -315,6 +314,11 @@ private:
{
int x;
int y;
+ ExtendedGridEntry()
+ : x(-1)
+ , y(-1)
+ {
+ }
};
typedef boost::multi_array<ExtendedGridEntry, 2> ext_array_type;
@@ -339,7 +343,6 @@ public:
, m_bRowHomogeneous(false), m_bColumnHomogeneous(false)
, m_nRowSpacing(0), m_nColumnSpacing(0)
{
- Show();
}
void set_row_homogeneous(bool bHomogeneous)
{
@@ -394,6 +397,8 @@ class VCL_DLLPUBLIC VclFrame : public VclBin
public:
VclFrame(Window *pParent) : VclBin(pParent) {}
void set_label(const rtl::OUString &rLabel);
+ Window *get_label_widget();
+ const Window *get_label_widget() const;
protected:
virtual Size calculateRequisition() const;
virtual void setAllocation(const Size &rAllocation);
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index cd931c74fa61..e908119a96ae 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -126,6 +126,7 @@ class VCL_DLLPUBLIC Menu : public Resource
{
friend class MenuBar;
friend class MenuBarWindow;
+ friend class MenuButton;
friend class MenuFloatingWindow;
friend class PopupMenu;
friend class SystemWindow;
diff --git a/vcl/inc/vcl/menubtn.hxx b/vcl/inc/vcl/menubtn.hxx
index c9906c9dd162..02e2f5dd7edd 100644
--- a/vcl/inc/vcl/menubtn.hxx
+++ b/vcl/inc/vcl/menubtn.hxx
@@ -35,6 +35,8 @@
class Timer;
class PopupMenu;
+class VclBuilder;
+class VclSimpleEvent;
// --------------------
// - MenuButton-Types -
@@ -49,12 +51,15 @@ class PopupMenu;
class VCL_DLLPUBLIC MenuButton : public PushButton
{
private:
+ friend class VclBuilder;
+
Rectangle maFocusRect;
Timer* mpMenuTimer;
PopupMenu* mpOwnMenu;
PopupMenu* mpMenu;
- sal_uInt16 mnCurItemId;
- sal_uInt16 mnMenuMode;
+ sal_uInt16 mnCurItemId;
+ sal_uInt16 mnMenuMode;
+ bool mbDisplaySelectedItem;
Link maActivateHdl;
Link maSelectHdl;
@@ -62,10 +67,14 @@ private:
SAL_DLLPRIVATE void ImplExecuteMenu();
DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* );
+ SAL_DLLPRIVATE void updateText();
+
// Copy assignment is forbidden and not implemented.
SAL_DLLPRIVATE MenuButton( const MenuButton & );
SAL_DLLPRIVATE MenuButton& operator=( const MenuButton & );
+ DECL_LINK(MenuEventListener, VclSimpleEvent*);
+
protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
@@ -95,6 +104,10 @@ public:
const Link& GetActivateHdl() const { return maActivateHdl; }
void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
const Link& GetSelectHdl() const { return maSelectHdl; }
+
+ void SetShowDisplaySelectedItem(bool bShow);
+
+ virtual Size GetOptimalSize(WindowSizeType eType) const;
};
#endif // _SV_MENUBTN_HXX
diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index 2bb73abed728..8a3fd1d690a3 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.hxx
@@ -34,7 +34,7 @@
#include <vcl/btndlg.hxx>
#include <vcl/image.hxx>
#include <vcl/bitmap.hxx>
-class VCLMultiLineEdit;
+class VclMultiLineEdit;
class FixedImage;
class CheckBox;
@@ -67,7 +67,7 @@ class CheckBox;
class VCL_DLLPUBLIC MessBox : public ButtonDialog
{
protected:
- VCLMultiLineEdit* mpVCLMultiLineEdit;
+ VclMultiLineEdit* mpVCLMultiLineEdit;
FixedImage* mpFixedImage;
XubString maMessText;
Image maImage;
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index e1721e9ef4f4..fabeb78217cb 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -134,17 +134,6 @@ struct ImplThresholdRes
long mnThresPixToLogY; // ""
};
-// ---------------
-// - KerningPair -
-// ---------------
-
-struct KerningPair
-{
- sal_Unicode nChar1;
- sal_Unicode nChar2;
- long nKern;
-};
-
// ----------------------
// - OutputDevice-Types -
// ----------------------
@@ -650,9 +639,6 @@ public:
static XubString GetNonMnemonicString( const XubString& rStr )
{ xub_StrLen nDummy; return GetNonMnemonicString( rStr, nDummy ); }
- sal_uLong GetKerningPairCount() const;
- void GetKerningPairs( sal_uLong nPairs, KerningPair* pKernPairs ) const;
-
sal_Bool GetTextBoundRect( Rectangle& rRect,
const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN,
sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const;
diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx
index 918f5e7b17b2..3d29c78102d3 100644
--- a/vcl/inc/vcl/scrbar.hxx
+++ b/vcl/inc/vcl/scrbar.hxx
@@ -147,6 +147,8 @@ public:
const Link& GetScrollHdl() const { return maScrollHdl; }
void SetEndScrollHdl( const Link& rLink ) { maEndScrollHdl = rLink; }
const Link& GetEndScrollHdl() const { return maEndScrollHdl; }
+
+ virtual Size GetOptimalSize(WindowSizeType eType) const;
};
// ----------------
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index 1de45f3f9d84..f913c0f8188c 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -121,7 +121,6 @@ public:
virtual long DeactivatePage();
virtual Size GetOptimalSize(WindowSizeType eType) const;
- void SetMinimumSizePixel( const Size& );
void SetTabPageSizePixel( const Size& rSize );
Size GetTabPageSizePixel() const;
diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx
index 519cb0e0948c..7ecb944d726b 100644
--- a/vcl/inc/vcl/vclmedit.hxx
+++ b/vcl/inc/vcl/vclmedit.hxx
@@ -34,15 +34,15 @@
#include <vcl/dllapi.h>
-class ImpSvMEdit;
+class ImpVclMEdit;
class Timer;
class ExtTextEngine;
class ExtTextView;
-class VCL_DLLPUBLIC VCLMultiLineEdit : public Edit
+class VCL_DLLPUBLIC VclMultiLineEdit : public Edit
{
private:
- ImpSvMEdit* pImpSvMEdit;
+ ImpVclMEdit* pImpVclMEdit;
XubString aSaveValue;
Link aModifyHdlLink;
@@ -66,9 +66,9 @@ protected:
ScrollBar* GetVScrollBar() const;
public:
- VCLMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER );
- VCLMultiLineEdit( Window* pParent, const ResId& rResId );
- virtual ~VCLMultiLineEdit();
+ VclMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER );
+ VclMultiLineEdit( Window* pParent, const ResId& rResId );
+ virtual ~VclMultiLineEdit();
virtual void Modify();
@@ -139,7 +139,7 @@ public:
void SetTextSelectable( sal_Bool bTextSelectable );
};
-inline sal_uLong VCLMultiLineEdit::IsUpdateDataEnabled() const
+inline sal_uLong VclMultiLineEdit::IsUpdateDataEnabled() const
{
return pUpdateDataTimer ? pUpdateDataTimer->GetTimeout() : 0;
}
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 0de41b613404..5b83760ee6cd 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -126,8 +126,6 @@ namespace dnd {
namespace vcl {
struct ControlLayoutData;
- class WindowArranger;
- struct ExtWindowImpl;
}
namespace svt { class PopupWindowControllerImpl; }
@@ -484,10 +482,7 @@ public:
SAL_DLLPRIVATE sal_Bool ImplUpdatePos();
SAL_DLLPRIVATE void ImplUpdateSysObjPos();
SAL_DLLPRIVATE WindowImpl* ImplGetWindowImpl() const { return mpWindowImpl; }
- SAL_DLLPRIVATE void ImplFreeExtWindowImpl();
- // creates ExtWindowImpl on demand, but may return NULL (e.g. if mbInDtor)
- SAL_DLLPRIVATE vcl::ExtWindowImpl* ImplGetExtWindowImpl() const;
- SAL_DLLPRIVATE void ImplDeleteOwnedChildren();
+
/** check whether a font is suitable for UI
The font to be tested will be checked whether it could display a
@@ -550,7 +545,6 @@ public:
SAL_DLLPRIVATE sal_Bool ImplRegisterAccessibleNativeFrame();
SAL_DLLPRIVATE void ImplRevokeAccessibleNativeFrame();
SAL_DLLPRIVATE void ImplCallResize();
- SAL_DLLPRIVATE void ImplExtResize();
SAL_DLLPRIVATE void ImplCallMove();
SAL_DLLPRIVATE Rectangle ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle& rRect ) const;
SAL_DLLPRIVATE void ImplMirrorFramePos( Point &pt ) const;
@@ -601,6 +595,9 @@ protected:
*/
SAL_DLLPRIVATE void queue_resize();
+ sal_Int32 get_height_request() const;
+ sal_Int32 get_width_request() const;
+
// FIXME: this is a hack to workaround missing layout functionality
SAL_DLLPRIVATE void ImplAdjustNWFSizes();
public:
@@ -1310,41 +1307,6 @@ public:
virtual rtl::OUString GetSurroundingText() const;
virtual Selection GetSurroundingTextSelection() const;
-
- // ExtImpl
-
- // layouting
- boost::shared_ptr< vcl::WindowArranger > getLayout();
-
- /* add a child Window
- addWindow will do the following things
- - insert the passed window into the child list (equivalent to i_pWin->SetParent( this ))
- - mark the window as "owned", meaning that the added Window will be destroyed by
- the parent's desctructor.
- This means: do not pass in member windows or stack objects here. Do not cause
- the destructor of the added window to be called in any way.
-
- to avoid ownership pass i_bTakeOwnership as "false"
- */
- void addWindow( Window* i_pWin, bool i_bTakeOwnership = true );
-
- /* return the identifier of this window
- */
- const rtl::OUString& getIdentifier() const;
-
- /* returns the first found descendant that matches
- the passed identifier or NULL
- */
- Window* findWindow( const rtl::OUString& ) const;
-
- /* get/set properties
- this will contain window properties (like visible, enabled)
- as well as properties of derived classes (e.g. text of Edit fields)
- */
- virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getProperties() const;
- /*
- */
- virtual void setProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& );
};
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index dd7718b82e2f..cb48d04118d8 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -101,7 +101,6 @@ namespace dnd {
namespace vcl {
struct ControlLayoutData;
- struct ExtWindowImpl;
}
@@ -269,7 +268,6 @@ public:
ImplDelData* mpFirstDel;
void* mpUserData;
- vcl::ExtWindowImpl* mpExtImpl;
Cursor* mpCursor;
Pointer maPointer;
Fraction maZoom;
generated by cgit (git 2.34.1) at 2025-01-28 02:07:39 +0000