diff options
Diffstat (limited to 'vcl/win')
37 files changed, 180 insertions, 2543 deletions
diff --git a/vcl/win/inc/salbmp.h b/vcl/win/inc/salbmp.h deleted file mode 100644 index 07655d6b7a65..000000000000 --- a/vcl/win/inc/salbmp.h +++ /dev/null @@ -1,88 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALBMP_H -#define _SV_SALBMP_H - -#include <wincomp.hxx> -#include <tools/gen.hxx> -#include <vcl/sv.h> -#include <vcl/salbmp.hxx> - -// -------------- -// - SalBitmap - -// -------------- - -struct BitmapBuffer; -class BitmapColor; -class BitmapPalette; -class SalGraphics; - -class WinSalBitmap : public SalBitmap -{ -private: - - Size maSize; - HGLOBAL mhDIB; - HBITMAP mhDDB; - sal_uInt16 mnBitCount; - -public: - - HGLOBAL ImplGethDIB() const { return mhDIB; } - HBITMAP ImplGethDDB() const { return mhDDB; } - - static HGLOBAL ImplCreateDIB( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ); - static HANDLE ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB ); - static sal_uInt16 ImplGetDIBColorCount( HGLOBAL hDIB ); - static void ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf, - const Size& rSizePixel, bool bRLE4 ); - -public: - - WinSalBitmap(); - virtual ~WinSalBitmap(); - -public: - - bool Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle ); - virtual bool Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ); - virtual bool Create( const SalBitmap& rSalBmpImpl ); - virtual bool Create( const SalBitmap& rSalBmpImpl, SalGraphics* pGraphics ); - virtual bool Create( const SalBitmap& rSalBmpImpl, sal_uInt16 nNewBitCount ); - - virtual void Destroy(); - - virtual Size GetSize() const { return maSize; } - virtual sal_uInt16 GetBitCount() const { return mnBitCount; } - - virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ); - virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ); - virtual bool GetSystemData( BitmapSystemData& rData ); -}; - -#endif // _SV_SALBMP_HXX diff --git a/vcl/win/inc/saldata.hxx b/vcl/win/inc/saldata.hxx deleted file mode 100755 index b86b4cc29ed4..000000000000 --- a/vcl/win/inc/saldata.hxx +++ /dev/null @@ -1,379 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALDATA_HXX -#define _SV_SALDATA_HXX - -#include <vcl/sv.h> -#include <vcl/svdata.hxx> -#include <vcl/salwtype.hxx> -#include <wincomp.hxx> - -#include "osl/module.h" - -#include <set> // for hMenu validation -#include <map> - -class AutoTimer; -class WinSalInstance; -class WinSalObject; -class WinSalFrame; -class WinSalVirtualDevice; -class WinSalPrinter; -class Font; -struct HDCCache; -struct TempFontItem; - -typedef HRESULT (WINAPI *DwmIsCompositionEnabled_ptr)(BOOL*); - -// -------------------- -// - Standard-Defines - -// -------------------- - -#define MAX_STOCKPEN 4 -#define MAX_STOCKBRUSH 4 -#define SAL_CLIPRECT_COUNT 16 - -// -------------------- -// - Icon cache - -// -------------------- - -struct SalIcon -{ - int nId; - HICON hIcon; - HICON hSmallIcon; - SalIcon *pNext; -}; - -// ----------- -// - SalData - -// ----------- - -class SalData -{ -public: - SalData(); - ~SalData(); - - // native widget framework - void initNWF(); - void deInitNWF(); - - // fill maVKMap; - void initKeyCodeMap(); - - // checks if the menuhandle was created by VCL - sal_Bool IsKnownMenuHandle( HMENU hMenu ); - -public: - HINSTANCE mhInst; // default instance handle - HINSTANCE mhPrevInst; // previous instance handle - int mnCmdShow; // default frame show style - HPALETTE mhDitherPal; // dither palette - HGLOBAL mhDitherDIB; // dither memory handle - BYTE* mpDitherDIB; // dither memory - BYTE* mpDitherDIBData; // beginning of DIB data - long* mpDitherDiff; // Dither mapping table - BYTE* mpDitherLow; // Dither mapping table - BYTE* mpDitherHigh; // Dither mapping table - sal_uLong mnTimerMS; // Current Time (in MS) of the Timer - sal_uLong mnTimerOrgMS; // Current Original Time (in MS) - DWORD mnNextTimerTime; - DWORD mnLastEventTime; - UINT mnTimerId; // windows timer id - sal_Bool mbInTimerProc; // timer event is currently being dispatched - HHOOK mhSalObjMsgHook; // hook to get interesting msg for SalObject - HWND mhWantLeaveMsg; // window handle, that want a MOUSELEAVE message - AutoTimer* mpMouseLeaveTimer; // Timer for MouseLeave Test - WinSalInstance* mpFirstInstance; // pointer of first instance - WinSalFrame* mpFirstFrame; // pointer of first frame - WinSalObject* mpFirstObject; // pointer of first object window - WinSalVirtualDevice* mpFirstVD; // first VirDev - WinSalPrinter* mpFirstPrinter; // first printing printer - HDCCache* mpHDCCache; // Cache for three DC's - HBITMAP mh50Bmp; // 50% Bitmap - HBRUSH mh50Brush; // 50% Brush - COLORREF maStockPenColorAry[MAX_STOCKPEN]; - COLORREF maStockBrushColorAry[MAX_STOCKBRUSH]; - HPEN mhStockPenAry[MAX_STOCKPEN]; - HBRUSH mhStockBrushAry[MAX_STOCKBRUSH]; - sal_uInt16 mnStockPenCount; // count of static pens - sal_uInt16 mnStockBrushCount; // count of static brushes - WPARAM mnSalObjWantKeyEvt; // KeyEvent, welcher vom SalObj-Hook verarbeitet werden soll - BYTE mnCacheDCInUse; // count of CacheDC in use - sal_Bool mbObjClassInit; // is SALOBJECTCLASS initialised - sal_Bool mbInPalChange; // is in WM_QUERYNEWPALETTE - DWORD mnAppThreadId; // Id from Applikation-Thread - BOOL mbScrSvrEnabled; // ScreenSaver enabled - int mnSageStatus; // status of Sage-DLL (DISABLE_AGENT == nicht vorhanden) - SysAgt_Enable_PROC mpSageEnableProc; // funktion to deactivate the system agent - SalIcon* mpFirstIcon; // icon cache, points to first icon, NULL if none - TempFontItem* mpTempFontItem; - sal_Bool mbThemeChanged; // true if visual theme was changed: throw away theme handles - sal_Bool mbThemeMenuSupport; - - // for GdiPlus GdiplusStartup/GdiplusShutdown - ULONG_PTR gdiplusToken; - - std::set< HMENU > mhMenuSet; // keeps track of menu handles created by VCL, used by IsKnownMenuHandle() - std::map< UINT,USHORT > maVKMap; // map some dynamic VK_* entries - oslModule maDwmLib; - DwmIsCompositionEnabled_ptr mpDwmIsCompositionEnabled; -}; - -inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = (void*)pData; } -inline SalData* GetSalData() { return (SalData*)ImplGetSVData()->mpSalData; } -inline SalData* GetAppSalData() { return (SalData*)ImplGetAppSVData()->mpSalData; } - -// -------------- -// - SalShlData - -// -------------- - -struct SalShlData -{ - HINSTANCE mhInst; // Instance of SAL-DLL - UINT mnWheelScrollLines; // WheelScrollLines - UINT mnWheelScrollChars; // WheelScrollChars - UINT mnWheelMsgId; // Wheel-Message-Id fuer W95 - WORD mnVersion; // System-Version (311 == 3.11) - BOOL mbW40; // Is System-Version >= 4.0 - BOOL mbWXP; // Windows XP - BOOL mbWPrinter; // true: use unicode printer functions - // false: use anis compat printer functions - OSVERSIONINFO maVersionInfo; -}; - -extern SalShlData aSalShlData; - -// ------------ -// - GDICache - -// ------------ - -#define CACHESIZE_HDC 3 -#define CACHED_HDC_1 0 -#define CACHED_HDC_2 1 -#define CACHED_HDC_DRAW 2 -#define CACHED_HDC_DEFEXT 64 - -struct HDCCache -{ - HDC mhDC; - HPALETTE mhDefPal; - HBITMAP mhDefBmp; - HBITMAP mhSelBmp; - HBITMAP mhActBmp; -}; - -void ImplClearHDCCache( SalData* pData ); -HDC ImplGetCachedDC( sal_uLong nID, HBITMAP hBmp = 0 ); -void ImplReleaseCachedDC( sal_uLong nID ); - -bool ImplAddTempFont( SalData&, const String& rFontFileURL ); -void ImplReleaseTempFonts( SalData& ); - -// -------------------------------------------- -// - SALSHL.CXX - for accessing DLL resources - -// -------------------------------------------- - -HCURSOR ImplLoadSalCursor( int nId ); -HBITMAP ImplLoadSalBitmap( int nId ); -sal_Bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ); - -// SALGDI.CXX -void ImplInitSalGDI(); -void ImplFreeSalGDI(); - -// -------------- -// - Prototypes - -// -------------- - -// \\WIN\SOURCE\APP\SALINST.CXX -void ImplSalYieldMutexAcquireWithWait(); -sal_Bool ImplSalYieldMutexTryToAcquire(); -void ImplSalYieldMutexAcquire(); -void ImplSalYieldMutexRelease(); -sal_uLong ImplSalReleaseYieldMutex(); -void ImplSalAcquireYieldMutex( sal_uLong nCount ); -sal_Bool ImplInterceptChildWindowKeyDown( MSG& rMsg ); - -// \\WIN\SOURCE\WINDOW\SALFRAME.CXX -LRESULT CALLBACK SalFrameWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ); -LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ); -// \SV\WIN\SOURCE\APP\SALTIMER.CXX -#define SALTIMERPROC_RECURSIVE 0xffffffff -void CALLBACK SalTimerProc( HWND hWnd, UINT nMsg, UINT_PTR nId, DWORD nTime ); - -// \WIN\SOURCE\WINDOW\SALFRAME.CXX -void SalTestMouseLeave(); -sal_Bool ImplWriteLastError( DWORD lastError, const char *szApiCall ); - -// \WIN\SOURCE\WINDOW\SALFRAME.CXX -long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ); -long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ); -sal_Bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult ); - -// \WIN\SOURCE\WINDOW\SALOBJ.CXX -WinSalObject* ImplFindSalObject( HWND hWndChild ); -sal_Bool ImplSalPreDispatchMsg( MSG* pMsg ); -void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT nDispatchResult ); - -// \WIN\SOURCE\GDI\SALGDI3.CXX -void ImplSalLogFontToFontA( HDC hDC, const LOGFONTA& rLogFont, Font& rFont ); -void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ); -bool ImplIsFontAvailable( HDC hDC, const UniString& rName ); - -// \WIN\SOURCE\APP\SALDATA.CXX -rtl_TextEncoding ImplSalGetSystemEncoding(); -ByteString ImplSalGetWinAnsiString( const UniString& rStr, sal_Bool bFileName = FALSE ); -UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen = STRING_LEN ); -int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ); - -// ----------- -// - Defines - -// ----------- - -#define SAL_FRAME_WNDEXTRA sizeof( DWORD ) -#define SAL_FRAME_THIS 0 -#define SAL_FRAME_CLASSNAMEA "SALFRAME" -#define SAL_FRAME_CLASSNAMEW L"SALFRAME" -#define SAL_SUBFRAME_CLASSNAMEA "SALSUBFRAME" -#define SAL_SUBFRAME_CLASSNAMEW L"SALSUBFRAME" -#define SAL_TMPSUBFRAME_CLASSNAMEW L"SALTMPSUBFRAME" -#define SAL_OBJECT_WNDEXTRA sizeof( DWORD ) -#define SAL_OBJECT_THIS 0 -#define SAL_OBJECT_CLASSNAMEA "SALOBJECT" -#define SAL_OBJECT_CLASSNAMEW L"SALOBJECT" -#define SAL_OBJECT_CHILDCLASSNAMEA "SALOBJECTCHILD" -#define SAL_OBJECT_CHILDCLASSNAMEW L"SALOBJECTCHILD" -#define SAL_COM_CLASSNAMEA "SALCOMWND" -#define SAL_COM_CLASSNAMEW L"SALCOMWND" - -#define SAL_MOUSELEAVE_TIMEOUT 300 - -// wParam == hDC; lParam == 0 -#define SAL_MSG_PRINTABORTJOB (WM_USER+110) -// wParam == bWait; lParam == 0 -#define SAL_MSG_THREADYIELD (WM_USER+111) -// wParam == 0; lParam == 0 -#define SAL_MSG_RELEASEWAITYIELD (WM_USER+112) -// wParam == 0; lParam == nMS -#define SAL_MSG_STARTTIMER (WM_USER+113) -// wParam == nFrameStyle; lParam == pParent; lResult == pFrame -#define SAL_MSG_CREATEFRAME (WM_USER+114) -// wParam == 0; lParam == 0 -#define SAL_MSG_DESTROYFRAME (WM_USER+115) -// wParam == 0; lParam == pParent; lResult == pObject -#define SAL_MSG_CREATEOBJECT (WM_USER+116) -// wParam == 0; lParam == pObject; -#define SAL_MSG_DESTROYOBJECT (WM_USER+117) -// wParam == hWnd; lParam == 0; lResult == hDC -#define SAL_MSG_GETDC (WM_USER+120) -// wParam == hWnd; lParam == 0 -#define SAL_MSG_RELEASEDC (WM_USER+121) -// wParam == newParentHwnd; lParam == oldHwnd; lResult == newhWnd -#define SAL_MSG_RECREATEHWND (WM_USER+122) -// wParam == newParentHwnd; lParam == oldHwnd; lResult == newhWnd -#define SAL_MSG_RECREATECHILDHWND (WM_USER+123) -// wParam == 0; lParam == HWND; -#define SAL_MSG_DESTROYHWND (WM_USER+124) - -// wParam == 0; lParam == pData -#define SAL_MSG_USEREVENT (WM_USER+130) -// wParam == 0; lParam == MousePosition relativ to upper left of screen -#define SAL_MSG_MOUSELEAVE (WM_USER+131) -// NULL-Message, soll nicht verarbeitet werden -#define SAL_MSG_DUMMY (WM_USER+132) -// wParam == 0; lParam == 0 -#define SAL_MSG_POSTFOCUS (WM_USER+133) -// wParam == wParam; lParam == lParam -#define SAL_MSG_POSTQUERYNEWPAL (WM_USER+134) -// wParam == wParam; lParam == lParam -#define SAL_MSG_POSTPALCHANGED (WM_USER+135) -// wParam == wParam; lParam == lParam -#define SAL_MSG_POSTMOVE (WM_USER+136) -// wParam == wParam; lParam == lParam -#define SAL_MSG_POSTCALLSIZE (WM_USER+137) -// wParam == pRECT; lParam == 0 -#define SAL_MSG_POSTPAINT (WM_USER+138) -// wParam == 0; lParam == pFrame; lResult 0 -#define SAL_MSG_FORCEPALETTE (WM_USER+139) -// wParam == 0; lParam == 0 -#define SAL_MSG_CAPTUREMOUSE (WM_USER+140) -// wParam == 0; lParam == 0 -#define SAL_MSG_RELEASEMOUSE (WM_USER+141) -// wParam == nFlags; lParam == 0 -#define SAL_MSG_TOTOP (WM_USER+142) -// wParam == bVisible; lParam == 0 -#define SAL_MSG_SHOW (WM_USER+143) -// wParam == 0; lParam == SalInputContext -#define SAL_MSG_SETINPUTCONTEXT (WM_USER+144) -// wParam == nFlags; lParam == 0 -#define SAL_MSG_ENDEXTTEXTINPUT (WM_USER+145) -// POSTTIMER-Message; wparam = 0, lParam == time -#define SAL_MSG_POSTTIMER (WM_USER+161) - -// SysChild-ToTop; wParam = 0; lParam = 0 -#define SALOBJ_MSG_TOTOP (WM_USER+160) -// POSTFOCUS-Message; wParam == bFocus; lParam == 0 -#define SALOBJ_MSG_POSTFOCUS (WM_USER+161) - - -// ----------------- -// - Helpfunctions - -// ----------------- - -// A/W-Wrapper -LONG ImplSetWindowLong( HWND hWnd, int nIndex, DWORD dwNewLong ); -LONG ImplGetWindowLong( HWND hWnd, int nIndex ); -BOOL ImplPostMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam ); -BOOL ImplSendMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam ); -BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax ); -BOOL ImplPeekMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg ); -LONG ImplDispatchMessage( CONST MSG *lpMsg ); - -inline void SetWindowPtr( HWND hWnd, WinSalFrame* pThis ) -{ - ImplSetWindowLong( hWnd, SAL_FRAME_THIS, (LONG)pThis ); -} - -inline WinSalFrame* GetWindowPtr( HWND hWnd ) -{ - return (WinSalFrame*)ImplGetWindowLong( hWnd, SAL_FRAME_THIS ); -} - -inline void SetSalObjWindowPtr( HWND hWnd, WinSalObject* pThis ) -{ - ImplSetWindowLong( hWnd, SAL_OBJECT_THIS, (LONG)pThis ); -} - -inline WinSalObject* GetSalObjWindowPtr( HWND hWnd ) -{ - return (WinSalObject*)ImplGetWindowLong( hWnd, SAL_OBJECT_THIS ); -} - -#endif // _SV_SALDATA_HXX diff --git a/vcl/win/inc/salframe.h b/vcl/win/inc/salframe.h deleted file mode 100644 index cfb26847db02..000000000000 --- a/vcl/win/inc/salframe.h +++ /dev/null @@ -1,150 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALFRAME_H -#define _SV_SALFRAME_H - -#include <vcl/sv.h> -#include <vcl/sysdata.hxx> -#include <vcl/salframe.hxx> - -class WinSalGraphics; - -// ---------------- -// - WinSalFrame - -// ---------------- - -class WinSalFrame : public SalFrame -{ -public: - HWND mhWnd; // Window handle - HCURSOR mhCursor; // cursor handle - HIMC mhDefIMEContext; // default IME-Context - WinSalGraphics* mpGraphics; // current frame graphics - WinSalGraphics* mpGraphics2; // current frame graphics for other threads - WinSalFrame* mpNextFrame; // pointer to next frame - HMENU mSelectedhMenu; // the menu where highlighting is currently going on - HMENU mLastActivatedhMenu; // the menu that was most recently opened - SystemEnvData maSysData; // system data - SalFrameState maState; // frame state - int mnShowState; // show state - long mnWidth; // client width in pixeln - long mnHeight; // client height in pixeln - int mnMinWidth; // min. client width in pixeln - int mnMinHeight; // min. client height in pixeln - int mnMaxWidth; // max. client width in pixeln - int mnMaxHeight; // max. client height in pixeln - RECT maFullScreenRect; // fullscreen rect - int mnFullScreenShowState; // fullscreen restore show state - UINT mnInputLang; // current Input Language - UINT mnInputCodePage; // current Input CodePage - sal_uIntPtr mnStyle; // style - sal_Bool mbGraphics; // is Graphics used - sal_Bool mbCaption; // has window a caption - sal_Bool mbBorder; // has window a border - sal_Bool mbFixBorder; // has window a fixed border - sal_Bool mbSizeBorder; // has window a sizeable border - sal_Bool mbNoIcon; // is an window without an icon - sal_Bool mbFloatWin; // is a FloatingWindow - sal_Bool mbFullScreen; // TRUE: in full screen mode - sal_Bool mbPresentation; // TRUE: Presentation Mode running - sal_Bool mbInShow; // innerhalb eines Show-Aufrufs - sal_Bool mbRestoreMaximize; // Restore-Maximize - sal_Bool mbInMoveMsg; // Move-Message wird verarbeitet - sal_Bool mbInSizeMsg; // Size-Message wird verarbeitet - sal_Bool mbFullScreenToolWin; // WS_EX_TOOLWINDOW reset in FullScreenMode - sal_Bool mbDefPos; // default-position - sal_Bool mbOverwriteState; // TRUE: WindowState darf umgesetzt werden - sal_Bool mbIME; // TRUE: We are in IME Mode - sal_Bool mbHandleIME; // TRUE: Wir handeln die IME-Messages - sal_Bool mbSpezIME; // TRUE: Spez IME - sal_Bool mbAtCursorIME; // TRUE: Wir behandeln nur einige IME-Messages - sal_Bool mbCandidateMode; // TRUE: Wir befinden uns im Candidate-Modus - static sal_Bool mbInReparent; // TRUE: ignore focus lost and gain due to reparenting - - RGNDATA* mpClipRgnData; - RECT* mpNextClipRect; - sal_Bool mbFirstClipRect; - sal_Int32 mnDisplay; // Display used for Fullscreen, 0 is primary monitor - - void updateScreenNumber(); -public: - WinSalFrame(); - virtual ~WinSalFrame(); - - virtual SalGraphics* GetGraphics(); - virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual sal_Bool PostEvent( void* pData ); - virtual void SetTitle( const XubString& rTitle ); - virtual void SetIcon( sal_uInt16 nIcon ); - virtual void SetMenu( SalMenu* pSalMenu ); - virtual void DrawMenuBar(); - virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); - virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = FALSE ); - virtual void Enable( sal_Bool bEnable ); - virtual void SetMinClientSize( long nWidth, long nHeight ); - virtual void SetMaxClientSize( long nWidth, long nHeight ); - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); - virtual void GetClientSize( long& rWidth, long& rHeight ); - virtual void GetWorkArea( Rectangle& rRect ); - virtual SalFrame* GetParent() const; - virtual void SetWindowState( const SalFrameState* pState ); - virtual sal_Bool GetWindowState( SalFrameState* pState ); - virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ); - virtual void StartPresentation( sal_Bool bStart ); - virtual void SetAlwaysOnTop( sal_Bool bOnTop ); - virtual void ToTop( sal_uInt16 nFlags ); - virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( sal_Bool bMouse ); - virtual void SetPointerPos( long nX, long nY ); - using SalFrame::Flush; - virtual void Flush(); - virtual void Sync(); - virtual void SetInputContext( SalInputContext* pContext ); - virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual String GetKeyName( sal_uInt16 nKeyCode ); - virtual String GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode ); - virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); - virtual LanguageType GetInputLanguage(); - virtual SalBitmap* SnapShot(); - virtual void UpdateSettings( AllSettings& rSettings ); - virtual void Beep( SoundType eSoundType ); - virtual const SystemEnvData* GetSystemData() const; - virtual SalPointerState GetPointerState(); - virtual void SetParent( SalFrame* pNewParent ); - virtual bool SetPluginParent( SystemParentData* pNewParent ); - virtual void SetBackgroundBitmap( SalBitmap* ); - virtual void SetScreenNumber( unsigned int ); - virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uIntPtr nRects ); - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual void EndSetClipRegion(); -}; - -void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ); - -#endif // _SV_SALFRAME_H diff --git a/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h deleted file mode 100755 index 70734846f445..000000000000 --- a/vcl/win/inc/salgdi.h +++ /dev/null @@ -1,398 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALGDI_H -#define _SV_SALGDI_H - -#include <vcl/sv.h> -#include <vcl/sallayout.hxx> -#include <vcl/salgdi.hxx> -#include <vcl/outfont.hxx> -#include <vcl/impfont.hxx> - -#include "boost/scoped_ptr.hpp" -#include <hash_set> - -class ImplFontSelectData; -class ImplWinFontEntry; -class ImplFontAttrCache; - -// ----------- -// - Defines - -// ----------- - -#define RGB_TO_PALRGB(nRGB) ((nRGB)|0x02000000) -#define PALRGB_TO_RGB(nPalRGB) ((nPalRGB)&0x00ffffff) - -// win32 platform specific options. Move them to the PMK file? - -#define GCP_KERN_HACK -#define GNG_VERT_HACK - -// win32 specific physically available font face -class ImplWinFontData : public ImplFontData -{ -public: - explicit ImplWinFontData( const ImplDevFontAttributes&, - int nFontHeight, BYTE eWinCharSet, - BYTE nPitchAndFamily ); - virtual ~ImplWinFontData(); - - virtual ImplFontData* Clone() const; - virtual ImplFontEntry* CreateFontInstance( ImplFontSelectData& ) const; - virtual sal_IntPtr GetFontId() const; - void SetFontId( sal_IntPtr nId ) { mnId = nId; } - void UpdateFromHDC( HDC ) const; - - bool HasChar( sal_uInt32 cChar ) const; - - BYTE GetCharSet() const { return meWinCharSet; } - BYTE GetPitchAndFamily() const { return mnPitchAndFamily; } - bool IsGlyphApiDisabled() const { return mbDisableGlyphApi; } - bool SupportsKorean() const { return mbHasKoreanRange; } - bool SupportsCJK() const { return mbHasCJKSupport; } - bool SupportsArabic() const { return mbHasArabicSupport; } - bool AliasSymbolsHigh() const { return mbAliasSymbolsHigh; } - bool AliasSymbolsLow() const { return mbAliasSymbolsLow; } -#ifdef ENABLE_GRAPHITE - bool SupportsGraphite() const { return mbHasGraphiteSupport; } -#endif - - const ImplFontCharMap* GetImplFontCharMap() const; - const Ucs2SIntMap* GetEncodingVector() const { return mpEncodingVector; } - void SetEncodingVector( const Ucs2SIntMap* pNewVec ) const - { - if( mpEncodingVector ) - delete mpEncodingVector; - mpEncodingVector = pNewVec; - } -private: - sal_IntPtr mnId; - - // some members that are initalized lazily when the font gets selected into a HDC - mutable bool mbDisableGlyphApi; - mutable bool mbHasKoreanRange; - mutable bool mbHasCJKSupport; -#ifdef ENABLE_GRAPHITE - mutable bool mbHasGraphiteSupport; -#endif - mutable bool mbHasArabicSupport; - mutable ImplFontCharMap* mpUnicodeMap; - mutable const Ucs2SIntMap* mpEncodingVector; - - // TODO: get rid of the members below needed to work with the Win9x non-unicode API - BYTE* mpFontCharSets; // all Charsets for the current font (used on W98 for kerning) - BYTE mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried - BYTE meWinCharSet; - BYTE mnPitchAndFamily; - bool mbAliasSymbolsHigh; - bool mbAliasSymbolsLow; -private: - void ReadCmapTable( HDC ) const; - void ReadOs2Table( HDC ) const; - -#ifdef GNG_VERT_HACK - void ReadGsubTable( HDC ) const; - - typedef std::hash_set<sal_UCS4> UcsHashSet; - mutable UcsHashSet maGsubTable; - mutable bool mbGsubRead; -public: - bool HasGSUBstitutions( HDC ) const; - bool IsGSUBstituted( sal_UCS4 ) const; -#endif // GNG_VERT_HACK -}; - -// ------------------ -// - WinSalGraphics - -// ------------------ - -class WinSalGraphics : public SalGraphics -{ -public: - HDC mhDC; // HDC - HWND mhWnd; // Window-Handle, when Window-Graphics - HFONT mhFonts[ MAX_FALLBACK ]; // Font + Fallbacks - const ImplWinFontData* mpWinFontData[ MAX_FALLBACK ]; // pointer to the most recent font face - ImplWinFontEntry* mpWinFontEntry[ MAX_FALLBACK ]; // pointer to the most recent font instance - float mfFontScale; // allows metrics emulation of huge font sizes - HPEN mhPen; // Pen - HBRUSH mhBrush; // Brush - HRGN mhRegion; // Region Handle - HPEN mhDefPen; // DefaultPen - HBRUSH mhDefBrush; // DefaultBrush - HFONT mhDefFont; // DefaultFont - HPALETTE mhDefPal; // DefaultPalette - COLORREF mnPenColor; // PenColor - COLORREF mnBrushColor; // BrushColor - COLORREF mnTextColor; // TextColor - RGNDATA* mpClipRgnData; // ClipRegion-Data - RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data - LOGFONTA* mpLogFont; // LOG-Font which is currently selected (only W9x) - ImplFontAttrCache* mpFontAttrCache; // Cache font attributes from files in so/share/fonts - BYTE* mpFontCharSets; // All Charsets for the current font - BYTE mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried - sal_Bool mbFontKernInit; // FALSE: FontKerns must be queried - KERNINGPAIR* mpFontKernPairs; // Kerning Pairs of the current Font - sal_uIntPtr mnFontKernPairCount;// Number of Kerning Pairs of the current Font - int mnPenWidth; // Linienbreite - sal_Bool mbStockPen; // is Pen a stockpen - sal_Bool mbStockBrush; // is Brush a stcokbrush - sal_Bool mbPen; // is Pen (FALSE == NULL_PEN) - sal_Bool mbBrush; // is Brush (FALSE == NULL_BRUSH) - sal_Bool mbPrinter; // is Printer - sal_Bool mbVirDev; // is VirDev - sal_Bool mbWindow; // is Window - sal_Bool mbScreen; // is Screen compatible - bool mbXORMode; // _every_ output with RasterOp XOR - - // remember RGB values for SetLineColor/SetFillColor - SalColor maLineColor; - SalColor maFillColor; - - HFONT ImplDoSetFont( ImplFontSelectData* i_pFont, float& o_rFontScale, HFONT& o_rOldFont ); - -public: - explicit WinSalGraphics(); - virtual ~WinSalGraphics(); - -protected: - virtual bool setClipRegion( const Region& ); - // draw --> LineColor and FillColor and RasterOp and ClipRegion - virtual void drawPixel( long nX, long nY ); - virtual void drawPixel( long nX, long nY, SalColor nSalColor ); - virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ); - virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); - virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ); - virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); - virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); - virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidth, basegfx::B2DLineJoin ); - virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ); - - // CopyArea --> No RasterOp, but ClipRegion - virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, - long nSrcHeight, sal_uInt16 nFlags ); - - // CopyBits and DrawBitmap --> RasterOp and ClipRegion - // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics - virtual void copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics ); - virtual void drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap ); - virtual void drawBitmap( const SalTwoRect* pPosAry, - const SalBitmap& rSalBitmap, - SalColor nTransparentColor ); - virtual void drawBitmap( const SalTwoRect* pPosAry, - const SalBitmap& rSalBitmap, - const SalBitmap& rTransparentBitmap ); - virtual void drawMask( const SalTwoRect* pPosAry, - const SalBitmap& rSalBitmap, - SalColor nMaskColor ); - - virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ); - virtual SalColor getPixel( long nX, long nY ); - - // invert --> ClipRegion (only Windows or VirDevs) - virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags); - virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); - - // native widget rendering methods that require mirroring - virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& aPos, sal_Bool& rIsInside ); - 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 ); - - virtual bool drawAlphaBitmap( const SalTwoRect&, - const SalBitmap& rSourceBitmap, - const SalBitmap& rAlphaBitmap ); - virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ); - -public: - // public SalGraphics methods, the interface to teh independent vcl part - - // get device resolution - virtual void GetResolution( long& rDPIX, long& rDPIY ); - // get the depth of the device - virtual sal_uInt16 GetBitCount(); - // get the width of the device - virtual long GetGraphicsWidth() const; - - // set the clip region to empty - virtual void ResetClipRegion(); - - // set the line color to transparent (= don't draw lines) - virtual void SetLineColor(); - // set the line color to a specific color - virtual void SetLineColor( SalColor nSalColor ); - // set the fill color to transparent (= don't fill) - virtual void SetFillColor(); - // set the fill color to a specific color, shapes will be - // filled accordingly - virtual void SetFillColor( SalColor nSalColor ); - // enable/disable XOR drawing - virtual void SetXORMode( bool bSet, bool ); - // set line color for raster operations - virtual void SetROPLineColor( SalROPColor nROPColor ); - // set fill color for raster operations - virtual void SetROPFillColor( SalROPColor nROPColor ); - // set the text color to a specific color - virtual void SetTextColor( SalColor nSalColor ); - // set the font - virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); - // get the current font's etrics - virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - // get kernign pairs of the current font - // return only PairCount if (pKernPairs == NULL) - virtual sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); - // get the repertoire of the current font - virtual const ImplFontCharMap* GetImplFontCharMap() const; - // graphics must fill supplied font list - virtual void GetDevFontList( ImplDevFontList* ); - // graphics should call ImplAddDevFontSubstitute on supplied - // OutputDevice for all its device specific preferred font substitutions - virtual void GetDevFontSubstList( OutputDevice* ); - virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ); - // CreateFontSubset: a method to get a subset of glyhps of a font - // inside a new valid font file - // returns TRUE if creation of subset was successfull - // parameters: rToFile: contains a osl file URL to write the subset to - // pFont: describes from which font to create a subset - // pGlyphIDs: the glyph ids to be extracted - // pEncoding: the character code corresponding to each glyph - // pWidths: the advance widths of the correspoding glyphs (in PS font units) - // nGlyphs: the number of glyphs - // rInfo: additional outgoing information - // implementation note: encoding 0 with glyph id 0 should be added implicitly - // as "undefined character" - virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, - const ImplFontData*, - long* pGlyphIDs, - sal_uInt8* pEncoding, - sal_Int32* pWidths, - int nGlyphs, - FontSubsetInfo& rInfo // out parameter - ); - - // GetFontEncodingVector: a method to get the encoding map Unicode - // to font encoded character; this is only used for type1 fonts and - // may return NULL in case of unknown encoding vector - // if ppNonEncoded is set and non encoded characters (that is type1 - // glyphs with only a name) exist it is set to the corresponding - // map for non encoded glyphs; the encoding vector contains -1 - // as encoding for these cases - virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded ); - - // GetEmbedFontData: gets the font data for a font marked - // embeddable by GetDevFontList or NULL in case of error - // parameters: pFont: describes the font in question - // pWidths: the widths of all glyphs from char code 0 to 255 - // pWidths MUST support at least 256 members; - // rInfo: additional outgoing information - // pDataLen: out parameter, contains the byte length of the returned buffer - virtual const void* GetEmbedFontData( const ImplFontData*, - const sal_Ucs* pUnicodes, - sal_Int32* pWidths, - FontSubsetInfo& rInfo, - long* pDataLen ); - // frees the font data again - virtual void FreeEmbedFontData( const void* pData, long nDataLen ); - virtual void GetGlyphWidths( const ImplFontData*, - bool bVertical, - Int32Vector& rWidths, - Ucs2UIntMap& rUnicodeEnc ); - virtual int GetMinKashidaWidth(); - - virtual sal_Bool GetGlyphBoundRect( long nIndex, Rectangle& ); - virtual sal_Bool GetGlyphOutline( long nIndex, ::basegfx::B2DPolyPolygon& ); - - virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ); - virtual void DrawServerFontLayout( const ServerFontLayout& ); - - virtual bool supportsOperation( OutDevSupportType ) const; - // Query the platform layer for control support - virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); - - virtual SystemGraphicsData GetGraphicsData() const; - virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; -}; - -// Init/Deinit Graphics -void ImplSalInitGraphics( WinSalGraphics* ); -void ImplSalDeInitGraphics( WinSalGraphics* ); -void ImplUpdateSysColorEntries(); -int ImplIsSysColorEntry( SalColor nSalColor ); -void ImplGetLogFontFromFontSelect( HDC, const ImplFontSelectData*, - LOGFONTW&, bool bTestVerticalAvail ); - -// ----------- -// - Defines - -// ----------- - -#define MAX_64KSALPOINTS ((((sal_uInt16)0xFFFF)-8)/sizeof(POINTS)) - -// ----------- -// - Inlines - -// ----------- - -// #102411# Win's GCP mishandles kerning => we need to do it ourselves -// SalGraphicsData::mpFontKernPairs is sorted by -inline bool ImplCmpKernData( const KERNINGPAIR& a, const KERNINGPAIR& b ) -{ - if( a.wFirst < b.wFirst ) - return true; - if( a.wFirst > b.wFirst ) - return false; - return (a.wSecond < b.wSecond); -} - -// called extremely often from just one spot => inline -inline bool ImplWinFontData::HasChar( sal_uInt32 cChar ) const -{ - if( mpUnicodeMap->HasChar( cChar ) ) - return true; - // second chance to allow symbol aliasing - if( mbAliasSymbolsLow && ((cChar-0xF000) <= 0xFF) ) - cChar -= 0xF000; - else if( mbAliasSymbolsHigh && (cChar <= 0xFF) ) - cChar += 0xF000; - else - return false; - return mpUnicodeMap->HasChar( cChar ); -} - -#endif // _SV_SALGDI_H - diff --git a/vcl/win/inc/salids.hrc b/vcl/win/inc/salids.hrc deleted file mode 100644 index 3049f11b551b..000000000000 --- a/vcl/win/inc/salids.hrc +++ /dev/null @@ -1,120 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALIDS_HRC -#define _SV_SALIDS_HRC - -// Cursor -#define SAL_RESID_POINTER_NULL 10000 -#ifndef W40ONLY -#define SAL_RESID_POINTER_HELP 10001 -#endif -#ifndef WNT -#define SAL_RESID_POINTER_HSIZE 10002 -#define SAL_RESID_POINTER_VSIZE 10003 -#define SAL_RESID_POINTER_NESWSIZE 10004 -#define SAL_RESID_POINTER_NWSESIZE 10005 -#endif -#define SAL_RESID_POINTER_CROSS 10006 -#define SAL_RESID_POINTER_MOVE 10007 -#define SAL_RESID_POINTER_HSPLIT 10008 -#define SAL_RESID_POINTER_VSPLIT 10009 -#define SAL_RESID_POINTER_HSIZEBAR 10010 -#define SAL_RESID_POINTER_VSIZEBAR 10011 -#define SAL_RESID_POINTER_HAND 10012 -#define SAL_RESID_POINTER_REFHAND 10013 -#define SAL_RESID_POINTER_PEN 10014 -#define SAL_RESID_POINTER_MAGNIFY 10015 -#define SAL_RESID_POINTER_FILL 10016 -#define SAL_RESID_POINTER_ROTATE 10017 -#define SAL_RESID_POINTER_HSHEAR 10018 -#define SAL_RESID_POINTER_VSHEAR 10019 -#define SAL_RESID_POINTER_MIRROR 10020 -#define SAL_RESID_POINTER_CROOK 10021 -#define SAL_RESID_POINTER_CROP 10022 -#define SAL_RESID_POINTER_MOVEPOINT 10023 -#define SAL_RESID_POINTER_MOVEBEZIERWEIGHT 10024 -#define SAL_RESID_POINTER_MOVEDATA 10025 -#define SAL_RESID_POINTER_COPYDATA 10026 -#define SAL_RESID_POINTER_LINKDATA 10027 -#define SAL_RESID_POINTER_MOVEDATALINK 10028 -#define SAL_RESID_POINTER_COPYDATALINK 10029 -#define SAL_RESID_POINTER_MOVEFILE 10030 -#define SAL_RESID_POINTER_COPYFILE 10031 -#define SAL_RESID_POINTER_LINKFILE 10032 -#define SAL_RESID_POINTER_MOVEFILELINK 10033 -#define SAL_RESID_POINTER_COPYFILELINK 10034 -#define SAL_RESID_POINTER_MOVEFILES 10035 -#define SAL_RESID_POINTER_COPYFILES 10036 -#define SAL_RESID_POINTER_NOTALLOWED 10037 -#define SAL_RESID_POINTER_DRAW_LINE 10038 -#define SAL_RESID_POINTER_DRAW_RECT 10039 -#define SAL_RESID_POINTER_DRAW_POLYGON 10040 -#define SAL_RESID_POINTER_DRAW_BEZIER 10041 -#define SAL_RESID_POINTER_DRAW_ARC 10042 -#define SAL_RESID_POINTER_DRAW_PIE 10043 -#define SAL_RESID_POINTER_DRAW_CIRCLECUT 10044 -#define SAL_RESID_POINTER_DRAW_ELLIPSE 10045 -#define SAL_RESID_POINTER_DRAW_FREEHAND 10046 -#define SAL_RESID_POINTER_DRAW_CONNECT 10047 -#define SAL_RESID_POINTER_DRAW_TEXT 10048 -#define SAL_RESID_POINTER_DRAW_CAPTION 10049 -#define SAL_RESID_POINTER_CHART 10050 -#define SAL_RESID_POINTER_DETECTIVE 10051 -#define SAL_RESID_POINTER_PIVOT_COL 10052 -#define SAL_RESID_POINTER_PIVOT_ROW 10053 -#define SAL_RESID_POINTER_PIVOT_FIELD 10054 -#define SAL_RESID_POINTER_CHAIN 10055 -#define SAL_RESID_POINTER_CHAIN_NOTALLOWED 10056 -#define SAL_RESID_POINTER_TIMEEVENT_MOVE 10057 -#define SAL_RESID_POINTER_TIMEEVENT_SIZE 10058 -#define SAL_RESID_POINTER_AUTOSCROLL_N 10059 -#define SAL_RESID_POINTER_AUTOSCROLL_S 10060 -#define SAL_RESID_POINTER_AUTOSCROLL_W 10061 -#define SAL_RESID_POINTER_AUTOSCROLL_E 10062 -#define SAL_RESID_POINTER_AUTOSCROLL_NW 10063 -#define SAL_RESID_POINTER_AUTOSCROLL_NE 10064 -#define SAL_RESID_POINTER_AUTOSCROLL_SW 10065 -#define SAL_RESID_POINTER_AUTOSCROLL_SE 10066 -#define SAL_RESID_POINTER_AUTOSCROLL_NS 10067 -#define SAL_RESID_POINTER_AUTOSCROLL_WE 10068 -#define SAL_RESID_POINTER_AUTOSCROLL_NSWE 10069 -#define SAL_RESID_POINTER_AIRBRUSH 10070 -#define SAL_RESID_POINTER_TEXT_VERTICAL 10071 -#define SAL_RESID_POINTER_PIVOT_DELETE 10072 -#define SAL_RESID_POINTER_TAB_SELECT_S 10073 -#define SAL_RESID_POINTER_TAB_SELECT_E 10074 -#define SAL_RESID_POINTER_TAB_SELECT_SE 10075 -#define SAL_RESID_POINTER_TAB_SELECT_W 10076 -#define SAL_RESID_POINTER_TAB_SELECT_SW 10077 -#define SAL_RESID_POINTER_PAINTBRUSH 10078 - -#define SAL_RESID_BITMAP_50 11000 - -#define SAL_RESID_ICON_DEFAULT 1 - -#endif // _SV_SALIDS_HRC diff --git a/vcl/win/inc/salinst.h b/vcl/win/inc/salinst.h deleted file mode 100755 index f08f99898915..000000000000 --- a/vcl/win/inc/salinst.h +++ /dev/null @@ -1,105 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALINST_H -#define _SV_SALINST_H - -#include <vcl/sv.h> -#include <vcl/salinst.hxx> - -namespace vos { class OMutex; } - -// ------------------- -// - SalInstanceData - -// ------------------- - -class SalYieldMutex; - -class WinSalInstance : public SalInstance -{ -public: - HINSTANCE mhInst; // Instance Handle - HWND mhComWnd; // window, for communication (between threads and the main thread) - SalYieldMutex* mpSalYieldMutex; // Sal-Yield-Mutex - vos::OMutex* mpSalWaitMutex; // Sal-Wait-Mutex - sal_uInt16 mnYieldWaitCount; // Wait-Count -public: - WinSalInstance(); - virtual ~WinSalInstance(); - - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); - virtual void DestroyFrame( SalFrame* pFrame ); - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); - virtual void DestroyObject( SalObject* pObject ); - virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, - long nDX, long nDY, - sal_uInt16 nBitCount, const SystemGraphicsData *pData ); - virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice ); - - virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, - ImplJobSetup* pSetupData ); - virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ); - virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ); - virtual void DestroyPrinter( SalPrinter* pPrinter ); - virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ); - virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ); - virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ); - virtual String GetDefaultPrinter(); - virtual SalTimer* CreateSalTimer(); - virtual SalI18NImeStatus* CreateI18NImeStatus(); - virtual SalSystem* CreateSalSystem(); - virtual SalBitmap* CreateSalBitmap(); - virtual vos::IMutex* GetYieldMutex(); - virtual sal_uIntPtr ReleaseYieldMutex(); - virtual void AcquireYieldMutex( sal_uIntPtr nCount ); - virtual bool CheckYieldMutex(); - - virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); - virtual bool AnyInput( sal_uInt16 nType ); - virtual SalMenu* CreateMenu( sal_Bool bMenuBar, Menu* ); - virtual void DestroyMenu( SalMenu* ); - virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); - virtual void DestroyMenuItem( SalMenuItem* ); - virtual SalSession* CreateSalSession(); - virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ); - virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); - - static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo); -}; - -// -------------- -// - Prototypen - -// -------------- - -SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND hWndParent, sal_uIntPtr nSalFrameStyle ); -SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ); -HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, sal_Bool bAsChild ); -void ImplSalStartTimer( sal_uIntPtr nMS, sal_Bool bMutex = sal_False ); -void ImplSalPrinterAbortJobAsync( HDC hPrnDC ); - -#endif // _SV_SALINST_H diff --git a/vcl/win/inc/salmenu.h b/vcl/win/inc/salmenu.h deleted file mode 100644 index c9442ced8936..000000000000 --- a/vcl/win/inc/salmenu.h +++ /dev/null @@ -1,78 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALMENU_H -#define _SV_SALMENU_H - -#include <vcl/sv.h> -#include <vcl/bitmap.hxx> -#include <vcl/salmenu.hxx> - - -class WinSalMenu : public SalMenu -{ -public: - WinSalMenu(); - virtual ~WinSalMenu(); - virtual sal_Bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars - // otherwise only menu messages are processed (eg, OLE on Windows) - - virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ); - virtual void RemoveItem( unsigned nPos ); - virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ); - virtual void SetFrame( const SalFrame* pFrame ); - virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); - virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); - virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const XubString& rText ); - virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ); - virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName ); - virtual void GetSystemMenuData( SystemMenuData* pData ); - - HMENU mhMenu; // the menu handle - sal_Bool mbMenuBar; // true for menu bars - HWND mhWnd; // the window handle where the menubar is attached, may be NULL - WinSalMenu *mpParentMenu; // the parent menu -}; - -class WinSalMenuItem : public SalMenuItem -{ -public: - WinSalMenuItem(); - virtual ~WinSalMenuItem(); - - - MENUITEMINFOW mInfo; - void* mpMenu; // pointer to corresponding VCL menu - XubString mText; // the item text - XubString mAccelText; // the accelerator string - Bitmap maBitmap; // item image - int mnId; // item id - WinSalMenu* mpSalMenu; // the menu where this item is inserted -}; - -#endif // _SV_SALMENU_H - diff --git a/vcl/win/inc/salnativewidgets.h b/vcl/win/inc/salnativewidgets.h deleted file mode 100644 index fceee1076595..000000000000 --- a/vcl/win/inc/salnativewidgets.h +++ /dev/null @@ -1,54 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_NATIVEWIDGETS_H -#define _SV_NATIVEWIDGETS_H - - -#ifdef __cplusplus - -#include <vcl/sv.h> - -/* SalControlHandleData: - * - * Holds platform specific theming data. - */ - -class SalControlHandleData -{ - public: - SalControlHandleData( void ); - ~SalControlHandleData( void ); - - public: - // nothing needed on Win32 -}; - - -#endif /* __cplusplus */ - -#endif diff --git a/vcl/win/inc/salobj.h b/vcl/win/inc/salobj.h deleted file mode 100644 index e262fd9bc10d..000000000000 --- a/vcl/win/inc/salobj.h +++ /dev/null @@ -1,71 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALOBJ_H -#define _SV_SALOBJ_H - -#include <vcl/sv.h> -#include <vcl/salobj.hxx> - -// ----------------- -// - SalObjectData - -// ----------------- - -class WinSalObject : public SalObject -{ -public: - HWND mhWnd; // Window handle - HWND mhWndChild; // Child Window handle - HWND mhLastFocusWnd; // Child-Window, welches als letztes den Focus hatte - SystemChildData maSysData; // SystemEnvData - RGNDATA* mpClipRgnData; // ClipRegion-Data - RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data - RECT* mpNextClipRect; // Naechstes ClipRegion-Rect - sal_Bool mbFirstClipRect; // Flag for first cliprect to insert - sal_Bool mbInterceptChildWindowKeyDown; // Intercept the KeyDown event sent to system child window - WinSalObject* mpNextObject; // pointer to next object - - - WinSalObject(); - virtual ~WinSalObject(); - - virtual void ResetClipRegion(); - virtual sal_uInt16 GetClipRegionType(); - virtual void BeginSetClipRegion( sal_uIntPtr nRects ); - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); - virtual void EndSetClipRegion(); - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); - virtual void Show( sal_Bool bVisible ); - virtual void Enable( sal_Bool nEnable ); - virtual void GrabFocus(); - virtual void SetBackground(); - virtual void SetBackground( SalColor nSalColor ); - virtual const SystemEnvData* GetSystemData() const; - virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ); -}; - -#endif // _SV_SALOBJ_H diff --git a/vcl/win/inc/salprn.h b/vcl/win/inc/salprn.h deleted file mode 100644 index 14141b6e7e6b..000000000000 --- a/vcl/win/inc/salprn.h +++ /dev/null @@ -1,130 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALPRN_H -#define _SV_SALPRN_H - -#include <vcl/sv.h> -#include <vcl/salprn.hxx> - -// ----------------- -// - SalDriverData - -// ----------------- - -// WNT3 -#define SAL_DRIVERDATA_SYSSIGN ((sal_uIntPtr)0x574E5433) -#define SAL_DRIVERDATA_VERSION_A 1 -#define SAL_DRIVERDATA_VERSION_W 2 - -#pragma pack( 1 ) - -struct SalDriverData -{ - sal_uIntPtr mnSysSignature; - sal_uInt16 mnVersion; - sal_uInt16 mnDriverOffset; - BYTE maDriverData[1]; -}; - -#pragma pack() - -// --------------------- -// - WinSalInfoPrinter - -// --------------------- - -class WinSalGraphics; - -class WinSalInfoPrinter : public SalInfoPrinter -{ -public: - WinSalGraphics* mpGraphics; // current Printer graphics - XubString maDriverName; // printer driver name - XubString maDeviceName; // printer device name - XubString maPortName; // printer port name - HDC mhDC; // printer hdc - sal_Bool mbGraphics; // is Graphics used -public: - WinSalInfoPrinter(); - virtual ~WinSalInfoPrinter(); - - virtual SalGraphics* GetGraphics(); - virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); - virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData ); - virtual sal_Bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); - virtual void GetPageInfo( const ImplJobSetup* pSetupData, - long& rOutWidth, long& rOutHeight, - long& rPageOffX, long& rPageOffY, - long& rPageWidth, long& rPageHeight ); - virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); - virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ); - virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); - virtual void InitPaperFormats( const ImplJobSetup* pSetupData ); - virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); -}; - -// ----------------- -// - WinSalPrinter - -// ----------------- - -class WinSalPrinter : public SalPrinter -{ -public: - WinSalGraphics* mpGraphics; // current Printer graphics - WinSalInfoPrinter* mpInfoPrinter; // pointer to the compatible InfoPrinter - WinSalPrinter* mpNextPrinter; // next printing printer - HDC mhDC; // printer hdc - sal_uIntPtr mnError; // Error Code - sal_uIntPtr mnCopies; // Kopien - sal_Bool mbCollate; // Sortierte Kopien - sal_Bool mbAbort; // Job Aborted - - bool mbValid; - -public: - WinSalPrinter(); - virtual ~WinSalPrinter(); - - using SalPrinter::StartJob; - virtual sal_Bool StartJob( const XubString* pFileName, - const XubString& rJobName, - const XubString& rAppName, - sal_uIntPtr nCopies, - bool bCollate, - bool bDirect, - ImplJobSetup* pSetupData ); - virtual sal_Bool EndJob(); - virtual sal_Bool AbortJob(); - virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ); - virtual sal_Bool EndPage(); - virtual sal_uIntPtr GetErrorCode(); - - void markInvalid(); - bool isValid() const { return mbValid; } -}; - -#endif // _SV_SALPRN_H diff --git a/vcl/win/inc/salsys.h b/vcl/win/inc/salsys.h deleted file mode 100644 index 51a8c0443b58..000000000000 --- a/vcl/win/inc/salsys.h +++ /dev/null @@ -1,92 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALSYS_H -#define _SV_SALSYS_H - -#include <vcl/salsys.hxx> - -#include <vector> -#include <map> - -class WinSalSystem : public SalSystem -{ - public: - struct DisplayMonitor - { - rtl::OUString m_aName; - rtl::OUString m_aDeviceName; - Rectangle m_aArea; - Rectangle m_aWorkArea; - sal_Int32 m_nStateFlags; - - DisplayMonitor() : m_nStateFlags( 0 ) {} - DisplayMonitor( const rtl::OUString& rName, - const rtl::OUString& rDevName, - const Rectangle& rArea, - const Rectangle& rWorkArea, - DWORD nStateFlags ) - : m_aName( rName ), - m_aDeviceName( rDevName ), - m_aArea( rArea ), - m_aWorkArea( rWorkArea ), - m_nStateFlags( nStateFlags ) - { - } - ~DisplayMonitor() {} - }; - private: - std::vector<DisplayMonitor> m_aMonitors; - std::map<rtl::OUString, unsigned int> m_aDeviceNameToMonitor; - unsigned int m_nPrimary; -public: - WinSalSystem() : m_nPrimary( 0 ) {} - virtual ~WinSalSystem(); - - virtual unsigned int GetDisplayScreenCount(); - virtual bool IsMultiDisplay(); - virtual unsigned int GetDefaultDisplayNumber(); - virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ); - virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen ); - virtual rtl::OUString GetScreenName( unsigned int nScreen ); - virtual int ShowNativeMessageBox( const String& rTitle, - const String& rMessage, - int nButtonCombination, - int nDefaultButton); - bool initMonitors(); - // discards monitorinfo; used by WM_DISPLAYCHANGED handler - void clearMonitors(); - const std::vector<DisplayMonitor>& getMonitors() - { initMonitors(); return m_aMonitors;} - - sal_Bool handleMonitorCallback( sal_IntPtr /*HMONITOR*/, - sal_IntPtr /*HDC*/, - sal_IntPtr /*LPRECT*/ ); -}; - -#endif // _SV_SALSYS_H - diff --git a/vcl/win/inc/saltimer.h b/vcl/win/inc/saltimer.h deleted file mode 100644 index 38f861fad441..000000000000 --- a/vcl/win/inc/saltimer.h +++ /dev/null @@ -1,44 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALTIMER_H -#define _SV_SALTIMER_H - -#include <vcl/saltimer.hxx> - -class WinSalTimer : public SalTimer -{ -public: - WinSalTimer() {} - virtual ~WinSalTimer(); - - // overload all pure virtual methods - void Start( sal_uIntPtr nMS ); - void Stop(); -}; - -#endif diff --git a/vcl/win/inc/salvd.h b/vcl/win/inc/salvd.h deleted file mode 100644 index 24aa8b99ba01..000000000000 --- a/vcl/win/inc/salvd.h +++ /dev/null @@ -1,61 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALVD_H -#define _SV_SALVD_H - -#include <vcl/sv.h> -#include <vcl/salvd.hxx> - -class WinSalGraphics; - -// ----------------- -// - SalVirDevData - -// ----------------- - -class WinSalVirtualDevice : public SalVirtualDevice -{ -public: - HDC mhDC; // HDC or 0 for Cache Device - HBITMAP mhBmp; // Memory Bitmap - HBITMAP mhDefBmp; // Default Bitmap - WinSalGraphics* mpGraphics; // current VirDev graphics - WinSalVirtualDevice* mpNext; // next VirDev - sal_uInt16 mnBitCount; // BitCount (0 or 1) - sal_Bool mbGraphics; // is Graphics used - sal_Bool mbForeignDC; // uses a foreign DC instead of a bitmap - - WinSalVirtualDevice(); - virtual ~WinSalVirtualDevice(); - - virtual SalGraphics* GetGraphics(); - virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual sal_Bool SetSize( long nNewDX, long nNewDY ); - virtual void GetSize( long& rWidth, long& rHeight ); -}; - -#endif // _SV_SALVD_H diff --git a/vcl/win/inc/svsys.h b/vcl/win/inc/svsys.h deleted file mode 100644 index 7b0e87304d59..000000000000 --- a/vcl/win/inc/svsys.h +++ /dev/null @@ -1,33 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SVSYS_H -#define _SV_SVSYS_H - -#include <tools/svwin.h> - -#endif // _SV_SVSYS_H diff --git a/vcl/win/inc/wincomp.hxx b/vcl/win/inc/wincomp.hxx deleted file mode 100644 index 141ea4106238..000000000000 --- a/vcl/win/inc/wincomp.hxx +++ /dev/null @@ -1,264 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_WINCOMP_HXX -#define _SV_WINCOMP_HXX - -#ifndef _STRING_H -#include <string.h> -#endif -#include <vcl/sv.h> - -// ---------- -// - Strict - -// ---------- - -// Anpassungen fuer TypeChecking - -inline HPEN SelectPen( HDC hDC, HPEN hPen ) -{ - return (HPEN)SelectObject( hDC, (HGDIOBJ)hPen ); -} - -inline void DeletePen( HPEN hPen ) -{ - DeleteObject( (HGDIOBJ)hPen ); -} - -inline HPEN GetStockPen( int nObject ) -{ - return (HPEN)GetStockObject( nObject ); -} - -inline HBRUSH SelectBrush( HDC hDC, HBRUSH hBrush ) -{ - return (HBRUSH)SelectObject( hDC, (HGDIOBJ)hBrush ); -} - -inline void DeleteBrush( HBRUSH hBrush ) -{ - DeleteObject( (HGDIOBJ)hBrush ); -} - -inline HBRUSH GetStockBrush( int nObject ) -{ - return (HBRUSH)GetStockObject( nObject ); -} - -inline HFONT SelectFont( HDC hDC, HFONT hFont ) -{ - return (HFONT)SelectObject( hDC, (HGDIOBJ)hFont ); -} - -inline void DeleteFont( HFONT hFont ) -{ - DeleteObject( (HGDIOBJ)hFont ); -} - -inline HFONT GetStockFont( int nObject ) -{ - return (HFONT)GetStockObject( nObject ); -} - -inline HBITMAP SelectBitmap( HDC hDC, HBITMAP hBitmap ) -{ - return (HBITMAP)SelectObject( hDC, (HGDIOBJ)hBitmap ); -} - -inline void DeleteBitmap( HBITMAP hBitmap ) -{ - DeleteObject( (HGDIOBJ)hBitmap ); -} - -inline void DeleteRegion( HRGN hRegion ) -{ - DeleteObject( (HGDIOBJ)hRegion ); -} - -inline HPALETTE GetStockPalette( int nObject ) -{ - return (HPALETTE)GetStockObject( nObject ); -} - -inline void DeletePalette( HPALETTE hPalette ) -{ - DeleteObject( (HGDIOBJ)hPalette ); -} - -inline void SetWindowStyle( HWND hWnd, DWORD nStyle ) -{ - SetWindowLong( hWnd, GWL_STYLE, nStyle ); -} - -inline DWORD GetWindowStyle( HWND hWnd ) -{ - return GetWindowLong( hWnd, GWL_STYLE ); -} - -inline void SetWindowExStyle( HWND hWnd, DWORD nStyle ) -{ - SetWindowLong( hWnd, GWL_EXSTYLE, nStyle ); -} - -inline DWORD GetWindowExStyle( HWND hWnd ) -{ - return GetWindowLong( hWnd, GWL_EXSTYLE ); -} - -inline BOOL IsMinimized( HWND hWnd ) -{ - return IsIconic( hWnd ); -} - -inline BOOL IsMaximized( HWND hWnd ) -{ - return IsZoomed( hWnd ); -} - -inline void SetWindowFont( HWND hWnd, HFONT hFont, BOOL bRedraw ) -{ - SendMessage( hWnd, WM_SETFONT, (WPARAM)hFont, MAKELPARAM((UINT)bRedraw,0) ); -} - -inline HFONT GetWindowFont( HWND hWnd ) -{ - return (HFONT)(UINT)SendMessage( hWnd, WM_GETFONT, 0, 0 ); -} - -inline void SetClassCursor( HWND hWnd, HCURSOR hCursor ) -{ - SetClassLong( hWnd, GCL_HCURSOR, (DWORD)hCursor ); -} - -inline HCURSOR GetClassCursor( HWND hWnd ) -{ - return (HCURSOR)GetClassLong( hWnd, GCL_HCURSOR ); -} - -inline void SetClassIcon( HWND hWnd, HICON hIcon ) -{ - SetClassLong( hWnd, GCL_HICON, (DWORD)hIcon ); -} - -inline HICON GetClassIcon( HWND hWnd ) -{ - return (HICON)GetClassLong( hWnd, GCL_HICON ); -} - -inline HBRUSH SetClassBrush( HWND hWnd, HBRUSH hBrush ) -{ - return (HBRUSH)SetClassLong( hWnd, GCL_HBRBACKGROUND, (DWORD)hBrush ); -} - -inline HBRUSH GetClassBrush( HWND hWnd ) -{ - return (HBRUSH)GetClassLong( hWnd, GCL_HBRBACKGROUND ); -} - -inline HINSTANCE GetWindowInstance( HWND hWnd ) -{ - return (HINSTANCE)GetWindowLong( hWnd, GWL_HINSTANCE ); -} - -// ------------------------ -// - ZMouse Erweiterungen - -// ------------------------ - -#define MSH_MOUSEWHEEL "MSWHEEL_ROLLMSG" - -#define MOUSEZ_CLASSNAME "MouseZ" // wheel window class -#define MOUSEZ_TITLE "Magellan MSWHEEL" // wheel window title - -#define MSH_WHEELMODULE_CLASS (MOUSEZ_CLASSNAME) -#define MSH_WHEELMODULE_TITLE (MOUSEZ_TITLE) - -#define MSH_SCROLL_LINES "MSH_SCROLL_LINES_MSG" - -#ifndef WHEEL_DELTA -#define WHEEL_DELTA 120 -#endif -#ifndef WM_MOUSEWHEEL -#define WM_MOUSEWHEEL 0x020A -#endif -#ifndef SPI_GETWHEELSCROLLLINES -#define SPI_GETWHEELSCROLLLINES 104 -#endif -#ifndef SPI_SETWHEELSCROLLLINES -#define SPI_SETWHEELSCROLLLINES 105 -#endif -#ifndef WHEEL_PAGESCROLL -#define WHEEL_PAGESCROLL (UINT_MAX) -#endif - - -// ----------------------------- -// - SystemAgent Erweiterungen - -// ----------------------------- - -#define ENABLE_AGENT 1 -#define DISABLE_AGENT 2 -#define GET_AGENT_STATUS 3 -typedef int (APIENTRY* SysAgt_Enable_PROC)( int ); - -// --------------------- -// - 5.0-Erweiterungen - -// --------------------- - -#ifndef COLOR_GRADIENTACTIVECAPTION -#define COLOR_GRADIENTACTIVECAPTION 27 -#endif -#ifndef COLOR_GRADIENTINACTIVECAPTION -#define COLOR_GRADIENTINACTIVECAPTION 28 -#endif - -#ifndef SPI_GETFLATMENU -#define SPI_GETFLATMENU 0x1022 -#endif -#ifndef COLOR_MENUBAR -#define COLOR_MENUBAR 30 -#endif -#ifndef COLOR_MENUHILIGHT -#define COLOR_MENUHILIGHT 29 -#endif - -#ifndef CS_DROPSHADOW -#define CS_DROPSHADOW 0x00020000 -#endif - -// ------------------------------------------------------- -// MT 12/03: From winuser.h, only needed in salframe.cxx -// Better change salframe.cxx to include winuser.h -// ------------------------------------------------------- - -#define WS_EX_LAYERED 0x00080000 - -#ifndef WM_UNICHAR -#define WM_UNICHAR 0x0109 -#define UNICODE_NOCHAR 0xFFFF -#endif - -#endif // _SV_WINCOMP_HXX diff --git a/vcl/win/source/app/MAKEFILE.MK b/vcl/win/source/app/MAKEFILE.MK deleted file mode 100644 index 9b3237567eff..000000000000 --- a/vcl/win/source/app/MAKEFILE.MK +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org 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 version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salapp -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -CFLAGS += -DWINVER=0x0400 - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/salshl.obj \ - $(SLO)$/saldata.obj \ - $(SLO)$/salinst.obj \ - $(SLO)$/saltimer.obj \ - $(SLO)$/salinfo.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx index 1eb897b55b8d..4faaf7bd4def 100644..100755 --- a/vcl/win/source/app/saldata.cxx +++ b/vcl/win/source/app/saldata.cxx @@ -27,11 +27,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <tools/svwin.h> + +#include "tools/svwin.h" #include "rtl/tencinfo.h" -#include <saldata.hxx> -#include <vcl/svapp.hxx> +#include "vcl/svapp.hxx" +#include "win/saldata.hxx" // ======================================================================= diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index c635fdfc9845..431e9ca9c15f 100644..100755 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -34,28 +34,20 @@ #define WINVER 0x0500 #endif -#define VCL_NEED_BASETSD -#include "tools/presys.h" -#if defined _MSC_VER -#pragma warning(push, 1) -#endif -#include <windows.h> -#include <winuser.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif -#include "tools/postsys.h" +#include "svsys.h" +#include "rtl/ustrbuf.hxx" -#include "tools/string.hxx" -#include "salsys.h" -#include "salframe.h" -#include "salinst.h" -#include "saldata.hxx" #include "tools/debug.hxx" -#include "vcl/svdata.hxx" +#include "tools/string.hxx" + #include "vcl/window.hxx" -#include "rtl/ustrbuf.hxx" +#include "win/salsys.h" +#include "win/salframe.h" +#include "win/salinst.h" +#include "win/saldata.hxx" + +#include "svdata.hxx" #include <hash_map> diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index 05cb20750abd..1e5a306d852d 100755 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -36,23 +36,28 @@ #ifdef __MINGW32__ #include <excpt.h> #endif + #include <osl/file.hxx> + #include <vos/mutex.hxx> + +#include <tools/solarmutex.hxx> #include <tools/debug.hxx> -#include <wincomp.hxx> -#include <salids.hrc> -#include <saldata.hxx> -#include <salinst.h> -#include <salframe.h> -#include <salobj.h> -#include <vcl/salsys.hxx> -#include <saltimer.h> -#include <vcl/apptypes.hxx> -#include <salbmp.h> -#include <vcl/salimestatus.hxx> + #include <vcl/timer.hxx> -#include <wincomp.hxx> // CS_DROPSHADOW -#include <tools/solarmutex.hxx> +#include <vcl/apptypes.hxx> + +#include <win/wincomp.hxx> +#include <win/salids.hrc> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salframe.h> +#include <win/salobj.h> +#include <win/saltimer.h> +#include <win/salbmp.h> + +#include <salimestatus.hxx> +#include <salsys.hxx> #ifndef min #define min(a,b) (((a) < (b)) ? (a) : (b)) diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index 578b3cb804bd..427f2092a0dc 100644..100755 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -27,9 +27,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include <tools/svwin.h> -#include <saldata.hxx> + #include <tools/debug.hxx> +#include <tools/svwin.h> +#include <win/saldata.hxx> // ======================================================================= diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx index 6026f80e6346..f0b88a8e381c 100644..100755 --- a/vcl/win/source/app/saltimer.cxx +++ b/vcl/win/source/app/saltimer.cxx @@ -31,9 +31,9 @@ #ifdef __MINGW32__ #include <excpt.h> #endif -#include <saldata.hxx> -#include <saltimer.h> -#include <salinst.h> +#include <win/saldata.hxx> +#include <win/saltimer.h> +#include <win/salinst.h> // ======================================================================= diff --git a/vcl/win/source/gdi/MAKEFILE.MK b/vcl/win/source/gdi/MAKEFILE.MK deleted file mode 100644 index 7489be633f2b..000000000000 --- a/vcl/win/source/gdi/MAKEFILE.MK +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org 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 version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salgdi - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -.IF "$(COM)"=="GCC" -.ELSE -CFLAGS += -DWINVER=0x0400 -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/salgdi.obj \ - $(SLO)$/salgdi2.obj \ - $(SLO)$/salgdi3.obj \ - $(SLO)$/salgdi_gdiplus.obj \ - $(SLO)$/salvd.obj \ - $(SLO)$/salprn.obj \ - $(SLO)$/salbmp.obj \ - $(SLO)$/winlayout.obj \ - $(SLO)$/wntgdi.obj \ - $(SLO)$/salnativewidgets-luna.obj - - -EXCEPTIONSFILES= $(SLO)$/salprn.obj - -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -CFLAGS+=-DENABLE_GRAPHITE -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 8be85d210bd6..3dc176ae23b8 100644..100755 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -27,13 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <vcl/salbtype.hxx> -#include <salgdi.h> -#include <saldata.hxx> -#include <salbmp.h> + #include <vcl/bitmap.hxx> // for BitmapSystemData +#include <vcl/salbtype.hxx> + +#include <win/wincomp.hxx> +#include <win/salgdi.h> +#include <win/saldata.hxx> +#include <win/salbmp.h> + #include <string.h> // ----------- diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 73d93d42dd03..bc2f8ade3ccc 100755..100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -30,17 +30,22 @@ #include <stdio.h> #include <string.h> + +#include <rtl/strbuf.hxx> + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salgdi.h> #include <tools/debug.hxx> -#include <salframe.h> #include <tools/poly.hxx> + #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> -#include <rtl/strbuf.hxx> -#include <vcl/region.h> + +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salgdi.h> +#include <win/salframe.h> + +#include <region.h> using namespace rtl; diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index dc3368c26912..5ac117a596d9 100755..100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -30,16 +30,16 @@ #include <string.h> #include <stdlib.h> + #include <tools/svwin.h> #include <tools/debug.hxx> -#include <wincomp.hxx> -#include <salbmp.h> -#include <saldata.hxx> -#ifndef _SV_SALIDS_HRC -#include <salids.hrc> -#endif -#include <salgdi.h> -#include <salframe.h> + +#include <win/wincomp.hxx> +#include <win/salbmp.h> +#include <win/saldata.hxx> +#include <win/salids.hrc> +#include <win/salgdi.h> +#include <win/salframe.h> bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const { diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index eded1a8f7aaf..86f6ad0f4af1 100755 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -31,25 +31,6 @@ #include <string.h> #include <malloc.h> -#include <tools/prewin.h> -#include <windows.h> -#include <tools/postwin.h> -#include <vcl/sysdata.hxx> -#include "tools/svwin.h" - -#include "wincomp.hxx" -#include "saldata.hxx" -#include "salgdi.h" - -#include "vcl/svapp.hxx" -#include "vcl/outfont.hxx" -#include "vcl/font.hxx" -#include "vcl/fontsubset.hxx" -#include "vcl/sallayout.hxx" - -#include "vcl/outdev.h" // for ImplGlyphFallbackFontSubstitution -#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL - #include "rtl/logfile.hxx" #include "rtl/tencinfo.h" #include "rtl/textcvt.h" @@ -62,15 +43,34 @@ #include "osl/thread.hxx" #include "osl/process.h" +#include "basegfx/polygon/b2dpolygon.hxx" +#include "basegfx/polygon/b2dpolypolygon.hxx" +#include "basegfx/matrix/b2dhommatrix.hxx" +#include "basegfx/matrix/b2dhommatrixtools.hxx" + +#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL + +#include "vcl/font.hxx" +#include "vcl/svapp.hxx" + #include "tools/poly.hxx" #include "tools/debug.hxx" #include "tools/stream.hxx" -#include "basegfx/polygon/b2dpolygon.hxx" -#include "basegfx/polygon/b2dpolypolygon.hxx" -#include "basegfx/matrix/b2dhommatrix.hxx" -#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <tools/prewin.h> +#include <windows.h> +#include <tools/postwin.h> + +#include <vcl/sysdata.hxx> + +#include "win/wincomp.hxx" +#include "win/saldata.hxx" +#include "win/salgdi.h" +#include "outfont.hxx" +#include "fontsubset.hxx" +#include "sallayout.hxx" +#include "outdev.h" // for ImplGlyphFallbackFontSubstitution #include "sft.hxx" #ifdef GCP_KERN_HACK diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx index 88efbb29d30a..2b46ce47b82d 100644 --- a/vcl/win/source/gdi/salgdi_gdiplus.cxx +++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx @@ -30,12 +30,14 @@ #include <stdio.h> #include <string.h> + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salgdi.h> #include <tools/debug.hxx> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salgdi.h> + #ifndef min #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 403d6c3780cd..0f1b8151967d 100755 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -30,14 +30,16 @@ #define _SV_SALNATIVEWIDGETS_CXX -#include "svsys.h" -#include "salgdi.h" -#include "saldata.hxx" -#include "vcl/svapp.hxx" - #include "rtl/ustring.h" + #include "osl/module.h" +#include "vcl/svapp.hxx" + +#include "win/svsys.h" +#include "win/salgdi.h" +#include "win/saldata.hxx" + #include "uxtheme.h" #include "vssym32.h" diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index a235d6785706..263d06670584 100755..100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -29,26 +29,26 @@ #include "precompiled_vcl.hxx" #include <string.h> -#include <tools/svwin.h> +#include <osl/module.h> + +#include <tools/urlobj.hxx> +#include <tools/svwin.h> #ifdef __MINGW32__ #include <excpt.h> #endif -#ifndef _OSL_MODULE_H -#include <osl/module.h> -#endif -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salgdi.h> -#include <salframe.h> -#include <vcl/salptype.hxx> -#include <salprn.h> -#include <vcl/print.h> -#include <vcl/jobset.h> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salgdi.h> +#include <win/salframe.h> +#include <win/salprn.h> + +#include <salptype.hxx> +#include <print.h> +#include <jobset.h> -#include <tools/urlobj.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx index 3a6e89059a69..94f08a33179c 100644..100755 --- a/vcl/win/source/gdi/salvd.cxx +++ b/vcl/win/source/gdi/salvd.cxx @@ -27,14 +27,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salgdi.h> -#include <salvd.h> + #include <vcl/sysdata.hxx> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salgdi.h> +#include <win/salvd.h> + // ======================================================================= static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY, diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 14b9fd5a59c2..dd896059160e 100755 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -28,21 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "tools/svwin.h" - -#include "salgdi.h" -#include "saldata.hxx" -// for GetMirroredChar -#include "sft.hxx" - -#include "vcl/sallayout.hxx" -#include "vcl/svapp.hxx" - #include "rtl/ustring.hxx" #include "osl/module.h" #include "osl/file.h" +#include "tools/svwin.h" + +#include "vcl/svapp.hxx" + +#include "win/salgdi.h" +#include "win/saldata.hxx" + +// for GetMirroredChar +#include "sft.hxx" +#include "sallayout.hxx" #include <cstdio> #include <malloc.h> @@ -74,9 +74,9 @@ typedef std::set<int> IntSet; #include <graphite/GrClient.h> #include <graphite/WinFont.h> #include <graphite/Segment.h> -#include <vcl/graphite_layout.hxx> -#include <vcl/graphite_cache.hxx> -#include <vcl/graphite_features.hxx> +#include <graphite_layout.hxx> +#include <graphite_cache.hxx> +#include <graphite_features.hxx> #endif #define DROPPED_OUTGLYPH 0xFFFF diff --git a/vcl/win/source/src/MAKEFILE.MK b/vcl/win/source/src/MAKEFILE.MK deleted file mode 100644 index 7addba363481..000000000000 --- a/vcl/win/source/src/MAKEFILE.MK +++ /dev/null @@ -1,130 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org 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 version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salsrc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -CFLAGS += -DWINVER=0x0400 - -# --- Files -------------------------------------------------------- - -RCDEPN= nullptr.cur \ - help.cur \ - hsize.cur \ - vsize.cur \ - neswsize.cur \ - nwsesize.cur \ - cross.cur \ - move.cur \ - hsplit.cur \ - vsplit.cur \ - hsizebar.cur \ - vsizebar.cur \ - hand.cur \ - refhand.cur \ - pen.cur \ - magnify.cur \ - fill.cur \ - rotate.cur \ - hshear.cur \ - vshear.cur \ - mirror.cur \ - crook.cur \ - crop.cur \ - movept.cur \ - movebw.cur \ - movedata.cur \ - copydata.cur \ - linkdata.cur \ - movedlnk.cur \ - copydlnk.cur \ - movef.cur \ - copyf.cur \ - linkf.cur \ - moveflnk.cur \ - copyflnk.cur \ - movef2.cur \ - copyf2.cur \ - notallow.cur \ - dline.cur \ - drect.cur \ - dpolygon.cur \ - dbezier.cur \ - darc.cur \ - dpie.cur \ - dcirccut.cur \ - dellipse.cur \ - dfree.cur \ - dconnect.cur \ - dtext.cur \ - dcapt.cur \ - chart.cur \ - detectiv.cur \ - pivotcol.cur \ - pivotrow.cur \ - pivotfld.cur \ - pivotdel.cur \ - chain.cur \ - chainnot.cur \ - timemove.cur \ - timesize.cur \ - asn.cur \ - ass.cur \ - asw.cur \ - ase.cur \ - asnw.cur \ - asne.cur \ - assw.cur \ - asse.cur \ - asns.cur \ - aswe.cur \ - asnswe.cur \ - airbrush.cur \ - vtext.cur \ - tblsels.cur \ - tblsele.cur \ - tblselse.cur \ - tblselw.cur \ - tblselsw.cur \ - pntbrsh.cur \ - 50.bmp \ - sd.ico - -RCFILES= salsrc.rc - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 1db1bfc910cf..11b967ff475b 100644..100755 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -29,7 +29,7 @@ #include <windows.h> #ifndef _SV_SALIDS_HRC -#include <salids.hrc> +#include <win/salids.hrc> #endif SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR diff --git a/vcl/win/source/window/MAKEFILE.MK b/vcl/win/source/window/MAKEFILE.MK deleted file mode 100644 index cecfbcf5b2e5..000000000000 --- a/vcl/win/source/window/MAKEFILE.MK +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org 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 version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salwin -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- #105371# -CDEFS +=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/salframe.obj \ - $(SLO)$/salmenu.obj \ - $(SLO)$/salobj.obj - -.IF "$(COM)"=="GCC" -EXCEPTIONSFILES= $(SLO)$/salframe.obj -.ENDIF - -.IF "$(ENABLE_GRAPHITE)" == "TRUE" -CFLAGS+=-DENABLE_GRAPHITE -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index c1b3a632556e..bcbaee6d8b6c 100755 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -46,51 +46,48 @@ #include <stdio.h> -#ifndef _SVWIN_HXX #include <tools/svwin.h> -#endif #ifdef __MINGW32__ #include <excpt.h> #endif + #include <rtl/string.h> #include <rtl/ustring.h> #include <osl/module.h> + #include <tools/debug.hxx> -// Warning in SDK header -#if defined(_MSC_VER) && (_MSC_VER > 1400) -#pragma warning( disable: 4242 4244 ) -#endif -#include <wincomp.hxx> -#ifndef _SV_SALIDS_HRC -#include <salids.hrc> -#endif #include <vcl/sysdata.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salbmp.h> -#include <salgdi.h> -#include <salsys.h> -#include <salframe.h> -#include <salvd.h> -#include <salmenu.h> -#include <salobj.h> -#include <vcl/impbmp.hxx> #include <vcl/timer.hxx> -#include <saltimer.h> #include <vcl/settings.hxx> -#ifndef _SV_KEYCOES_HXX #include <vcl/keycodes.hxx> -#endif -#include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/sallayout.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_IMPDEL_HXX -#include <impdel.hxx> +#include <vcl/impdel.hxx> + +// Warning in SDK header +#if defined(_MSC_VER) && (_MSC_VER > 1400) +#pragma warning( disable: 4242 4244 ) #endif +#include <win/wincomp.hxx> +#include <win/salids.hrc> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salbmp.h> +#include <win/salgdi.h> +#include <win/salsys.h> +#include <win/salframe.h> +#include <win/salvd.h> +#include <win/salmenu.h> +#include <win/salobj.h> +#include <win/saltimer.h> + +#include <impbmp.hxx> +#include <window.h> +#include <sallayout.hxx> + #define COMPILE_MULTIMON_STUBS #include <multimon.h> #include <vector> diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 23295838bfc9..ce7c6064f790 100755 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -27,16 +27,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <tools/svwin.h> -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <vcl/salgdi.hxx> -#include <salmenu.h> + #include <vcl/menu.hxx> #include <vcl/sysdata.hxx> -#include <salframe.h> -#include <vcl/impbmp.hxx> + +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salframe.h> +#include <win/salmenu.h> + +#include <impbmp.hxx> +#include <salgdi.hxx> // uncomment the following line to have ownerdrawn menues, ie, with bitmaps // however, this is incompatible with OLE inplace editing diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 00ee39092aff..51712f07e709 100644..100755 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -30,17 +30,17 @@ #include <string.h> -#ifndef _SVWIN_HXX -#include <tools/svwin.h> -#endif -#include <wincomp.hxx> -#include <saldata.hxx> -#include <salinst.h> -#include <salframe.h> -#include <salobj.h> #include <tools/debug.hxx> +#include <tools/svwin.h> + #include <vcl/svapp.hxx> +#include <win/wincomp.hxx> +#include <win/saldata.hxx> +#include <win/salinst.h> +#include <win/salframe.h> +#include <win/salobj.h> + // ======================================================================= static sal_Bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) |