diff options
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 6f318205d..3ef3c45ed 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -1001,8 +1001,8 @@ int ScintillaGTK::EncodedFromUTF8(char *utf8, char *encoded) { } bool ScintillaGTK::ValidCodePage(int codePage) const { - return codePage == 0 - || codePage == SC_CP_UTF8 + return codePage == 0 + || codePage == SC_CP_UTF8 || codePage == 932 || codePage == 936 || codePage == 950 @@ -1038,10 +1038,10 @@ sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam case SCI_SETRECTANGULARSELECTIONMODIFIER: rectangularSelectionModifier = wParam; break; - + case SCI_GETRECTANGULARSELECTIONMODIFIER: return rectangularSelectionModifier; - + default: return ScintillaBase::WndProc(iMessage, wParam, lParam); } @@ -1753,9 +1753,6 @@ void ScintillaGTK::Resize(int width, int height) { int horizontalScrollBarHeight = scrollBarHeight; if (!showSBHorizontal) horizontalScrollBarHeight = 0; - int verticalScrollBarHeight = scrollBarWidth; - if (!verticalScrollBarVisible) - verticalScrollBarHeight = 0; GtkAllocation alloc; if (showSBHorizontal) { @@ -1817,7 +1814,7 @@ static int modifierTranslated(int sciModifier) { return GDK_MOD1_MASK; case SCMOD_SUPER: return GDK_MOD4_MASK; - default: + default: return 0; } } |