From 9164a954eb3949135144f0ffdb760723537d4968 Mon Sep 17 00:00:00 2001 From: nyamatongwe Date: Fri, 26 Sep 2003 14:20:49 +0000 Subject: Fixed compilation for GTK+ 1.x. --- gtk/PlatGTK.cxx | 4 ++-- 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(GDK_SELECTION_TYPE_STRING) : atomUTF8, 8, reinterpret_cast(selBuffer), len); } else if ((info == TARGET_TEXT) || (info == TARGET_COMPOUND_TEXT)) { -- cgit v1.2.3