diff options
author | Neil <nyamatongwe@gmail.com> | 2017-06-09 11:31:14 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2017-06-09 11:31:14 +1000 |
commit | 91e85ffa9fb176b9c87dac1a3849a99ab594d899 (patch) | |
tree | 7bcb7ea3f640821519ad77c6018df2b531176caa /gtk/ScintillaGTK.cxx | |
parent | 454c44ddcd26843a1253757de333bc3c3c0cba8e (diff) | |
download | scintilla-mirror-91e85ffa9fb176b9c87dac1a3849a99ab594d899.tar.gz |
Use min and max from std instead of own version from platform.
Diffstat (limited to 'gtk/ScintillaGTK.cxx')
-rw-r--r-- | gtk/ScintillaGTK.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 0737b71f1..2291dfffc 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -1614,7 +1614,7 @@ void ScintillaGTK::Resize(int width, int height) { gtk_widget_show(GTK_WIDGET(PWidget(scrollbarh))); alloc.x = 0; alloc.y = height - horizontalScrollBarHeight; - alloc.width = Platform::Maximum(minHScrollBarWidth, width - verticalScrollBarWidth); + alloc.width = std::max(minHScrollBarWidth, width - verticalScrollBarWidth); alloc.height = horizontalScrollBarHeight; gtk_widget_size_allocate(GTK_WIDGET(PWidget(scrollbarh)), &alloc); } else { @@ -1627,7 +1627,7 @@ void ScintillaGTK::Resize(int width, int height) { alloc.x = width - verticalScrollBarWidth; alloc.y = 0; alloc.width = verticalScrollBarWidth; - alloc.height = Platform::Maximum(minVScrollBarHeight, height - horizontalScrollBarHeight); + alloc.height = std::max(minVScrollBarHeight, height - horizontalScrollBarHeight); gtk_widget_size_allocate(GTK_WIDGET(PWidget(scrollbarv)), &alloc); } else { gtk_widget_hide(GTK_WIDGET(PWidget(scrollbarv))); @@ -1648,8 +1648,8 @@ void ScintillaGTK::Resize(int width, int height) { alloc.width = requisition.width; alloc.height = requisition.height; #endif - alloc.width = Platform::Maximum(alloc.width, width - verticalScrollBarWidth); - alloc.height = Platform::Maximum(alloc.height, height - horizontalScrollBarHeight); + alloc.width = std::max(alloc.width, width - verticalScrollBarWidth); + alloc.height = std::max(alloc.height, height - horizontalScrollBarHeight); gtk_widget_size_allocate(GTK_WIDGET(PWidget(wText)), &alloc); } |