diff options
| -rw-r--r-- | include/Scintilla.h | 2 | ||||
| -rw-r--r-- | include/WinDefs.h | 4 | ||||
| -rw-r--r-- | win32/ScintRes.rc | 8 | 
3 files changed, 10 insertions, 4 deletions
| diff --git a/include/Scintilla.h b/include/Scintilla.h index d4092814f..eecf7dfdc 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -339,6 +339,8 @@ extern "C" {  #define SCI_LINESONSCREEN SCI_START + 370  #define SCI_USEPOPUP SCI_START + 371  #define SCI_SELECTIONISRECTANGLE SCI_START + 372 +#define SCI_SETZOOM SCI_START + 373 +#define SCI_GETZOOM SCI_START + 374  // GTK+ Specific  #define SCI_GRABFOCUS SCI_START + 400 diff --git a/include/WinDefs.h b/include/WinDefs.h index 0b125e731..83aa760da 100644 --- a/include/WinDefs.h +++ b/include/WinDefs.h @@ -132,6 +132,8 @@  #define VK_RETURN GDK_Return  #define VK_ADD GDK_KP_Add  #define VK_SUBTRACT GDK_KP_Subtract +//TODO: +#define VK_MULTIPLY GDK_KP_Subtract  #endif  #if PLAT_WX @@ -151,6 +153,8 @@  #define VK_RETURN       WXK_RETURN  #define VK_ADD          WXK_ADD  #define VK_SUBTRACT     WXK_SUBTRACT +//TODO: +#define VK_MULTIPLY WXK_SUBTRACT  // Are these needed any more  #define LPSTR char * diff --git a/win32/ScintRes.rc b/win32/ScintRes.rc index 27e1c78a4..06b9118d9 100644 --- a/win32/ScintRes.rc +++ b/win32/ScintRes.rc @@ -9,8 +9,8 @@  #include "PlatformRes.h"  VS_VERSION_INFO VERSIONINFO -FILEVERSION	1, 2, 4, 0 -PRODUCTVERSION	1, 2, 4, 0 +FILEVERSION	1, 2, 5, 0 +PRODUCTVERSION	1, 2, 5, 0  FILEFLAGSMASK	0x3fL  FILEFLAGS 0  FILEOS VOS_NT_WINDOWS32 @@ -27,12 +27,12 @@ BEGIN  		BEGIN  			VALUE	"CompanyName",	"Neil Hodgson neilh@scintilla.org\0"  			VALUE	"FileDescription",	"Scintilla.DLL - a Source Editing Component\0" -			VALUE	"FileVersion",	"1.24\0" +			VALUE	"FileVersion",	"1.25\0"  			VALUE	"InternalName",	"Scintilla\0"  			VALUE	"LegalCopyright",	"Copyright 1998-2000 by Neil Hodgson\0"  			VALUE	"OriginalFilename",	"Scintilla.DLL\0"  			VALUE	"ProductName",	"Scintilla\0" -			VALUE	"ProductVersion",	"1.24\0" +			VALUE	"ProductVersion",	"1.25\0"  		END  	END  END | 
