From 03d942002d258393fd2749012f6de85d9229b956 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 18 Apr 2018 18:08:10 +0200
Subject: [PATCH] Really fix trailing spaces in the generated wxSTC file

Commit 496da2e550ce1f562f727230babc363da190530e removed the trailing
spaces from the generated file, but they were reintroduced whenever it
was regenerated.

Really fix this by removing the extra spaces from the script generating
the file.

See https://github.com/wxWidgets/wxWidgets/pull/787
---
 src/stc/gen_iface.py | 10 ++++------
 src/stc/stc.cpp      |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index deabf2962b..2de2832169 100755
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -228,8 +228,7 @@ methodOverrideMap = {
         strm.CopyTo(buff, len);
         buff[len] = 0;
         SendMsg(%s, markerNumber, (sptr_t)buff);
-        delete [] buff;
-        '''
+        delete [] buff;'''
     ),
 
     'GetMargins' : ('GetMarginCount', 0, 0),
@@ -552,8 +551,7 @@ methodOverrideMap = {
         strm.CopyTo(buff, len);
         buff[len] = 0;
         SendMsg(%s, type, (sptr_t)buff);
-        delete [] buff;
-     '''
+        delete [] buff;'''
     ),
 
     'SetHScrollBar' : ('SetUseHorizontalScrollBar', 0, 0),
@@ -1049,7 +1047,7 @@ methodOverrideMap = {
     (0,
      'void* %s(int bytes) const;',
      """void* %s(int bytes) const {
-         return (void*)(sptr_t)SendMsg(%s, bytes); """
+         return (void*)(sptr_t)SendMsg(%s, bytes);"""
     ),
 
     'GetRepresentation' :
@@ -1070,7 +1068,7 @@ methodOverrideMap = {
      (0,
       'void* %s(int operation, void* pointer);',
       """void* %s(int operation, void* pointer) {
-           return (void*)(sptr_t)SendMsg(%s, operation, (sptr_t)pointer); """
+           return (void*)(sptr_t)SendMsg(%s, operation, (sptr_t)pointer);"""
      ),
 
     'GetSubStyleBases' :
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 98bb61cdd8..61eea8dad3 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -675,7 +675,6 @@ void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp)
         buff[len] = 0;
         SendMsg(SCI_MARKERDEFINEPIXMAP, markerNumber, (sptr_t)buff);
         delete [] buff;
-
 }
 
 // Add a set of markers to a line.
@@ -1478,7 +1477,6 @@ void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
         buff[len] = 0;
         SendMsg(SCI_REGISTERIMAGE, type, (sptr_t)buff);
         delete [] buff;
-
 }
 
 // Clear all the registered images.