Reformatting.

[wxWidgets.git] / contrib / src / stc / scintilla / include / WinDefs.h

diff --git a/contrib/src/stc/scintilla/include/WinDefs.h b/contrib/src/stc/scintilla/include/WinDefs.h
index 0b125e73138b24e228a084aecfbfe3d542776a6d..d1c25a595af5f0290f6cc2cda783ce69df20d5b8 100644 (file)
--- a/contrib/src/stc/scintilla/include/WinDefs.h
+++ b/contrib/src/stc/scintilla/include/WinDefs.h
@@ -20,79 +20,34 @@
 #define EM_CANPASTE    (1074)
 #define EM_CANUNDO     (198)
 #define EM_CHARFROMPOS (215)
 #define EM_CANPASTE    (1074)
 #define EM_CANUNDO     (198)
 #define EM_CHARFROMPOS (215)

-#define EM_DISPLAYBAND (1075)

 #define EM_EMPTYUNDOBUFFER     (205)
 #define EM_EXGETSEL    (1076)
 #define EM_EMPTYUNDOBUFFER     (205)
 #define EM_EXGETSEL    (1076)

-#define EM_EXLIMITTEXT (1077)

 #define EM_EXLINEFROMCHAR      (1078)
 #define EM_EXSETSEL    (1079)
 #define EM_FINDTEXT    (1080)
 #define EM_FINDTEXTEX  (1103)
 #define EM_EXLINEFROMCHAR      (1078)
 #define EM_EXSETSEL    (1079)
 #define EM_FINDTEXT    (1080)
 #define EM_FINDTEXTEX  (1103)

-#define EM_FINDWORDBREAK       (1100)
-#define EM_FMTLINES    (200)

 #define EM_FORMATRANGE (1081)
 #define EM_FORMATRANGE (1081)

-#define EM_GETCHARFORMAT       (1082)
-#define EM_GETEVENTMASK        (1083)

 #define EM_GETFIRSTVISIBLELINE (206)
 #define EM_GETFIRSTVISIBLELINE (206)

-#define EM_GETHANDLE   (189)
-#define EM_GETLIMITTEXT        (213)

 #define EM_GETLINE     (196)
 #define EM_GETLINECOUNT        (186)
 #define EM_GETMARGINS  (212)
 #define EM_GETMODIFY   (184)
 #define EM_GETLINE     (196)
 #define EM_GETLINECOUNT        (186)
 #define EM_GETMARGINS  (212)
 #define EM_GETMODIFY   (184)

-#define EM_GETIMECOLOR (1129)
-#define EM_GETIMEOPTIONS       (1131)
-#define EM_GETOPTIONS  (1102)
-#define EM_GETOLEINTERFACE     (1084)
-#define EM_GETPARAFORMAT       (1085)
-#define EM_GETPASSWORDCHAR     (210)
-#define EM_GETPUNCTUATION      (1125)

 #define EM_GETRECT     (178)
 #define EM_GETSEL      (176)
 #define EM_GETSELTEXT  (1086)
 #define EM_GETTEXTRANGE        (1099)
 #define EM_GETRECT     (178)
 #define EM_GETSEL      (176)
 #define EM_GETSELTEXT  (1086)
 #define EM_GETTEXTRANGE        (1099)

-#define EM_GETTHUMB    (190)
-#define EM_GETWORDBREAKPROC    (209)
-#define EM_GETWORDBREAKPROCEX  (1104)
-#define EM_GETWORDWRAPMODE     (1127)

 #define EM_HIDESELECTION       (1087)
 #define EM_HIDESELECTION       (1087)

-#define EM_LIMITTEXT   (197)

 #define EM_LINEFROMCHAR        (201)
 #define EM_LINEINDEX   (187)
 #define EM_LINELENGTH  (193)
 #define EM_LINESCROLL  (182)
 #define EM_LINEFROMCHAR        (201)
 #define EM_LINEINDEX   (187)
 #define EM_LINELENGTH  (193)
 #define EM_LINESCROLL  (182)

-#define EM_PASTESPECIAL        (1088)

 #define EM_POSFROMCHAR (214)
 #define EM_REPLACESEL  (194)
 #define EM_POSFROMCHAR (214)
 #define EM_REPLACESEL  (194)

-#define EM_REQUESTRESIZE       (1089)
-#define EM_SCROLL      (181)

 #define EM_SCROLLCARET (183)
 #define EM_SELECTIONTYPE       (1090)
 #define EM_SCROLLCARET (183)
 #define EM_SELECTIONTYPE       (1090)

-#define EM_SETBKGNDCOLOR       (1091)
-#define EM_SETCHARFORMAT       (1092)
-#define EM_SETEVENTMASK        (1093)
-#define EM_SETHANDLE   (188)
-#define EM_SETIMECOLOR (1128)
-#define EM_SETIMEOPTIONS       (1130)
-#define EM_SETLIMITTEXT        (197)

 #define EM_SETMARGINS  (211)
 #define EM_SETMARGINS  (211)

-#define EM_SETMODIFY   (185)
-#define EM_SETOLECALLBACK      (1094)
-#define EM_SETOPTIONS  (1101)
-#define EM_SETPARAFORMAT       (1095)
-#define EM_SETPASSWORDCHAR     (204)
-#define EM_SETPUNCTUATION      (1124)

 #define EM_SETREADONLY (207)
 #define EM_SETREADONLY (207)

-#define EM_SETRECT     (179)
-#define EM_SETRECTNP   (180)

 #define EM_SETSEL      (177)
 #define EM_SETSEL      (177)

-#define EM_SETTABSTOPS (203)
-#define EM_SETTARGETDEVICE     (1096)
-#define EM_SETWORDBREAKPROC    (208)
-#define EM_SETWORDBREAKPROCEX  (1105)
-#define EM_SETWORDWRAPMODE     (1126)
-#define EM_STREAMIN    (1097)
-#define EM_STREAMOUT   (1098)

 #define EM_UNDO        (199)
 
 #define WM_NULL                (0)
 #define EM_UNDO        (199)
 
 #define WM_NULL                (0)


@@ -132,6 +87,7 @@
 #define VK_RETURN GDK_Return
 #define VK_ADD GDK_KP_Add
 #define VK_SUBTRACT GDK_KP_Subtract
 #define VK_RETURN GDK_Return
 #define VK_ADD GDK_KP_Add
 #define VK_SUBTRACT GDK_KP_Subtract

+#define VK_DIVIDE GDK_KP_Divide

 #endif
 
 #if PLAT_WX
 #endif
 
 #if PLAT_WX


@@ -151,6 +107,8 @@
 #define VK_RETURN       WXK_RETURN
 #define VK_ADD          WXK_ADD
 #define VK_SUBTRACT     WXK_SUBTRACT
 #define VK_RETURN       WXK_RETURN
 #define VK_ADD          WXK_ADD
 #define VK_SUBTRACT     WXK_SUBTRACT

+//TODO:
+#define VK_DIVIDE      WXK_DIVIDE

 
 // Are these needed any more
 #define LPSTR char *
 
 // Are these needed any more
 #define LPSTR char *