Move prewin.h and postwin.h from tools to solenv
All #include directives that include tools/prewin.h and tools/postwin.h need to have the "tools/" part dropped. Will do that, too. For earlier git log of these two files, see the libs-gui repository.
This commit is contained in:
Tor Lillqvist
parent
ad6ae59025
commit
aa100206ac
2 changed files with 345 additions and 0 deletions
261
solenv/inc/postwin.h
Normal file
261
solenv/inc/postwin.h
Normal file
|
|
@ -0,0 +1,261 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/*************************************************************************
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
************************************************************************/
|
||||
|
||||
/* nicht geschuetz, muss als gegenstueck zu prewin.h includet werden */
|
||||
|
||||
#ifdef WNT
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#undef Region
|
||||
#undef PolyPolygon
|
||||
#undef Polygon
|
||||
#undef Rectangle
|
||||
#undef BYTE
|
||||
#undef BOOL
|
||||
#undef DELETE
|
||||
|
||||
#ifndef VCL_NEED_BASETSD
|
||||
#undef INT64
|
||||
#undef UINT64
|
||||
#undef INT32
|
||||
#undef UINT32
|
||||
#undef ULONG
|
||||
#endif
|
||||
#undef Folder
|
||||
#undef GradientStyle_RECT
|
||||
|
||||
/* Hilfe-Ids umbenennen */
|
||||
#define WIN_HELP_INDEX 0x0003
|
||||
#define WIN_HELP_HELPONHELP 0x0004
|
||||
#undef HELP_INDEX
|
||||
#undef HELP_HELPONHELP
|
||||
|
||||
#define WIN_MOUSE_MOVED 0x0001
|
||||
#undef MOUSE_MOVED
|
||||
|
||||
#define WIN_WB_LEFT 0
|
||||
#define WIN_WB_RIGHT 1
|
||||
#undef WB_LEFT
|
||||
#undef WB_RIGHT
|
||||
|
||||
#ifdef GetObject
|
||||
#undef GetObject
|
||||
#ifdef UNICODE
|
||||
#define WIN_GetObject GetObjectW
|
||||
#else
|
||||
#define WIN_GetObject GetObjectA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_GetObject GetObject
|
||||
#endif
|
||||
|
||||
#ifdef SetPrinter
|
||||
#undef SetPrinter
|
||||
#ifdef UNICODE
|
||||
#define WIN_SetPrinter SetPrinterW
|
||||
#else
|
||||
#define WIN_SetPrinter SetPrinterA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_SetPrinter SetPrinter
|
||||
#endif
|
||||
|
||||
#ifdef GetPrinter
|
||||
#undef GetPrinter
|
||||
#ifdef UNICODE
|
||||
#define WIN_GetPrinter GetPrinterW
|
||||
#else
|
||||
#define WIN_GetPrinter GetPrinterA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_GetPrinter GetPrinter
|
||||
#endif
|
||||
|
||||
#ifdef DrawText
|
||||
#undef DrawText
|
||||
#ifdef UNICODE
|
||||
#define WIN_DrawText DrawTextW
|
||||
#else
|
||||
#define WIN_DrawText DrawTextA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_DrawText DrawText
|
||||
#endif
|
||||
|
||||
#ifdef mciSetCommand
|
||||
#undef mciSetCommand
|
||||
#ifdef UNICODE
|
||||
#define WIN_mciSetCommand mciSetCommandW
|
||||
#else
|
||||
#define WIN_mciSetCommand mciSetCommandA
|
||||
#endif
|
||||
#else
|
||||
#define mciSetCommand mciSetCommand
|
||||
#endif
|
||||
|
||||
#ifdef SetPort
|
||||
#undef SetPort
|
||||
#ifdef UNICODE
|
||||
#define WIN_SetPort SetPortW
|
||||
#else
|
||||
#define WIN_SetPort SetPortA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_SetPort SetPort
|
||||
#endif
|
||||
|
||||
#ifdef CopyFile
|
||||
#undef CopyFile
|
||||
#ifdef UNICODE
|
||||
#define WIN_CopyFile CopyFileW
|
||||
#else
|
||||
#define WIN_CopyFile CopyFileA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_CopyFile CopyFile
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef GetUserName
|
||||
#undef GetUserName
|
||||
#ifdef UNICODE
|
||||
#define WIN_GetUserName GetUserNameW
|
||||
#else
|
||||
#define WIN_GetUserName GetUserNameA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_GetUserName GetUserName
|
||||
#endif
|
||||
|
||||
#ifdef GetClassName
|
||||
#undef GetClassName
|
||||
#ifdef UNICODE
|
||||
#define WIN_GetClassName GetClassNameW
|
||||
#else
|
||||
#define WIN_GetClassName GetClassNameA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_GetClassName GetClassName
|
||||
#endif
|
||||
|
||||
#ifdef GetCharWidth
|
||||
#undef GetCharWidth
|
||||
#ifdef UNICODE
|
||||
#define WIN_GetCharWidth GetCharWidthW
|
||||
#else
|
||||
#define WIN_GetCharWidth GetCharWidthA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_GetCharWidth GetCharWidth
|
||||
#endif
|
||||
|
||||
#ifdef GetMetaFile
|
||||
#undef GetMetaFile
|
||||
#ifdef UNICODE
|
||||
#define WIN_GetMetaFile GetMetaFileW
|
||||
#else
|
||||
#define WIN_GetMetaFile GetMetaFileA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_GetMetaFile GetMetaFile
|
||||
#endif
|
||||
|
||||
#ifdef GetNumberFormat
|
||||
#undef GetNumberFormat
|
||||
#ifdef UNICODE
|
||||
#define WIN_GetNumberFormat GetNumberFormatW
|
||||
#else
|
||||
#define WIN_GetNumberFormat GetNumberFormatA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_GetNumberFormat GetNumberFormat
|
||||
#endif
|
||||
|
||||
#ifdef GetGlyphOutline
|
||||
#undef GetGlyphOutline
|
||||
#ifdef UNICODE
|
||||
#define WIN_GetGlyphOutline GetGlyphOutlineW
|
||||
#else
|
||||
#define WIN_GetGlyphOutline GetGlyphOutlineA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_GetGlyphOutline GetGlyphOutline
|
||||
#endif
|
||||
|
||||
#ifdef GetKerningPairs
|
||||
#undef GetKerningPairs
|
||||
#ifdef UNICODE
|
||||
#define WIN_GetKerningPairs GetKerningPairsW
|
||||
#else
|
||||
#define WIN_GetKerningPairs GetKerningPairsA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_GetKerningPairs GetKerningPairs
|
||||
#endif
|
||||
|
||||
#ifdef FindWindow
|
||||
#undef FindWindow
|
||||
#ifdef UNICODE
|
||||
#define WIN_FindWindow FindWindowW
|
||||
#else
|
||||
#define WIN_FindWindow FindWindowA
|
||||
#endif
|
||||
#else
|
||||
#define WIN_FindWindow FindWindow
|
||||
#endif
|
||||
|
||||
// keine Yield-Definition
|
||||
#undef Yield
|
||||
|
||||
/* new StretchBlt() Modes (simpler names) */
|
||||
#ifndef STRETCH_ANDSCANS
|
||||
#define STRETCH_ANDSCANS 1
|
||||
#endif
|
||||
#ifndef STRETCH_ORSCANS
|
||||
#define STRETCH_ORSCANS 2
|
||||
#endif
|
||||
#ifndef STRETCH_DELETESCANS
|
||||
#define STRETCH_DELETESCANS 3
|
||||
#endif
|
||||
|
||||
#ifdef WNT
|
||||
extern "C"
|
||||
{
|
||||
WIN_BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 );
|
||||
WIN_BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt );
|
||||
WIN_BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt );
|
||||
}
|
||||
#endif
|
||||
|
||||
// svwin.h nicht mehr includen
|
||||
#define _SVWIN_H
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
84
solenv/inc/prewin.h
Normal file
84
solenv/inc/prewin.h
Normal file
|
|
@ -0,0 +1,84 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/*************************************************************************
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
************************************************************************/
|
||||
|
||||
/* nicht geschuetzt, darf nur einmal includet werden */
|
||||
|
||||
#if defined WNT
|
||||
|
||||
#define BOOL WIN_BOOL
|
||||
#define BYTE WIN_BYTE
|
||||
#ifndef VCL_NEED_BASETSD
|
||||
#define INT64 WIN_INT64
|
||||
#define UINT64 WIN_UINT64
|
||||
#define INT32 WIN_INT32
|
||||
#define UINT32 WIN_UINT32
|
||||
#define ULONG WIN_ULONG
|
||||
#endif
|
||||
|
||||
#define Rectangle BLA_Rectangle
|
||||
#define Polygon BLA_Polygon
|
||||
#define PolyPolygon BLA_PolyPolygon
|
||||
#define Region WIN_Region
|
||||
#define Folder WIN_Folder
|
||||
#define GradientStyle_RECT WIN_GradientStyle_RECT
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define STRICT
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push, 1)
|
||||
#endif
|
||||
#include <windows.h>
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
#include <shellapi.h>
|
||||
#include <commdlg.h>
|
||||
#include <dlgs.h>
|
||||
#ifdef USE_TOOLHELP
|
||||
#include <tlhelp32.h>
|
||||
#endif
|
||||
#ifdef USE_IMAGEHLP
|
||||
#include <imagehlp.h>
|
||||
#endif
|
||||
#ifdef INCLUDE_MMSYSTEM
|
||||
#include <mmsystem.h>
|
||||
#endif
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(push, 1)
|
||||
#endif
|
||||
#include <commctrl.h>
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(pop)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|
||||
Loading…
Reference in a new issue