| commdlg.h (6.0.6002.18005-Windows 6.0) | | commdlg.h (6.1.7601.17514-Windows 7.0) |
|---|
| | |
| skipping to change at line 732 | | skipping to change at line 732 |
|---|
| #define CF_SCALABLEONLY 0x00020000L | | #define CF_SCALABLEONLY 0x00020000L |
| #define CF_TTONLY 0x00040000L | | #define CF_TTONLY 0x00040000L |
| #define CF_NOFACESEL 0x00080000L | | #define CF_NOFACESEL 0x00080000L |
| #define CF_NOSTYLESEL 0x00100000L | | #define CF_NOSTYLESEL 0x00100000L |
| #define CF_NOSIZESEL 0x00200000L | | #define CF_NOSIZESEL 0x00200000L |
| #if(WINVER >= 0x0400) | | #if(WINVER >= 0x0400) |
| #define CF_SELECTSCRIPT 0x00400000L | | #define CF_SELECTSCRIPT 0x00400000L |
| #define CF_NOSCRIPTSEL 0x00800000L | | #define CF_NOSCRIPTSEL 0x00800000L |
| #define CF_NOVERTFONTS 0x01000000L | | #define CF_NOVERTFONTS 0x01000000L |
| #endif /* WINVER >= 0x0400 */ | | #endif /* WINVER >= 0x0400 */ |
|
| | #if(WINVER >= 0x0601) |
| | #define CF_INACTIVEFONTS 0x02000000L |
| | #endif /* WINVER >= 0x0601 */ |
| | |
| // these are extra nFontType bits that are added to what is returned to the | | // these are extra nFontType bits that are added to what is returned to the |
| // EnumFonts callback routine | | // EnumFonts callback routine |
| | |
| #define SIMULATED_FONTTYPE 0x8000 | | #define SIMULATED_FONTTYPE 0x8000 |
| #define PRINTER_FONTTYPE 0x4000 | | #define PRINTER_FONTTYPE 0x4000 |
| #define SCREEN_FONTTYPE 0x2000 | | #define SCREEN_FONTTYPE 0x2000 |
| #define BOLD_FONTTYPE 0x0100 | | #define BOLD_FONTTYPE 0x0100 |
| #define ITALIC_FONTTYPE 0x0200 | | #define ITALIC_FONTTYPE 0x0200 |
| #define REGULAR_FONTTYPE 0x0400 | | #define REGULAR_FONTTYPE 0x0400 |
| | |
| skipping to change at line 754 | | skipping to change at line 757 |
|---|
| | |
| // #define RASTER_FONTTYPE 0x001 | | // #define RASTER_FONTTYPE 0x001 |
| // #define DEVICE_FONTTYPE 0x002 | | // #define DEVICE_FONTTYPE 0x002 |
| // #define TRUETYPE_FONTTYPE 0x004 | | // #define TRUETYPE_FONTTYPE 0x004 |
| | |
| #if (NTDDI_VERSION >= NTDDI_WIN2K) | | #if (NTDDI_VERSION >= NTDDI_WIN2K) |
| #define PS_OPENTYPE_FONTTYPE 0x10000 | | #define PS_OPENTYPE_FONTTYPE 0x10000 |
| #define TT_OPENTYPE_FONTTYPE 0x20000 | | #define TT_OPENTYPE_FONTTYPE 0x20000 |
| #define TYPE1_FONTTYPE 0x40000 | | #define TYPE1_FONTTYPE 0x40000 |
| #endif // (NTDDI_VERSION >= NTDDI_WIN2K) | | #endif // (NTDDI_VERSION >= NTDDI_WIN2K) |
|
| | #if(WINVER >= 0x0601) |
| | #define SYMBOL_FONTTYPE 0x80000 |
| | #endif /* WINVER >= 0x0601 */ |
| | |
| #define WM_CHOOSEFONT_GETLOGFONT (WM_USER + 1) | | #define WM_CHOOSEFONT_GETLOGFONT (WM_USER + 1) |
| #if (NTDDI_VERSION >= NTDDI_WIN2K) | | #if (NTDDI_VERSION >= NTDDI_WIN2K) |
| #define WM_CHOOSEFONT_SETLOGFONT (WM_USER + 101) | | #define WM_CHOOSEFONT_SETLOGFONT (WM_USER + 101) |
| #define WM_CHOOSEFONT_SETFLAGS (WM_USER + 102) | | #define WM_CHOOSEFONT_SETFLAGS (WM_USER + 102) |
| #endif // (NTDDI_VERSION >= NTDDI_WIN2K) | | #endif // (NTDDI_VERSION >= NTDDI_WIN2K) |
| | |
| // strings used to obtain unique window message for communication | | // strings used to obtain unique window message for communication |
| // between dialog and caller | | // between dialog and caller |
| | |
| | |
| skipping to change at line 857 | | skipping to change at line 863 |
|---|
| HGLOBAL hSetupTemplate; | | HGLOBAL hSetupTemplate; |
| } PRINTDLGW, *LPPRINTDLGW; | | } PRINTDLGW, *LPPRINTDLGW; |
| #ifdef UNICODE | | #ifdef UNICODE |
| typedef PRINTDLGW PRINTDLG; | | typedef PRINTDLGW PRINTDLG; |
| typedef LPPRINTDLGW LPPRINTDLG; | | typedef LPPRINTDLGW LPPRINTDLG; |
| #else | | #else |
| typedef PRINTDLGA PRINTDLG; | | typedef PRINTDLGA PRINTDLG; |
| typedef LPPRINTDLGA LPPRINTDLG; | | typedef LPPRINTDLGA LPPRINTDLG; |
| #endif // UNICODE | | #endif // UNICODE |
| | |
|
| WINCOMMDLGAPI BOOL APIENTRY PrintDlgA(LPPRINTDLGA); | | WINCOMMDLGAPI BOOL APIENTRY PrintDlgA(__inout LPPRINTDLGA pPD); |
| WINCOMMDLGAPI BOOL APIENTRY PrintDlgW(LPPRINTDLGW); | | WINCOMMDLGAPI BOOL APIENTRY PrintDlgW(__inout LPPRINTDLGW pPD); |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define PrintDlg PrintDlgW | | #define PrintDlg PrintDlgW |
| #else | | #else |
| #define PrintDlg PrintDlgA | | #define PrintDlg PrintDlgA |
| #endif // !UNICODE | | #endif // !UNICODE |
| | |
| #if(WINVER >= 0x0500) | | #if(WINVER >= 0x0500) |
| | |
| #ifdef STDMETHOD | | #ifdef STDMETHOD |
| | |
| | |
| skipping to change at line 1015 | | skipping to change at line 1021 |
|---|
| DWORD dwResultAction; // result action if S_OK is retur
ned | | DWORD dwResultAction; // result action if S_OK is retur
ned |
| } PRINTDLGEXW, *LPPRINTDLGEXW; | | } PRINTDLGEXW, *LPPRINTDLGEXW; |
| #ifdef UNICODE | | #ifdef UNICODE |
| typedef PRINTDLGEXW PRINTDLGEX; | | typedef PRINTDLGEXW PRINTDLGEX; |
| typedef LPPRINTDLGEXW LPPRINTDLGEX; | | typedef LPPRINTDLGEXW LPPRINTDLGEX; |
| #else | | #else |
| typedef PRINTDLGEXA PRINTDLGEX; | | typedef PRINTDLGEXA PRINTDLGEX; |
| typedef LPPRINTDLGEXA LPPRINTDLGEX; | | typedef LPPRINTDLGEXA LPPRINTDLGEX; |
| #endif // UNICODE | | #endif // UNICODE |
| | |
|
| WINCOMMDLGAPI HRESULT APIENTRY PrintDlgExA(LPPRINTDLGEXA); | | WINCOMMDLGAPI HRESULT APIENTRY PrintDlgExA(__inout LPPRINTDLGEXA pPD); |
| WINCOMMDLGAPI HRESULT APIENTRY PrintDlgExW(LPPRINTDLGEXW); | | WINCOMMDLGAPI HRESULT APIENTRY PrintDlgExW(__inout LPPRINTDLGEXW pPD); |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define PrintDlgEx PrintDlgExW | | #define PrintDlgEx PrintDlgExW |
| #else | | #else |
| #define PrintDlgEx PrintDlgExA | | #define PrintDlgEx PrintDlgExA |
| #endif // !UNICODE | | #endif // !UNICODE |
| | |
| #endif | | #endif |
| | |
| #endif /* WINVER >= 0x0500 */ | | #endif /* WINVER >= 0x0500 */ |
| | |
| | |
| End of changes. 4 change blocks. |
|---|
| 4 lines changed or deleted | | 10 lines changed or added |
|---|
|