summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-04-22 00:58:58 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2014-04-22 02:30:39 +1000
commit3f52bc19d508863267ca09c761dc08f773da48bc (patch)
tree0635e4192c4095dc84839c90557d0b5e47a54ed4 /vcl
parent31ae9995759c42844aede3f6b66812350f3bf640 (diff)
Reorganize native control functions in OutputDevice
Rename lcl_* functions in nativecontrols.cxx, also renamed outdevnative.cxx to nativecontrols.cxx Change-Id: Ie9a362f09cb5044e486086e7d890ae433f7dddc6
Diffstat (limited to 'vcl')
-rw-r--r--vcl/Library_vcl.mk2
-rw-r--r--vcl/source/outdev/nativecontrols.cxx (renamed from vcl/source/outdev/outdevnative.cxx)16
2 files changed, 9 insertions, 9 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 4cfa61af0a9c..b82354ce8dbf 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -251,7 +251,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/outdev/gradient \
vcl/source/outdev/curvedshapes \
vcl/source/outdev/wallpaper \
- vcl/source/outdev/outdevnative \
+ vcl/source/outdev/nativecontrols \
vcl/source/outdev/outmap \
vcl/source/gdi/pdfextoutdevdata \
vcl/source/gdi/pdffontcache \
diff --git a/vcl/source/outdev/outdevnative.cxx b/vcl/source/outdev/nativecontrols.cxx
index 8b0ef8a27de9..2a78cce09f9e 100644
--- a/vcl/source/outdev/outdevnative.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -24,7 +24,7 @@
#include "salgdi.hxx"
-static bool lcl_enableNativeWidget( const OutputDevice& i_rDevice )
+static bool EnableNativeWidget( const OutputDevice& i_rDevice )
{
const OutDevType eType( i_rDevice.GetOutDevType() );
switch ( eType )
@@ -142,7 +142,7 @@ PushButtonValue* PushButtonValue::clone() const
bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPart ) const
{
- if( !lcl_enableNativeWidget( *this ) )
+ if( !EnableNativeWidget( *this ) )
return false;
if ( !mpGraphics )
@@ -158,7 +158,7 @@ bool OutputDevice::HitTestNativeControl( ControlType nType,
const Point& aPos,
bool& rIsInside ) const
{
- if( !lcl_enableNativeWidget( *this ) )
+ if( !EnableNativeWidget( *this ) )
return false;
if ( !mpGraphics )
@@ -173,7 +173,7 @@ bool OutputDevice::HitTestNativeControl( ControlType nType,
rIsInside, this ) );
}
-static boost::shared_ptr< ImplControlValue > lcl_transformControlValue( const ImplControlValue& rVal, const OutputDevice& rDev )
+static boost::shared_ptr< ImplControlValue > TransformControlValue( const ImplControlValue& rVal, const OutputDevice& rDev )
{
boost::shared_ptr< ImplControlValue > aResult;
switch( rVal.getType() )
@@ -258,7 +258,7 @@ bool OutputDevice::DrawNativeControl( ControlType nType,
const ImplControlValue& aValue,
const OUString& aCaption )
{
- if( !lcl_enableNativeWidget( *this ) )
+ if( !EnableNativeWidget( *this ) )
return false;
// make sure the current clip region is initialized correctly
@@ -278,7 +278,7 @@ bool OutputDevice::DrawNativeControl( ControlType nType,
// Convert the coordinates from relative to Window-absolute, so we draw
// in the correct place in platform code
- boost::shared_ptr< ImplControlValue > aScreenCtrlValue( lcl_transformControlValue( aValue, *this ) );
+ boost::shared_ptr< ImplControlValue > aScreenCtrlValue( TransformControlValue( aValue, *this ) );
Rectangle screenRegion( ImplLogicToDevicePixel( rControlRegion ) );
Region aTestRegion( GetActiveClipRegion() );
@@ -300,7 +300,7 @@ bool OutputDevice::GetNativeControlRegion( ControlType nType,
Rectangle &rNativeBoundingRegion,
Rectangle &rNativeContentRegion ) const
{
- if( !lcl_enableNativeWidget( *this ) )
+ if( !EnableNativeWidget( *this ) )
return false;
if ( !mpGraphics )
@@ -309,7 +309,7 @@ bool OutputDevice::GetNativeControlRegion( ControlType nType,
// Convert the coordinates from relative to Window-absolute, so we draw
// in the correct place in platform code
- boost::shared_ptr< ImplControlValue > aScreenCtrlValue( lcl_transformControlValue( aValue, *this ) );
+ boost::shared_ptr< ImplControlValue > aScreenCtrlValue( TransformControlValue( aValue, *this ) );
Rectangle screenRegion( ImplLogicToDevicePixel( rControlRegion ) );
bool bRet = mpGraphics->GetNativeControlRegion(nType, nPart, screenRegion, nState, *aScreenCtrlValue,