summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-02-21 23:45:01 +0100
committerThomas Arnhold <thomas@arnhold.org>2012-02-22 00:52:31 +0100
commit178ce4295ba864b4dd5082eff7e3444d5cead6ca (patch)
tree2f7ef1dbab04198bdb5daadd6c254a0180edd174 /vcl
parent936ebcfa4b44a90bdc8789ce7556f1ba3599375c (diff)
unusedcode.easy: vcl: remove DrawNativeControlText()
Diffstat (limited to 'vcl')
-rw-r--r--vcl/aqua/source/gdi/salnativewidgets.cxx18
-rw-r--r--vcl/inc/aqua/salgdi.h3
-rw-r--r--vcl/inc/ios/salgdi.h3
-rw-r--r--vcl/inc/salgdi.hxx12
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx3
-rw-r--r--vcl/inc/win/salgdi.h3
-rw-r--r--vcl/source/gdi/salgdilayout.cxx17
-rw-r--r--vcl/source/gdi/salnativewidgets-none.cxx22
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx21
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx27
-rw-r--r--vcl/unx/kde4/KDESalGraphics.hxx12
-rw-r--r--vcl/win/source/gdi/salnativewidgets-luna.cxx22
12 files changed, 0 insertions, 163 deletions
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 1b3798e483b0..a2f6298ac62f 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -1216,24 +1216,6 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
}
/*
- * DrawNativeControlText()
- *
- * OPTIONAL. Draws the requested text for the control described by nPart/nState.
- * Used if text not drawn by DrawNativeControl().
- *
- * rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- * aValue: An optional value (tristate/numerical/string)
- * aCaption: A caption or title string (like button text etc)
- */
-sal_Bool AquaSalGraphics::drawNativeControlText( ControlType /*nType*/, ControlPart /*nPart*/, const Rectangle& /*rControlRegion*/,
- ControlState /*nState*/, const ImplControlValue& /*aValue*/,
- const rtl::OUString& )
-{
- return( sal_False );
-}
-
-
-/*
* GetNativeControlRegion()
*
* If the return value is sal_True, rNativeBoundingRegion
diff --git a/vcl/inc/aqua/salgdi.h b/vcl/inc/aqua/salgdi.h
index 2f2af4fef952..50c4ca121272 100644
--- a/vcl/inc/aqua/salgdi.h
+++ b/vcl/inc/aqua/salgdi.h
@@ -238,9 +238,6 @@ public:
virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
const rtl::OUString& aCaption );
- virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
- ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& aCaption );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue, const rtl::OUString& aCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
diff --git a/vcl/inc/ios/salgdi.h b/vcl/inc/ios/salgdi.h
index 5773f3e929ed..92cf62083851 100644
--- a/vcl/inc/ios/salgdi.h
+++ b/vcl/inc/ios/salgdi.h
@@ -235,9 +235,6 @@ public:
virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
const rtl::OUString& aCaption );
- virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
- ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& aCaption );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue, const rtl::OUString& aCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index d29247bb229d..e351ed3e2f00 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -166,9 +166,6 @@ protected:
virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
const rtl::OUString& aCaption );
- virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
- ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& aCaption );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue, const rtl::OUString& aCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
@@ -453,15 +450,6 @@ public:
const rtl::OUString& aCaption,
const OutputDevice *pOutDev );
- // Request rendering of a caption string for a control
- sal_Bool DrawNativeControlText( ControlType nType,
- ControlPart nPart,
- const Rectangle& rControlRegion,
- ControlState nState,
- const ImplControlValue& aValue,
- const rtl::OUString& aCaption,
- const OutputDevice *pOutDev );
-
// Query the native control's actual drawing region (including adornment)
sal_Bool GetNativeControlRegion( ControlType nType,
ControlPart nPart,
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 9f5c4dda2a9a..bdc397e35c2e 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -142,9 +142,6 @@ public:
virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
const rtl::OUString& rCaption );
- virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
- ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& rCaption );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue, const rtl::OUString& rCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 079f0effe50e..974d16c1b427 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -260,9 +260,6 @@ protected:
virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
const rtl::OUString& aCaption );
- virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
- ControlState nState, const ImplControlValue& aValue,
- const rtl::OUString& aCaption );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue, const rtl::OUString& aCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index e38838087fea..21979056211d 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -744,23 +744,6 @@ sal_Bool SalGraphics::DrawNativeControl( ControlType nType, ControlPart nPart, c
return drawNativeControl( nType, nPart, rControlRegion, nState, aValue, aCaption );
}
-sal_Bool SalGraphics::DrawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
- ControlState nState, const ImplControlValue& aValue,
- const OUString& aCaption, const OutputDevice *pOutDev )
-{
- if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) )
- {
- Rectangle rgn( rControlRegion );
- mirror( rgn, pOutDev );
- boost::scoped_ptr< ImplControlValue > mirrorValue( aValue.clone());
- mirror( *mirrorValue, pOutDev );
- sal_Bool bRet = drawNativeControlText( nType, nPart, rgn, nState, *mirrorValue, aCaption );
- return bRet;
- }
- else
- return drawNativeControlText( nType, nPart, rControlRegion, nState, aValue, aCaption );
-}
-
sal_Bool SalGraphics::GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue, const OUString& aCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion, const OutputDevice *pOutDev )
diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx
index 7f32fdff01c3..c6d110142447 100644
--- a/vcl/source/gdi/salnativewidgets-none.cxx
+++ b/vcl/source/gdi/salnativewidgets-none.cxx
@@ -84,28 +84,6 @@ sal_Bool SalGraphics::drawNativeControl( ControlType,
return( sal_False );
}
-
-/*
- * DrawNativeControlText()
- *
- * OPTIONAL. Draws the requested text for the control described by nPart/nState.
- * Used if text not drawn by DrawNativeControl().
- *
- * rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- * aValue: An optional value (tristate/numerical/string)
- * aCaption: A caption or title string (like button text etc)
- */
-sal_Bool SalGraphics::drawNativeControlText( ControlType,
- ControlPart,
- const Rectangle&,
- ControlState,
- const ImplControlValue&,
- const OUString& )
-{
- return( sal_False );
-}
-
-
/*
* GetNativeControlRegion()
*
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index a55d3f4f2ccf..97299151cd6f 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -904,27 +904,6 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType,
}
/*
- * DrawNativeControlText()
- *
- * OPTIONAL. Draws the requested text for the control described by nPart/nState.
- * Used if text not drawn by DrawNativeControl().
- *
- * rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- * aValue: An optional value (tristate/numerical/string)
- * rCaption: A caption or title string (like button text etc)
- */
-sal_Bool GtkSalGraphics::drawNativeControlText( ControlType,
- ControlPart,
- const Rectangle&,
- ControlState,
- const ImplControlValue&,
- const OUString& )
-{
- return( sal_False );
-}
-
-
-/*
* GetNativeControlRegion()
*
* If the return value is sal_True, rNativeBoundingRegion
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 8ff0ce5f6463..adee91e73a32 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1179,10 +1179,6 @@ class KDESalGraphics : public X11SalGraphics
const Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue,
const OUString& aCaption );
- virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart,
- const Rectangle& rControlRegion, ControlState nState,
- const ImplControlValue& aValue,
- const OUString& aCaption );
virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart,
const Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue,
@@ -1471,29 +1467,6 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart
return bReturn;
}
-
-/** Draw text on the widget.
-
- OPTIONAL. Draws the requested text for the control described by nPart/nState.
- Used if text is not drawn by DrawNativeControl().
-
- @param rControlRegion
- The bounding region of the complete control in VCL frame coordinates.
-
- @param aValue
- An optional value (tristate/numerical/string)
-
- @param aCaption
- A caption or title string (like button text etc.)
-*/
-sal_Bool KDESalGraphics::drawNativeControlText( ControlType, ControlPart,
- const Rectangle&, ControlState,
- const ImplControlValue&,
- const OUString& )
-{
- return sal_False;
-}
-
/** Check if the bounding regions match.
If the return value is sal_True, rNativeBoundingRegion
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index 2f4c3f384c75..dd4ef01f1493 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -78,18 +78,6 @@ class KDESalGraphics : public X11SalGraphics
const ImplControlValue& aValue,
const rtl::OUString& aCaption );
- /** Draw text on the widget.
- OPTIONAL. Draws the requested text for the control described by part/nControlState.
- Used if text is not drawn by DrawNativeControl().
-
- @param rControlRegion The bounding region of the complete control in VCL frame coordinates.
- @param aValue An optional value (tristate/numerical/string)
- @param aCaption A caption or title string (like button text etc.)
- */
- virtual sal_Bool drawNativeControlText( ControlType, ControlPart,
- const Rectangle&, ControlState,
- const ImplControlValue&,
- const rtl::OUString& ) { return false; }
/** Check if the bounding regions match.
If the return value is TRUE, rNativeBoundingRegion
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 84910f3065db..36b345ac92ac 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -1173,28 +1173,6 @@ sal_Bool WinSalGraphics::drawNativeControl( ControlType nType,
return bOk;
}
-
-/*
- * DrawNativeControlText()
- *
- * OPTIONAL. Draws the requested text for the control described by nPart/nState.
- * Used if text not drawn by DrawNativeControl().
- *
- * rControlRegion: The bounding region of the complete control in VCL frame coordinates.
- * aValue: An optional value (tristate/numerical/string)
- * aCaption: A caption or title string (like button text etc)
- */
-sal_Bool WinSalGraphics::drawNativeControlText( ControlType,
- ControlPart,
- const Rectangle&,
- ControlState,
- const ImplControlValue&,
- const OUString& )
-{
- return( false );
-}
-
-
/*
* GetNativeControlRegion()
*