linuxdcpp-team team mailing list archive
-
linuxdcpp-team team
-
Mailing list archive
-
Message #03116
[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2401: add a missing file
------------------------------------------------------------
revno: 2401
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2011-01-28 00:11:24 +0100
message:
add a missing file
added:
dwt/include/dwt/dwt_vssym32.h
modified:
dcpp/compiler.h
dcpp/stdinc.cpp
dcpp/stdinc.h
dcpp/version.cpp
dcpp/version.h
dwt/include/dwt/GCCHeaders.h
dwt/include/dwt/dwt_dwmapi.h
dwt/include/dwt/dwt_shlobj.h
dwt/include/dwt/dwt_vsstyle.h
dwt/include/dwt/forward.h
dwt/include/dwt/tstring.h
dwt/include/dwt/util/xCeptionSmartUtilities.h
win32/compiler.h
win32/stdafx.cpp
win32/stdafx.h
--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk
Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'dcpp/compiler.h'
--- dcpp/compiler.h 2011-01-18 17:51:16 +0000
+++ dcpp/compiler.h 2011-01-27 23:11:24 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001-2010 Jacek Sieka, arnetheduck on gmail point com
+ * Copyright (C) 2001-2011 Jacek Sieka, arnetheduck on gmail point com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
=== modified file 'dcpp/stdinc.cpp'
--- dcpp/stdinc.cpp 2011-01-18 17:51:16 +0000
+++ dcpp/stdinc.cpp 2011-01-27 23:11:24 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001-2010 Jacek Sieka, arnetheduck on gmail point com
+ * Copyright (C) 2001-2011 Jacek Sieka, arnetheduck on gmail point com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
=== modified file 'dcpp/stdinc.h'
--- dcpp/stdinc.h 2011-01-18 17:51:16 +0000
+++ dcpp/stdinc.h 2011-01-27 23:11:24 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001-2010 Jacek Sieka, arnetheduck on gmail point com
+ * Copyright (C) 2001-2011 Jacek Sieka, arnetheduck on gmail point com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
=== modified file 'dcpp/version.cpp'
--- dcpp/version.cpp 2010-10-02 22:00:14 +0000
+++ dcpp/version.cpp 2011-01-27 23:11:24 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001-2010 Jacek Sieka, arnetheduck on gmail point com
+ * Copyright (C) 2001-2011 Jacek Sieka, arnetheduck on gmail point com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
=== modified file 'dcpp/version.h'
--- dcpp/version.h 2011-01-12 15:19:02 +0000
+++ dcpp/version.h 2011-01-27 23:11:24 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001-2010 Jacek Sieka, arnetheduck on gmail point com
+ * Copyright (C) 2001-2011 Jacek Sieka, arnetheduck on gmail point com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
=== modified file 'dwt/include/dwt/GCCHeaders.h'
--- dwt/include/dwt/GCCHeaders.h 2011-01-27 22:57:05 +0000
+++ dwt/include/dwt/GCCHeaders.h 2011-01-27 23:11:24 +0000
@@ -236,88 +236,88 @@
#endif
// MinGW doesn't have all the fields in the following structure, so re-define it better.
-typedef struct tagNMLVCUSTOMDRAW_
-{
- NMCUSTOMDRAW nmcd;
- COLORREF clrText;
- COLORREF clrTextBk;
-#if (_WIN32_IE >= 0x0400)
- int iSubItem;
-#endif
-#if (_WIN32_WINNT >= 0x0501)
- DWORD dwItemType;
-
- // Item custom draw
- COLORREF clrFace;
- int iIconEffect;
- int iIconPhase;
- int iPartId;
- int iStateId;
-
- // Group Custom Draw
- RECT rcText;
- UINT uAlign; // Alignment. Use LVGA_HEADER_CENTER, LVGA_HEADER_RIGHT, LVGA_HEADER_LEFT
-#endif
-} NMLVCUSTOMDRAW_, *LPNMLVCUSTOMDRAW_;
-
-#define tagNMLVCUSTOMDRAW tagNMLVCUSTOMDRAW_
-#define NMLVCUSTOMDRAW NMLVCUSTOMDRAW_
-#define LPNMLVCUSTOMDRAW LPNMLVCUSTOMDRAW_
-
-// dwItemType
-#define LVCDI_ITEM 0x00000000
-#define LVCDI_GROUP 0x00000001
+typedef struct tagNMLVCUSTOMDRAW_
+{
+ NMCUSTOMDRAW nmcd;
+ COLORREF clrText;
+ COLORREF clrTextBk;
+#if (_WIN32_IE >= 0x0400)
+ int iSubItem;
+#endif
+#if (_WIN32_WINNT >= 0x0501)
+ DWORD dwItemType;
+
+ // Item custom draw
+ COLORREF clrFace;
+ int iIconEffect;
+ int iIconPhase;
+ int iPartId;
+ int iStateId;
+
+ // Group Custom Draw
+ RECT rcText;
+ UINT uAlign; // Alignment. Use LVGA_HEADER_CENTER, LVGA_HEADER_RIGHT, LVGA_HEADER_LEFT
+#endif
+} NMLVCUSTOMDRAW_, *LPNMLVCUSTOMDRAW_;
+
+#define tagNMLVCUSTOMDRAW tagNMLVCUSTOMDRAW_
+#define NMLVCUSTOMDRAW NMLVCUSTOMDRAW_
+#define LPNMLVCUSTOMDRAW LPNMLVCUSTOMDRAW_
+
+// dwItemType
+#define LVCDI_ITEM 0x00000000
+#define LVCDI_GROUP 0x00000001
#define LVCDI_ITEMSLIST 0x00000002
#ifndef LVHT_EX_GROUP
-#define LVHT_EX_GROUP_HEADER 0x10000000
-#define LVHT_EX_GROUP_FOOTER 0x20000000
-#define LVHT_EX_GROUP_COLLAPSE 0x40000000
-#define LVHT_EX_GROUP_BACKGROUND 0x80000000
-#define LVHT_EX_GROUP_STATEICON 0x01000000
-#define LVHT_EX_GROUP_SUBSETLINK 0x02000000
+#define LVHT_EX_GROUP_HEADER 0x10000000
+#define LVHT_EX_GROUP_FOOTER 0x20000000
+#define LVHT_EX_GROUP_COLLAPSE 0x40000000
+#define LVHT_EX_GROUP_BACKGROUND 0x80000000
+#define LVHT_EX_GROUP_STATEICON 0x01000000
+#define LVHT_EX_GROUP_SUBSETLINK 0x02000000
#define LVHT_EX_GROUP (LVHT_EX_GROUP_BACKGROUND | LVHT_EX_GROUP_COLLAPSE | LVHT_EX_GROUP_FOOTER | LVHT_EX_GROUP_HEADER | LVHT_EX_GROUP_STATEICON | LVHT_EX_GROUP_SUBSETLINK)
#endif
#ifndef DTT_VALIDBITS
-// Callback function used by DrawThemeTextEx, instead of DrawText
-typedef int (WINAPI *DTT_CALLBACK_PROC)(HDC hdc, LPWSTR pszText, int cchText, LPRECT prc, UINT dwFlags, LPARAM lParam);
-
-//---- bits used in dwFlags of DTTOPTS ----
-#define DTT_TEXTCOLOR (1UL << 0) // crText has been specified
-#define DTT_BORDERCOLOR (1UL << 1) // crBorder has been specified
-#define DTT_SHADOWCOLOR (1UL << 2) // crShadow has been specified
-#define DTT_SHADOWTYPE (1UL << 3) // iTextShadowType has been specified
-#define DTT_SHADOWOFFSET (1UL << 4) // ptShadowOffset has been specified
-#define DTT_BORDERSIZE (1UL << 5) // iBorderSize has been specified
-#define DTT_FONTPROP (1UL << 6) // iFontPropId has been specified
-#define DTT_COLORPROP (1UL << 7) // iColorPropId has been specified
-#define DTT_STATEID (1UL << 8) // IStateId has been specified
-#define DTT_CALCRECT (1UL << 9) // Use pRect as and in/out parameter
-#define DTT_APPLYOVERLAY (1UL << 10) // fApplyOverlay has been specified
-#define DTT_GLOWSIZE (1UL << 11) // iGlowSize has been specified
-#define DTT_CALLBACK (1UL << 12) // pfnDrawTextCallback has been specified
-#define DTT_COMPOSITED (1UL << 13) // Draws text with antialiased alpha (needs a DIB section)
-#define DTT_VALIDBITS (DTT_TEXTCOLOR | DTT_BORDERCOLOR | DTT_SHADOWCOLOR | DTT_SHADOWTYPE | DTT_SHADOWOFFSET | DTT_BORDERSIZE | \
- DTT_FONTPROP | DTT_COLORPROP | DTT_STATEID | DTT_CALCRECT | DTT_APPLYOVERLAY | DTT_GLOWSIZE | DTT_COMPOSITED)
-
-typedef struct _DTTOPTS
-{
- DWORD dwSize; // size of the struct
- DWORD dwFlags; // which options have been specified
- COLORREF crText; // color to use for text fill
- COLORREF crBorder; // color to use for text outline
- COLORREF crShadow; // color to use for text shadow
- int iTextShadowType; // TST_SINGLE or TST_CONTINUOUS
- POINT ptShadowOffset; // where shadow is drawn (relative to text)
- int iBorderSize; // Border radius around text
- int iFontPropId; // Font property to use for the text instead of TMT_FONT
- int iColorPropId; // Color property to use for the text instead of TMT_TEXTCOLOR
- int iStateId; // Alternate state id
- BOOL fApplyOverlay; // Overlay text on top of any text effect?
- int iGlowSize; // Glow radious around text
- DTT_CALLBACK_PROC pfnDrawTextCallback; // Callback for DrawText
- LPARAM lParam; // Parameter for callback
+// Callback function used by DrawThemeTextEx, instead of DrawText
+typedef int (WINAPI *DTT_CALLBACK_PROC)(HDC hdc, LPWSTR pszText, int cchText, LPRECT prc, UINT dwFlags, LPARAM lParam);
+
+//---- bits used in dwFlags of DTTOPTS ----
+#define DTT_TEXTCOLOR (1UL << 0) // crText has been specified
+#define DTT_BORDERCOLOR (1UL << 1) // crBorder has been specified
+#define DTT_SHADOWCOLOR (1UL << 2) // crShadow has been specified
+#define DTT_SHADOWTYPE (1UL << 3) // iTextShadowType has been specified
+#define DTT_SHADOWOFFSET (1UL << 4) // ptShadowOffset has been specified
+#define DTT_BORDERSIZE (1UL << 5) // iBorderSize has been specified
+#define DTT_FONTPROP (1UL << 6) // iFontPropId has been specified
+#define DTT_COLORPROP (1UL << 7) // iColorPropId has been specified
+#define DTT_STATEID (1UL << 8) // IStateId has been specified
+#define DTT_CALCRECT (1UL << 9) // Use pRect as and in/out parameter
+#define DTT_APPLYOVERLAY (1UL << 10) // fApplyOverlay has been specified
+#define DTT_GLOWSIZE (1UL << 11) // iGlowSize has been specified
+#define DTT_CALLBACK (1UL << 12) // pfnDrawTextCallback has been specified
+#define DTT_COMPOSITED (1UL << 13) // Draws text with antialiased alpha (needs a DIB section)
+#define DTT_VALIDBITS (DTT_TEXTCOLOR | DTT_BORDERCOLOR | DTT_SHADOWCOLOR | DTT_SHADOWTYPE | DTT_SHADOWOFFSET | DTT_BORDERSIZE | \
+ DTT_FONTPROP | DTT_COLORPROP | DTT_STATEID | DTT_CALCRECT | DTT_APPLYOVERLAY | DTT_GLOWSIZE | DTT_COMPOSITED)
+
+typedef struct _DTTOPTS
+{
+ DWORD dwSize; // size of the struct
+ DWORD dwFlags; // which options have been specified
+ COLORREF crText; // color to use for text fill
+ COLORREF crBorder; // color to use for text outline
+ COLORREF crShadow; // color to use for text shadow
+ int iTextShadowType; // TST_SINGLE or TST_CONTINUOUS
+ POINT ptShadowOffset; // where shadow is drawn (relative to text)
+ int iBorderSize; // Border radius around text
+ int iFontPropId; // Font property to use for the text instead of TMT_FONT
+ int iColorPropId; // Color property to use for the text instead of TMT_TEXTCOLOR
+ int iStateId; // Alternate state id
+ BOOL fApplyOverlay; // Overlay text on top of any text effect?
+ int iGlowSize; // Glow radious around text
+ DTT_CALLBACK_PROC pfnDrawTextCallback; // Callback for DrawText
+ LPARAM lParam; // Parameter for callback
} DTTOPTS, *PDTTOPTS;
#endif
=== modified file 'dwt/include/dwt/dwt_dwmapi.h'
--- dwt/include/dwt/dwt_dwmapi.h 2010-10-28 22:54:06 +0000
+++ dwt/include/dwt/dwt_dwmapi.h 2011-01-27 23:11:24 +0000
@@ -1,7 +1,7 @@
/*
DC++ Widget Toolkit
- Copyright (c) 2007-2010, Jacek Sieka
+ Copyright (c) 2007-2011, Jacek Sieka
All rights reserved.
=== modified file 'dwt/include/dwt/dwt_shlobj.h'
--- dwt/include/dwt/dwt_shlobj.h 2010-12-20 17:40:42 +0000
+++ dwt/include/dwt/dwt_shlobj.h 2011-01-27 23:11:24 +0000
@@ -1,7 +1,7 @@
/*
DC++ Widget Toolkit
- Copyright (c) 2007-2010, Jacek Sieka
+ Copyright (c) 2007-2011, Jacek Sieka
All rights reserved.
=== modified file 'dwt/include/dwt/dwt_vsstyle.h'
--- dwt/include/dwt/dwt_vsstyle.h 2011-01-27 22:57:05 +0000
+++ dwt/include/dwt/dwt_vsstyle.h 2011-01-27 23:11:24 +0000
@@ -1,7 +1,7 @@
/*
DC++ Widget Toolkit
- Copyright (c) 2007-2010, Jacek Sieka
+ Copyright (c) 2007-2011, Jacek Sieka
All rights reserved.
=== added file 'dwt/include/dwt/dwt_vssym32.h'
--- dwt/include/dwt/dwt_vssym32.h 1970-01-01 00:00:00 +0000
+++ dwt/include/dwt/dwt_vssym32.h 2011-01-27 23:11:24 +0000
@@ -0,0 +1,49 @@
+/*
+ DC++ Widget Toolkit
+
+ Copyright (c) 2007-2011, Jacek Sieka
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of the DWT nor SmartWin++ nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef DWT_VSSYM32_H
+#define DWT_VSSYM32_H
+
+#ifdef __GNUC__
+// MinGW lacks vssym32.h, so define what we need here
+
+#ifndef TMT_CONTENTMARGINS
+#define TMT_CONTENTMARGINS 3602
+#endif
+#ifndef TMT_HEADING1TEXTCOLOR
+#define TMT_HEADING1TEXTCOLOR 3825
+#endif
+
+#else
+#include <vssym32.h>
+#endif
+
+#endif
=== modified file 'dwt/include/dwt/forward.h'
--- dwt/include/dwt/forward.h 2010-12-23 15:57:01 +0000
+++ dwt/include/dwt/forward.h 2011-01-27 23:11:24 +0000
@@ -2,7 +2,7 @@
DC++ Widget Toolkit
- Copyright (c) 2007-2010, Jacek Sieka
+ Copyright (c) 2007-2011, Jacek Sieka
All rights reserved.
=== modified file 'dwt/include/dwt/tstring.h'
--- dwt/include/dwt/tstring.h 2010-12-20 17:40:42 +0000
+++ dwt/include/dwt/tstring.h 2011-01-27 23:11:24 +0000
@@ -1,7 +1,7 @@
/*
DC++ Widget Toolkit
- Copyright (c) 2007-2010, Jacek Sieka
+ Copyright (c) 2007-2011, Jacek Sieka
SmartWin++
=== modified file 'dwt/include/dwt/util/xCeptionSmartUtilities.h'
--- dwt/include/dwt/util/xCeptionSmartUtilities.h 2010-02-11 21:44:13 +0000
+++ dwt/include/dwt/util/xCeptionSmartUtilities.h 2011-01-27 23:11:24 +0000
@@ -1,7 +1,7 @@
/*
DC++ Widget Toolkit
- Copyright (c) 2007-2010, Jacek Sieka
+ Copyright (c) 2007-2011, Jacek Sieka
SmartWin++
=== modified file 'win32/compiler.h'
--- win32/compiler.h 2011-01-18 17:51:16 +0000
+++ win32/compiler.h 2011-01-27 23:11:24 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001-2010 Jacek Sieka, arnetheduck on gmail point com
+ * Copyright (C) 2001-2011 Jacek Sieka, arnetheduck on gmail point com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
=== modified file 'win32/stdafx.cpp'
--- win32/stdafx.cpp 2011-01-18 17:51:16 +0000
+++ win32/stdafx.cpp 2011-01-27 23:11:24 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001-2010 Jacek Sieka, arnetheduck on gmail point com
+ * Copyright (C) 2001-2011 Jacek Sieka, arnetheduck on gmail point com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
=== modified file 'win32/stdafx.h'
--- win32/stdafx.h 2011-01-18 17:51:16 +0000
+++ win32/stdafx.h 2011-01-27 23:11:24 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001-2010 Jacek Sieka, arnetheduck on gmail point com
+ * Copyright (C) 2001-2011 Jacek Sieka, arnetheduck on gmail point com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
