diff options
| author | nyamatongwe <devnull@localhost> | 2003-09-26 14:20:49 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2003-09-26 14:20:49 +0000 |
| commit | 53b7e34a92bef7818f32e971b8c780ee591c61e7 (patch) | |
| tree | a75c7d78eed0e52e0b0d447fa98269c6ea913aab | |
| parent | 77f51b7b87d4b6e61d741290377c4ad82df603c0 (diff) | |
| download | scintilla-mirror-53b7e34a92bef7818f32e971b8c780ee591c61e7.tar.gz | |
Fixed compilation for GTK+ 1.x.rel-1-55
| -rw-r--r-- | gtk/PlatGTK.cxx | 4 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index a3c8b4b15..91fe6c67e 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -718,8 +718,6 @@ public: void SetDBCSMode(int codePage); }; -#ifdef USE_PANGO - const char *CharacterSetID(int characterSet) { switch (characterSet) { case SC_CHARSET_ANSI: @@ -765,6 +763,8 @@ const char *CharacterSetID(int characterSet) { } } +#ifdef USE_PANGO + void SurfaceImpl::SetIconv(int characterSet_) { if (characterSet != characterSet_) { if (iconvh != iconvhBad) diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 33561fec6..e10aee5f2 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -1325,7 +1325,7 @@ void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, Se #endif gtk_selection_data_set(selection_data, (info == TARGET_STRING) ? - GDK_SELECTION_TYPE_STRING : atomUTF8, + static_cast<GdkAtom>(GDK_SELECTION_TYPE_STRING) : atomUTF8, 8, reinterpret_cast<unsigned char *>(selBuffer), len); } else if ((info == TARGET_TEXT) || (info == TARGET_COMPOUND_TEXT)) { |