Windows and Unicode compilation fixes

[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 f6c2fc3542c343af2c1cd05622063e6c6da084d3..203f35733923a00babbf6d846cb1c1e5b4a67b63 100644 (file)
--- a/src/stc/scintilla/include/ScintillaWidget.h
+++ b/src/stc/scintilla/include/ScintillaWidget.h
@@ -11,17 +11,6 @@
 
 #if PLAT_GTK
 
-#ifndef SCINTILLA_H
-#ifdef _MSC_VER
-#pragma message(__FILE__ "(1) : warning : Scintilla.h should be included before ScintillaWidget.h")
-#pragma message("This will be required in the next version of Scintilla")
-#else
-#warning Scintilla.h should be included before ScintillaWidget.h
-#warning This will be required in the next version of Scintilla
-#endif
-#include "Scintilla.h"
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -39,7 +28,7 @@ struct _ScintillaObject {
 };
 
 struct _ScintillaClass {
-       GtkFixedClass parent_class;
+       GtkContainerClass parent_class;
 
        void (* command) (ScintillaObject *ttt);
        void (* notify) (ScintillaObject *ttt);
@@ -50,6 +39,12 @@ GtkWidget*   scintilla_new           (void);
 void           scintilla_set_id        (ScintillaObject *sci,int id);
 sptr_t scintilla_send_message  (ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 
+#if GTK_MAJOR_VERSION < 2
+#define SCINTILLA_NOTIFY "notify"
+#else
+#define SCINTILLA_NOTIFY "sci-notify"
+#endif
+
 #ifdef __cplusplus
 }
 #endif