summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/opengl/x11/gdiimpl.hxx3
-rw-r--r--vcl/inc/unx/gtk/gtksys.hxx1
-rw-r--r--vcl/inc/unx/salgdi.h13
-rw-r--r--vcl/inc/unx/x11/x11gdiimpl.h2
-rw-r--r--vcl/inc/wizdlg.hxx42
-rw-r--r--vcl/opengl/x11/gdiimpl.cxx36
-rw-r--r--vcl/source/control/roadmapwizard.cxx48
-rw-r--r--vcl/source/control/tabctrl.cxx16
-rw-r--r--vcl/source/control/wizardmachine.cxx21
-rw-r--r--vcl/unx/generic/gdi/font.cxx27
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.cxx5
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.hxx3
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx37
-rw-r--r--vcl/unx/gtk3/gtk3gtksys.cxx6
14 files changed, 0 insertions, 260 deletions
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index 5d57605bf64d..6ecaf3f62f05 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -37,9 +37,6 @@ public:
virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override;
virtual void Init() override;
-
- bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey,
- int nX, int nY) override;
};
#endif // INCLUDED_VCL_INC_OPENGL_X11_GDIIMPL_HXX
diff --git a/vcl/inc/unx/gtk/gtksys.hxx b/vcl/inc/unx/gtk/gtksys.hxx
index 8c07ad623f53..1a888f970b27 100644
--- a/vcl/inc/unx/gtk/gtksys.hxx
+++ b/vcl/inc/unx/gtk/gtksys.hxx
@@ -35,7 +35,6 @@ public:
const std::vector< OUString >& rButtons) override;
SalX11Screen GetDisplayDefaultXScreen()
{ return getXScreenFromDisplayScreen( GetDisplayBuiltInScreen() ); }
- int GetDisplayXScreenCount();
SalX11Screen getXScreenFromDisplayScreen(unsigned int nDisplayScreen);
void countScreenMonitors();
// We have a 'screen' number that is combined from screen-idx + monitor-idx
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index dd75c47dee9f..adb7969434fb 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -276,17 +276,6 @@ public:
static void releaseCairoContext(cairo_t* cr);
- // do XCopyArea or XGet/PutImage depending on screen numbers
- // signature is like XCopyArea with screen numbers added
- static void CopyScreenArea(
- Display* pDisplay,
- Drawable aSrc, SalX11Screen nXScreenSrc, int nSrcDepth,
- Drawable aDest, SalX11Screen nXScreenDest, int nDestDepth,
- GC aDestGC,
- int src_x, int src_y,
- unsigned int w, unsigned int h,
- int dest_x, int dest_y );
-
protected:
using SalGraphics::SetClipRegion;
void SetClipRegion( GC pGC, Region pXReg = nullptr ) const;
@@ -294,8 +283,6 @@ protected:
using SalGraphics::DrawBitmap;
- GC GetFontGC();
-
void freeResources();
protected:
diff --git a/vcl/inc/unx/x11/x11gdiimpl.h b/vcl/inc/unx/x11/x11gdiimpl.h
index 6c2e8be7fb86..2e41e87c860d 100644
--- a/vcl/inc/unx/x11/x11gdiimpl.h
+++ b/vcl/inc/unx/x11/x11gdiimpl.h
@@ -18,8 +18,6 @@ class X11GraphicsImpl
{
public:
virtual ~X11GraphicsImpl() {};
-
- virtual bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int nX, int nY) = 0;
};
#endif // INCLUDED_VCL_INC_UNX_X11_X11GDIIMPL_HXX
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index aa181a6c0912..21f9e1364364 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -150,8 +150,6 @@ namespace vcl
/// enable (or disable) buttons
void enableButtons(WizardButtonFlags _nWizardButtonFlags, bool _bEnable);
- /// set the default style for a button
- void defaultButton(PushButton* _pNewDefButton);
/// determines whether there is a next state to which we can advance
bool canAdvance() const;
@@ -165,9 +163,6 @@ namespace vcl
void SetItemSelectHdl( const Link<LinkParamNone*,void>& _rHdl );
void ShowRoadmap(bool bShow);
- // returns whether a given state is enabled
- bool isStateEnabled( WizardTypes::WizardState _nState ) const;
-
protected:
/// to override to create new pages
@@ -262,43 +257,6 @@ namespace vcl
static IWizardPageController* getPageController( TabPage* _pCurrentPage );
- /** retrieves a copy of the state history, i.e. all states we already visited
- */
- void getStateHistory(std::vector<WizardTypes::WizardState>& out_rHistory);
-
- /** activates a path which has previously been declared with <member>declarePath</member>
-
- You can only activate paths which share the first <code>k</code> states with the path
- which is previously active (if any), where <code>k</code> is the index of the
- current state within the current path.
-
- <example>
- Say you have paths, <code>(0,1,2,5)</code> and <code>(0,1,4,5)</code>. This means that after
- step <code>1</code>, you either continue with state <code>2</code> or state <code>4</code>,
- and after this, you finish in state <code>5</code>.<br/>
- Now if the first path is active, and your current state is <code>1</code>, then you can
- easily switch to the second path, since both paths start with <code>(0,1)</code>.<br/>
- However, if your current state is <code>2</code>, then you can not switch to the second
- path anymore.
- </example>
-
- @param _nPathId
- the id of the path. The path must have been declared (under this id) with
- <member>declarePath</member> before it can be activated.
-
- @param _bDecideForIt
- If <TRUE/>, the path will be completely activated, even if it is a conflicting path
- (i.e. there is another path which shares the first <code>k</code> states with
- the to-be-activated path.)<br/>
- If <FALSE/>, then the new path is checked for conflicts with other paths. If such
- conflicts exists, the path is not completely activated, but only up to the point
- where it does <em>not</em> conflict.<br/>
- With the paths in the example above, if you activate the second path (when both are
- already declared), then only steps <code>0</code> and <code>1</code> are activated,
- since they are common to both paths.
- */
- void activatePath( RoadmapWizardTypes::PathId _nPathId, bool _bDecideForIt = false );
-
/** returns a human readable name for a given state
There is a default implementation for this method, which returns the display name
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index c9ae89b04d1f..f238422ff441 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -595,40 +595,4 @@ void X11OpenGLSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics*
OpenGLSalGraphicsImpl::DoCopyBits( rPosAry, *pImpl );
}
-typedef typename std::pair<ControlCacheKey, std::unique_ptr<TextureCombo>> ControlCachePair;
-typedef o3tl::lru_map<ControlCacheKey, std::unique_ptr<TextureCombo>, ControlCacheHashFunction> ControlCacheType;
-
-static vcl::DeleteOnDeinit<ControlCacheType> gTextureCache(new ControlCacheType(200));
-
-bool X11OpenGLSalGraphicsImpl::TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey, int nX, int nY)
-{
- static bool gbCacheEnabled = !getenv("SAL_WITHOUT_WIDGET_CACHE");
-
- if (!gbCacheEnabled || !gTextureCache.get())
- return false;
-
- ControlCacheType::const_iterator iterator = gTextureCache.get()->find(rControlCacheKey);
-
- if (iterator == gTextureCache.get()->end())
- return false;
-
- const std::unique_ptr<TextureCombo>& pCombo = iterator->second;
-
- PreDraw();
-
- OpenGLTexture& rTexture = *pCombo->mpTexture;
-
- SalTwoRect aPosAry(0, 0, rTexture.GetWidth(), rTexture.GetHeight(),
- nX, nY, rTexture.GetWidth(), rTexture.GetHeight());
-
- if (pCombo->mpMask)
- DrawTextureDiff(rTexture, *pCombo->mpMask, aPosAry, true);
- else
- DrawTexture(rTexture, aPosAry, true);
-
- PostDraw();
-
- return true;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx
index 513f319cbf45..160724c78ab3 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -237,49 +237,6 @@ namespace vcl
implUpdateRoadmap( );
}
- void RoadmapWizard::activatePath( PathId _nPathId, bool _bDecideForIt )
- {
-
- if ( ( _nPathId == m_xRoadmapImpl->nActivePath ) && ( _bDecideForIt == m_xRoadmapImpl->bActivePathIsDefinite ) )
- // nothing to do
- return;
-
- // does the given path exist?
- Paths::const_iterator aNewPathPos = m_xRoadmapImpl->aPaths.find( _nPathId );
- DBG_ASSERT( aNewPathPos != m_xRoadmapImpl->aPaths.end(), "RoadmapWizard::activate: there is no such path!" );
- if ( aNewPathPos == m_xRoadmapImpl->aPaths.end() )
- return;
-
- // determine the index of the current state in the current path
- sal_Int32 nCurrentStatePathIndex = -1;
- if ( m_xRoadmapImpl->nActivePath != -1 )
- nCurrentStatePathIndex = m_xRoadmapImpl->getStateIndexInPath( getCurrentState(), m_xRoadmapImpl->nActivePath );
-
- DBG_ASSERT( static_cast<sal_Int32>(aNewPathPos->second.size()) > nCurrentStatePathIndex,
- "RoadmapWizard::activate: you cannot activate a path which has less states than we've already advanced!" );
- // If this asserts, this for instance means that we are already in state number, say, 5
- // of our current path, and the caller tries to activate a path which has less than 5
- // states
- if ( static_cast<sal_Int32>(aNewPathPos->second.size()) <= nCurrentStatePathIndex )
- return;
-
- // assert that the current and the new path are equal, up to nCurrentStatePathIndex
- Paths::const_iterator aActivePathPos = m_xRoadmapImpl->aPaths.find( m_xRoadmapImpl->nActivePath );
- if ( aActivePathPos != m_xRoadmapImpl->aPaths.end() )
- {
- if ( RoadmapWizardImpl::getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) <= nCurrentStatePathIndex )
- {
- OSL_FAIL( "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" );
- return;
- }
- }
-
- m_xRoadmapImpl->nActivePath = _nPathId;
- m_xRoadmapImpl->bActivePathIsDefinite = _bDecideForIt;
-
- implUpdateRoadmap( );
- }
-
void RoadmapWizardMachine::activatePath( PathId _nPathId, bool _bDecideForIt )
{
if ( ( _nPathId == m_pImpl->nActivePath ) && ( _bDecideForIt == m_pImpl->bActivePathIsDefinite ) )
@@ -849,11 +806,6 @@ namespace vcl
return false;
}
- bool RoadmapWizard::isStateEnabled( WizardTypes::WizardState _nState ) const
- {
- return m_xRoadmapImpl->aDisabledStates.find( _nState ) == m_xRoadmapImpl->aDisabledStates.end();
- }
-
bool RoadmapWizardMachine::isStateEnabled( WizardTypes::WizardState _nState ) const
{
return m_pImpl->aDisabledStates.find( _nState ) == m_pImpl->aDisabledStates.end();
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 736579277bbe..a3de38da26a7 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1819,14 +1819,6 @@ sal_uInt16 TabControl::GetPageId( const Point& rPos ) const
return (it != rList.end()) ? it->id() : 0;
}
-sal_uInt16 TabControl::GetPageId( const TabPage& rPage ) const
-{
- const auto &rList = mpTabCtrlData->maItemList;
- const auto it = std::find_if(rList.begin(), rList.end(), [&rPage](const auto &item) {
- return item.mpTabPage == &rPage; });
- return (it != rList.end()) ? it->id() : 0;
-}
-
sal_uInt16 TabControl::GetPageId( const OString& rName ) const
{
const auto &rList = mpTabCtrlData->maItemList;
@@ -1989,14 +1981,6 @@ const OUString& TabControl::GetHelpText( sal_uInt16 nPageId ) const
return pItem->maHelpText;
}
-void TabControl::SetHelpId( sal_uInt16 nPageId, const OString& rId ) const
-{
- ImplTabItem* pItem = ImplGetItem( nPageId );
-
- if ( pItem )
- pItem->maHelpId = rId;
-}
-
void TabControl::SetPageName( sal_uInt16 nPageId, const OString& rName ) const
{
ImplTabItem* pItem = ImplGetItem( nPageId );
diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index b5f1afd5b0c8..52d2df57b1e8 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -734,17 +734,6 @@ namespace vcl
}
}
- void RoadmapWizard::defaultButton(PushButton* _pNewDefButton)
- {
- // loop through all (direct and indirect) descendants which participate in our tabbing order, and
- // reset the WB_DEFBUTTON for every window which is a button
- implResetDefault(this);
-
- // set its new style
- if (_pNewDefButton)
- _pNewDefButton->SetStyle(_pNewDefButton->GetStyle() | WB_DEFBUTTON);
- }
-
void RoadmapWizard::enableButtons(WizardButtonFlags _nWizardButtonFlags, bool _bEnable)
{
if (m_pFinish && (_nWizardButtonFlags & WizardButtonFlags::FINISH))
@@ -943,16 +932,6 @@ namespace vcl
return pController;
}
- void RoadmapWizard::getStateHistory( std::vector< WizardTypes::WizardState >& _out_rHistory )
- {
- std::stack< WizardTypes::WizardState > aHistoryCopy( m_xWizardImpl->aStateHistory );
- while ( !aHistoryCopy.empty() )
- {
- _out_rHistory.push_back( aHistoryCopy.top() );
- aHistoryCopy.pop();
- }
- }
-
bool RoadmapWizard::isTravelingSuspended() const
{
return m_xWizardImpl->m_bTravelingSuspended;
diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx
index 2efac7717edf..a9bfa743923e 100644
--- a/vcl/unx/generic/gdi/font.cxx
+++ b/vcl/unx/generic/gdi/font.cxx
@@ -24,33 +24,6 @@
#include <textrender.hxx>
#include <sallayout.hxx>
-GC
-X11SalGraphics::GetFontGC()
-{
- Display *pDisplay = GetXDisplay();
-
- if( !pFontGC_ )
- {
- XGCValues values;
- values.subwindow_mode = ClipByChildren;
- values.fill_rule = EvenOddRule; // Pict import/ Gradient
- values.graphics_exposures = False;
- values.foreground = nTextPixel_;
- pFontGC_ = XCreateGC( pDisplay, hDrawable_,
- GCSubwindowMode | GCFillRule
- | GCGraphicsExposures | GCForeground,
- &values );
- }
- if( !bFontGC_ )
- {
- XSetForeground( pDisplay, pFontGC_, nTextPixel_ );
- SetClipRegion( pFontGC_ );
- bFontGC_ = true;
- }
-
- return pFontGC_;
-}
-
void X11SalGraphics::DrawTextLayout(const GenericSalLayout& rLayout)
{
mxTextRenderImpl->DrawTextLayout(rLayout, *this);
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index de51359b6e6e..39154e85ee91 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -154,11 +154,6 @@ void X11SalGraphicsImpl::Init()
mnBrushPixel = mrParent.GetPixel( mnBrushColor );
}
-bool X11SalGraphicsImpl::TryRenderCachedNativeControl(ControlCacheKey& /*rControlCacheKey*/, int /*nX*/, int /*nY*/)
-{
- return false;
-}
-
XID X11SalGraphicsImpl::GetXRenderPicture()
{
XRenderPeer& rRenderPeer = XRenderPeer::GetInstance();
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 0b4861896b5e..315ed4094f8b 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -286,9 +286,6 @@ public:
// implementation of X11GraphicsImpl
void Init() override;
-
- virtual bool TryRenderCachedNativeControl(ControlCacheKey& rControlCacheKey,
- int nX, int nY) override;
};
#endif
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 7f470488bdd0..2e10ac7b0bed 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -31,43 +31,6 @@
#include <ControlCacheKey.hxx>
-void X11SalGraphics::CopyScreenArea( Display* pDisplay,
- Drawable aSrc, SalX11Screen nXScreenSrc, int nSrcDepth,
- Drawable aDest, SalX11Screen nXScreenDest, int nDestDepth,
- GC aDestGC,
- int src_x, int src_y,
- unsigned int w, unsigned int h,
- int dest_x, int dest_y )
-{
- if( nSrcDepth == nDestDepth )
- {
- if( nXScreenSrc == nXScreenDest )
- XCopyArea( pDisplay, aSrc, aDest, aDestGC,
- src_x, src_y, w, h, dest_x, dest_y );
- else
- {
- GetGenericUnixSalData()->ErrorTrapPush();
- XImage* pImage = XGetImage( pDisplay, aSrc, src_x, src_y, w, h,
- AllPlanes, ZPixmap );
- if( pImage )
- {
- if( pImage->data )
- XPutImage( pDisplay, aDest, aDestGC, pImage,
- 0, 0, dest_x, dest_y, w, h );
- XDestroyImage( pImage );
- }
- GetGenericUnixSalData()->ErrorTrapPop();
- }
- }
- else
- {
- X11SalBitmap aBM;
- aBM.ImplCreateFromDrawable( aSrc, nXScreenSrc, nSrcDepth, src_x, src_y, w, h );
- SalTwoRect aTwoRect(0, 0, w, h, dest_x, dest_y, w, h);
- aBM.ImplDraw(aDest, nXScreenDest, nDestDepth, aTwoRect,aDestGC);
- }
-}
-
extern "C"
{
static Bool GraphicsExposePredicate( Display*, XEvent* pEvent, const XPointer pFrameWindow )
diff --git a/vcl/unx/gtk3/gtk3gtksys.cxx b/vcl/unx/gtk3/gtk3gtksys.cxx
index 229a718c75a7..daf332b29d30 100644
--- a/vcl/unx/gtk3/gtk3gtksys.cxx
+++ b/vcl/unx/gtk3/gtk3gtksys.cxx
@@ -51,12 +51,6 @@ GtkSalSystem::~GtkSalSystem()
{
}
-int
-GtkSalSystem::GetDisplayXScreenCount()
-{
- return gdk_display_get_n_screens (mpDisplay);
-}
-
namespace
{
generated by cgit (git 2.34.1) at 2025-05-20 02:31:07 +0000