diff options
| -rw-r--r-- | vcl/aqua/inc/saldata.hxx | 6 | ||||
| -rw-r--r-- | vcl/aqua/inc/saltimer.h | 75 | ||||
| -rw-r--r-- | vcl/aqua/source/app/salinst.cxx | 38 | ||||
| -rw-r--r-- | vcl/aqua/source/app/saltimer.cxx | 32 | ||||
| -rw-r--r-- | vcl/aqua/source/gdi/salgdi.cxx | 12 | ||||
| -rw-r--r-- | vcl/aqua/source/gdi/salprn.cxx | 17 | ||||
| -rw-r--r-- | vcl/aqua/source/gdi/salvd.cxx | 19 |
7 files changed, 156 insertions, 43 deletions
diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/aqua/inc/saldata.hxx index db43931c5296..dd86bcf69ca9 100644 --- a/vcl/aqua/inc/saldata.hxx +++ b/vcl/aqua/inc/saldata.hxx @@ -2,9 +2,9 @@ * * $RCSfile: saldata.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: pluby $ $Date: 2000-11-01 22:12:26 $ + * last change: $Author: pluby $ $Date: 2000-11-30 00:01:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,7 +82,6 @@ class SalFrame; class SalVirtualDevice; class SalPrinter; class Font; -struct VCLVIEWCache; // ----------- // - SalData - @@ -109,7 +108,6 @@ struct SalData SalObject* mpFirstObject; // pointer of first object window SalVirtualDevice* mpFirstVD; // first VirDev SalPrinter* mpFirstPrinter; // first printing printer - VCLVIEWCache* mpVCLVIEWCache; // Cache for three DC's USHORT mnStockPenCount; // Anzahl statischer Pens USHORT mnStockBrushCount; // Anzahl statischer Brushes INT32 mnSalObjWantKeyEvt; // KeyEvent, welcher vom SalObj-Hook verarbeitet werden soll diff --git a/vcl/aqua/inc/saltimer.h b/vcl/aqua/inc/saltimer.h new file mode 100644 index 000000000000..34116b8ffa16 --- /dev/null +++ b/vcl/aqua/inc/saltimer.h @@ -0,0 +1,75 @@ +/************************************************************************* + * + * $RCSfile: saltimer.h,v $ + * + * $Revision: 1.1 $ + * + * last change: $Author: pluby $ $Date: 2000-11-30 00:01:50 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library 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 for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (the "License"); You may not use this file + * except in compliance with the License. You may obtain a copy of the + * License at http://www.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ + +#ifndef _SV_SALTIMER_H +#define _SV_SALTIMER_H + +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + +void CallSalTimerCallbackProc(); + +#ifdef __cplusplus +} +#endif // __cplusplus + +#endif // _SV_SALTIMER_H diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index a63b20365792..ff68fcac77d6 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salinst.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: pluby $ $Date: 2000-11-27 01:47:44 $ + * last change: $Author: pluby $ $Date: 2000-11-30 00:01:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,6 +78,9 @@ #ifndef _SV_SALSYS_HXX #include <salsys.hxx> #endif +#ifndef _SV_SALVD_HXX +#include <salvd.hxx> +#endif #ifndef _SV_DIALOG_HXX #include <dialog.hxx> #endif @@ -102,6 +105,7 @@ void SalAbort( const XubString& rErrorText ) void InitSalData() { SalData *pSalData = new SalData; + memset( pSalData, 0, sizeof( SalData ) ); SetSalData( pSalData ); } @@ -321,6 +325,36 @@ void SalInstance::DestroyObject( SalObject* pObject ) delete ( pObject ); } +// ----------------------------------------------------------------------- + +SalVirtualDevice* SalInstance::CreateVirtualDevice( SalGraphics* pGraphics, + long nDX, long nDY, USHORT nBitCount ) +{ + return new SalVirtualDevice(); +} + +// ----------------------------------------------------------------------- + +void SalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice ) +{ + delete pDevice; +} + +// ----------------------------------------------------------------------- + +SalPrinter* SalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) +{ + return NULL; +} + +// ----------------------------------------------------------------------- + +void SalInstance::DestroyPrinter( SalPrinter* pPrinter ) +{ +} + +// ----------------------------------------------------------------------- + void SalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) { } diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx index 663667633f83..d698759bbb20 100644 --- a/vcl/aqua/source/app/saltimer.cxx +++ b/vcl/aqua/source/app/saltimer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: saltimer.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: pluby $ $Date: 2000-11-01 22:12:30 $ + * last change: $Author: pluby $ $Date: 2000-11-30 00:01:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,25 +61,53 @@ #define _SV_SALTIMER_CXX +#ifndef _SV_SALDATA_HXX +#include <saldata.hxx> +#endif #ifndef _SV_SALTIMER_HXX #include <saltimer.hxx> #endif +#ifndef _SV_SALTIMER_HXX +#include <saltimer.h> +#endif +#ifndef _SV_VCLAPPLICATION_H +#include <VCLApplication.h> +#endif + +// ======================================================================= +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + +void CallSalTimerCallbackProc() +{ + SalData* pSalData = GetSalData(); + pSalData->mpTimerProc(); +} + +#ifdef __cplusplus +} +#endif // __cplusplus // ======================================================================= void SalTimer::Start( ULONG nMS ) { + VCLApplication_StartTimer( nMS ); } // ----------------------------------------------------------------------- void SalTimer::Stop() { + VCLApplication_StopTimer(); } // ----------------------------------------------------------------------- void SalTimer::SetCallback( SALTIMERPROC pProc ) { + SalData* pSalData = GetSalData(); + pSalData->mpTimerProc = pProc; } diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index a5b985f021d1..5b83d0fb57e6 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salgdi.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: bmahbod $ $Date: 2000-11-29 23:11:27 $ + * last change: $Author: pluby $ $Date: 2000-11-30 00:01:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -468,13 +468,19 @@ USHORT SalGraphics::SetFont( ImplFontSelectData* pFont ) long SalGraphics::GetCharWidth( sal_Unicode nChar1, sal_Unicode nChar2, long* pWidthAry ) { - return 1; + // Stub code: we have not yet written any interfaces to native fonts. + // However, we need to get some font info in order to continue porting. + return 10; } // ----------------------------------------------------------------------- void SalGraphics::GetFontMetric( ImplFontMetricData* pMetric ) { + // Stub code: we have not yet written any interfaces to native fonts. + // However, we need to get some font info in order to continue porting. + pMetric->mnAscent = 10; + pMetric->mnDescent = 10; } // ----------------------------------------------------------------------- diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index 19b76358985f..c4ab2d49a9d9 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salprn.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: pluby $ $Date: 2000-11-01 22:12:32 $ + * last change: $Author: pluby $ $Date: 2000-11-30 00:01:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -150,19 +150,6 @@ void SalInfoPrinter::GetPageInfo( const ImplJobSetup*, // ======================================================================= -SalPrinter* SalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) -{ - return NULL; -} - -// ----------------------------------------------------------------------- - -void SalInstance::DestroyPrinter( SalPrinter* pPrinter ) -{ -} - -// ----------------------------------------------------------------------- - SalPrinter::SalPrinter() { } diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx index e673ca934d38..20ed1b9c3c48 100644 --- a/vcl/aqua/source/gdi/salvd.cxx +++ b/vcl/aqua/source/gdi/salvd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salvd.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: pluby $ $Date: 2000-11-01 22:12:32 $ + * last change: $Author: pluby $ $Date: 2000-11-30 00:01:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,21 +76,6 @@ // ======================================================================= -SalVirtualDevice* SalInstance::CreateVirtualDevice( SalGraphics* pGraphics, - long nDX, long nDY, - USHORT nBitCount ) -{ - return NULL; -} - -// ----------------------------------------------------------------------- - -void SalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice ) -{ -} - -// ======================================================================= - SalVirtualDevice::SalVirtualDevice() { } |