summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/decoview.cxx2
-rw-r--r--vcl/source/window/dockwin.cxx2
-rw-r--r--vcl/source/window/menubarwindow.cxx2
-rw-r--r--vcl/source/window/paint.cxx6
-rw-r--r--vcl/source/window/printdlg.cxx28
-rw-r--r--vcl/source/window/resource.cxx4
-rw-r--r--vcl/source/window/window.cxx2
-rw-r--r--vcl/source/window/window2.cxx4
8 files changed, 25 insertions, 25 deletions
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 9c9c7e439a16..e40d3b56cbae 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -510,7 +510,7 @@ void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect,
Size aBrdSize( 1, 1 );
if ( pDev->GetOutDevType() == OUTDEV_PRINTER )
{
- aBrdSize = pDev->LogicToPixel( Size( 20, 20 ), MapMode(MAP_100TH_MM) );
+ aBrdSize = pDev->LogicToPixel( Size( 20, 20 ), MapMode(MapUnit::Map100thMM) );
if ( !aBrdSize.Width() )
aBrdSize.Width() = 1;
if ( !aBrdSize.Height() )
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index f069b5583241..af27e481071d 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -377,7 +377,7 @@ void DockingWindow::ImplLoadRes( const ResId& rResId )
{
// use Sizes of the Resource
Point aPos;
- MapUnit ePosMap = MAP_PIXEL;
+ MapUnit ePosMap = MapUnit::MapPixel;
if ( RSC_DOCKINGWINDOW_XYMAPMODE & nMask )
ePosMap = (MapUnit)ReadLongRes();
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index a0167833edc4..f412db46a7cd 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -894,7 +894,7 @@ void MenuBarWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
{
rRenderContext.Push(PushFlags::LINECOLOR | PushFlags::MAPMODE);
rRenderContext.SetLineColor(Color(COL_WHITE));
- rRenderContext.SetMapMode(MapMode(MAP_PIXEL));
+ rRenderContext.SetMapMode(MapMode(MapUnit::MapPixel));
Size aSize = GetSizePixel();
rRenderContext.DrawLine(Point(0, aSize.Height() - 1),
Point(aSize.Width() - 1, aSize.Height() - 1));
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 96054a2b37ae..af0896c69ece 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -123,7 +123,7 @@ PaintBufferGuard::~PaintBufferGuard()
{
// Make sure that the +1 value GetSize() adds to the size is in pixels.
Size aPaintRectSize;
- if (m_pWindow->GetMapMode().GetMapUnit() == MAP_PIXEL)
+ if (m_pWindow->GetMapMode().GetMapUnit() == MapUnit::MapPixel)
{
aPaintRectSize = m_aPaintRect.GetSize();
}
@@ -1338,8 +1338,8 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
bool bOutput = IsOutputEnabled();
EnableOutput();
- SAL_WARN_IF( GetMapMode().GetMapUnit() != MAP_PIXEL, "vcl", "MapMode must be PIXEL based" );
- if ( GetMapMode().GetMapUnit() != MAP_PIXEL )
+ SAL_WARN_IF( GetMapMode().GetMapUnit() != MapUnit::MapPixel, "vcl", "MapMode must be PIXEL based" );
+ if ( GetMapMode().GetMapUnit() != MapUnit::MapPixel )
return;
// preserve graphicsstate
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 19d292c68c1e..d0abe927796a 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -233,18 +233,18 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi
// use correct measurements
const LocaleDataWrapper& rLocWrap( GetSettings().GetLocaleDataWrapper() );
- MapUnit eUnit = MAP_MM;
+ MapUnit eUnit = MapUnit::MapMM;
int nDigits = 0;
if( rLocWrap.getMeasurementSystemEnum() == MEASURE_US )
{
- eUnit = MAP_100TH_INCH;
+ eUnit = MapUnit::Map100thInch;
nDigits = 2;
}
- Size aLogicPaperSize( LogicToLogic( i_rOrigSize, MapMode( MAP_100TH_MM ), MapMode( eUnit ) ) );
+ Size aLogicPaperSize( LogicToLogic( i_rOrigSize, MapMode( MapUnit::Map100thMM ), MapMode( eUnit ) ) );
OUString aNumText( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) );
aBuf.append( aNumText )
.append( sal_Unicode( ' ' ) );
- aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" );
+ aBuf.appendAscii( eUnit == MapUnit::MapMM ? "mm" : "in" );
if( !i_rPaperName.isEmpty() )
{
aBuf.append( " (" );
@@ -256,7 +256,7 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi
aNumText = rLocWrap.getNum( aLogicPaperSize.Height(), nDigits );
aBuf.append( aNumText )
.append( sal_Unicode( ' ' ) );
- aBuf.appendAscii( eUnit == MAP_MM ? "mm" : "in" );
+ aBuf.appendAscii( eUnit == MapUnit::MapMM ? "mm" : "in" );
maVertDim->SetText( aBuf.makeStringAndClear() );
Resize();
@@ -269,7 +269,7 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap()
GDIMetaFile aMtf( maMtf );
Size aVDevSize( maPageVDev->GetOutputSizePixel() );
- const Size aLogicSize( maPageVDev->PixelToLogic( aVDevSize, MapMode( MAP_100TH_MM ) ) );
+ const Size aLogicSize( maPageVDev->PixelToLogic( aVDevSize, MapMode( MapUnit::Map100thMM ) ) );
Size aOrigSize( maOrigSize );
if( aOrigSize.Width() < 1 )
aOrigSize.Width() = aLogicSize.Width();
@@ -279,7 +279,7 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap()
maPageVDev->Erase();
maPageVDev->Push();
- maPageVDev->SetMapMode( MAP_100TH_MM );
+ maPageVDev->SetMapMode( MapUnit::Map100thMM );
DrawModeFlags nOldDrawMode = maPageVDev->GetDrawMode();
if( mbGreyscale )
maPageVDev->SetDrawMode( maPageVDev->GetDrawMode() |
@@ -296,8 +296,8 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap()
maPageVDev->Pop();
- SetMapMode( MAP_PIXEL );
- maPageVDev->SetMapMode( MAP_PIXEL );
+ SetMapMode( MapUnit::MapPixel );
+ maPageVDev->SetMapMode( MapUnit::MapPixel );
maPreviewBitmap = Bitmap(maPageVDev->GetBitmap(Point(0, 0), aVDevSize));
@@ -327,7 +327,7 @@ void PrintDialog::ShowNupOrderWindow::Paint(vcl::RenderContext& rRenderContext,
{
Window::Paint(rRenderContext, i_rRect);
- rRenderContext.SetMapMode(MAP_PIXEL);
+ rRenderContext.SetMapMode(MapUnit::MapPixel);
rRenderContext.SetTextColor(rRenderContext.GetSettings().GetStyleSettings().GetFieldTextColor());
int nPages = mnRows * mnColumns;
@@ -653,7 +653,7 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC
// setup sizes for N-Up
Size aNupSize( maPController->getPrinter()->PixelToLogic(
- maPController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
+ maPController->getPrinter()->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) ) );
if( maPController->getPrinter()->GetOrientation() == Orientation::Landscape )
{
maNupLandscapeSize = aNupSize;
@@ -1328,7 +1328,7 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
if( i_bNewPage )
{
- const MapMode aMapMode( MAP_100TH_MM );
+ const MapMode aMapMode( MapUnit::Map100thMM );
GDIMetaFile aMtf;
VclPtr<Printer> aPrt( maPController->getPrinter() );
if( nPages > 0 )
@@ -1342,7 +1342,7 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
}
}
- Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
+ Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MapUnit::Map100thMM ) );
mpPreviewWindow->setPreview( aMtf, aCurPageSize,
aPrt->GetPaperName(),
nPages > 0 ? OUString() : maNoPageStr,
@@ -1916,7 +1916,7 @@ PrintProgressDialog::PrintProgressDialog(vcl::Window* i_pParent, int i_nMax)
mpText->set_width_request(mpText->get_preferred_size().Width());
//Pick a useful max width
- mpProgress->set_width_request(mpProgress->LogicToPixel(Size(100, 0), MapMode(MAP_APPFONT)).Width());
+ mpProgress->set_width_request(mpProgress->LogicToPixel(Size(100, 0), MapMode(MapUnit::MapAppFont)).Width());
mpButton->SetClickHdl( LINK( this, PrintProgressDialog, ClickHdl ) );
diff --git a/vcl/source/window/resource.cxx b/vcl/source/window/resource.cxx
index 12536be7b543..abc5eed43d08 100644
--- a/vcl/source/window/resource.cxx
+++ b/vcl/source/window/resource.cxx
@@ -85,7 +85,7 @@ void Window::ImplLoadRes( const ResId& rResId )
if ( nObjMask & (RscWindowFlags::XYMapMode | RscWindowFlags::X | RscWindowFlags::Y) )
{
// use size as per resource
- MapUnit ePosMap = MAP_PIXEL;
+ MapUnit ePosMap = MapUnit::MapPixel;
bPos = true;
@@ -100,7 +100,7 @@ void Window::ImplLoadRes( const ResId& rResId )
if ( nObjMask & (RscWindowFlags::WHMapMode | RscWindowFlags::Width | RscWindowFlags::Height) )
{
// use size as per resource
- MapUnit eSizeMap = MAP_PIXEL;
+ MapUnit eSizeMap = MapUnit::MapPixel;
bSize = true;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 2e1b9d527101..7086612e1f7e 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1044,7 +1044,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
mpWindowImpl->mpFrameData->mnFirstMouseCode = 0;
mpWindowImpl->mpFrameData->mnMouseCode = 0;
mpWindowImpl->mpFrameData->mnMouseMode = MouseEventModifiers::NONE;
- mpWindowImpl->mpFrameData->meMapUnit = MAP_PIXEL;
+ mpWindowImpl->mpFrameData->meMapUnit = MapUnit::MapPixel;
mpWindowImpl->mpFrameData->mbHasFocus = false;
mpWindowImpl->mpFrameData->mbInMouseMove = false;
mpWindowImpl->mpFrameData->mbMouseIn = false;
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 1c71a6497a1d..b668704f6e4e 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -646,7 +646,7 @@ vcl::Font Window::GetDrawPixelFont(OutputDevice* pDev) const
{
vcl::Font aFont = GetPointFont(*const_cast<Window*>(this));
Size aFontSize = aFont.GetFontSize();
- MapMode aPtMapMode(MAP_POINT);
+ MapMode aPtMapMode(MapUnit::MapPoint);
aFontSize = pDev->LogicToPixel( aFontSize, aPtMapMode );
aFont.SetFontSize( aFontSize );
return aFont;
@@ -657,7 +657,7 @@ long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const
long nP = nPixels;
if ( pDev->GetOutDevType() != OUTDEV_WINDOW )
{
- MapMode aMap( MAP_100TH_MM );
+ MapMode aMap( MapUnit::Map100thMM );
Size aSz( nP, 0 );
aSz = PixelToLogic( aSz, aMap );
aSz = pDev->LogicToPixel( aSz, aMap );
generated by cgit (git 2.34.1) at 2024-07-25 07:26:51 +0000