Add missing WXK constants for the control keys

[wxWidgets.git] / src / stc / scintilla / include / ScintillaWidget.h

diff --git a/src/stc/scintilla/include/ScintillaWidget.h b/src/stc/scintilla/include/ScintillaWidget.h
index 765fd8594d159e6420d32fdcc3cc420711400b00..021af2a30e33f66c6f4857a7b64bb01c971dbcf8 100644 (file)
--- a/src/stc/scintilla/include/ScintillaWidget.h
+++ b/src/stc/scintilla/include/ScintillaWidget.h
@@ -1,21 +1,21 @@
-// Scintilla source code edit control
+/* Scintilla source code edit control */

 /** @file ScintillaWidget.h
  ** Definition of Scintilla widget for GTK+.
  ** Only needed by GTK+ code but is harmless on other platforms.
  **/
 /** @file ScintillaWidget.h
  ** Definition of Scintilla widget for GTK+.
  ** Only needed by GTK+ code but is harmless on other platforms.
  **/

-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
-// The License.txt file describes the conditions under which this software may be distributed.
+/* Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+ * The License.txt file describes the conditions under which this software may be distributed. */

 
 #ifndef SCINTILLAWIDGET_H
 #define SCINTILLAWIDGET_H
 
 
 #ifndef SCINTILLAWIDGET_H
 #define SCINTILLAWIDGET_H
 

-#if PLAT_GTK
+#if defined(GTK)

 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 

-#define SCINTILLA(obj)          GTK_CHECK_CAST (obj, scintilla_get_type (), ScintillaObject)
+#define SCINTILLA(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, scintilla_get_type (), ScintillaObject)

 #define SCINTILLA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, scintilla_get_type (), ScintillaClass)
 #define IS_SCINTILLA(obj)       GTK_CHECK_TYPE (obj, scintilla_get_type ())
 
 #define SCINTILLA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, scintilla_get_type (), ScintillaClass)
 #define IS_SCINTILLA(obj)       GTK_CHECK_TYPE (obj, scintilla_get_type ())
 


@@ -34,17 +34,13 @@ struct _ScintillaClass {
        void (* notify) (ScintillaObject *ttt);
 };
 
        void (* notify) (ScintillaObject *ttt);
 };
 

-guint          scintilla_get_type      (void);
+GType          scintilla_get_type      (void);

 GtkWidget*     scintilla_new           (void);
 GtkWidget*     scintilla_new           (void);

-void           scintilla_set_id        (ScintillaObject *sci,int id);
+void           scintilla_set_id        (ScintillaObject *sci, uptr_t id);

 sptr_t         scintilla_send_message  (ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 void           scintilla_release_resources(void);
 
 sptr_t         scintilla_send_message  (ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 void           scintilla_release_resources(void);
 

-#if GTK_MAJOR_VERSION < 2
-#define SCINTILLA_NOTIFY "notify"
-#else

 #define SCINTILLA_NOTIFY "sci-notify"
 #define SCINTILLA_NOTIFY "sci-notify"

-#endif

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }