Merge branch 'misc-fixes' of https://github.com/MaartenBent/wxWidgets

Enable using PIC by default even for static libraries and several other
build-related fixes (warning fixes etc).

See https://github.com/wxWidgets/wxWidgets/pull/2008

src/common/sckaddr.cpp

@@ -180,7 +180,11 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress);
 namespace
 {
 
-#if defined(HAVE_GETHOSTBYNAME)
+#if defined(HAVE_GETHOSTBYNAME) && \
+    !defined(HAVE_FUNC_GETHOSTBYNAME_R_6) && \
+    !defined(HAVE_FUNC_GETHOSTBYNAME_R_5) && \
+    !defined(HAVE_FUNC_GETHOSTBYNAME_R_3)
+
 hostent *deepCopyHostent(hostent *h,
                          const hostent *he,
                          char *buffer,

src/msw/listctrl.cpp

@@ -3281,7 +3281,6 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
     // Find the coordinate of the right most visible point: this is not the
     // same as GetClientSize().x because the window might not be fully visible,
     // it could be clipped by its parent.
-    const wxSize size = GetSize();
     const int availableWidth = GetParent()->GetClientSize().x - GetPosition().x;
     int visibleWidth = wxMin(GetClientSize().x,
                              availableWidth - GetWindowBorderSize().x);

src/stc/gen_iface.py

@@ -1174,11 +1174,20 @@ def processIface(iface, h_tmplt, cpp_tmplt, ih_tmplt, h_dest, cpp_dest, docstr_d
     ih_text = ih_text % data
 
     # write out destination files
-    open(h_dest, 'w').write(h_text)
-    open(cpp_dest, 'w').write(cpp_text)
+    # Use 'wb' with Python 2 to enforce LF newlines. This does not work with
+    # Python 3, use 'newline':'\n' there (which in turn does not work with 2).
+    if sys.version_info[0] == 2:
+        acc = 'wb'
+        eol = {}
+    else:
+        acc = 'wt'
+        eol = {'newline':'\n'}
+
+    open(h_dest, acc, **eol).write(h_text)
+    open(cpp_dest, acc, **eol).write(cpp_text)
     if docstr_dest:
-        open(docstr_dest, 'w').write(docstrings)
-    open(ih_dest, 'w').write(ih_text)
+        open(docstr_dest, acc, **eol).write(docstrings)
+    open(ih_dest, acc, **eol).write(ih_text)
 
 
 def joinWithNewLines(values):

src/stc/scintilla/include/Scintilla.iface

@@ -331,7 +331,7 @@ set void MarkerSetBack=2042(int markerNumber, colour back)
 # Set the background colour used for a particular marker number when its folding block is selected.
 set void MarkerSetBackSelected=2292(int markerNumber, colour back)
 
-# Enable/disable highlight for current folding bloc (smallest one that contains the caret)
+# Enable/disable highlight for current folding block (smallest one that contains the caret)
 fun void MarkerEnableHighlight=2293(bool enabled,)
 
 # Add a marker to a line, returning an ID which can be used to find or delete the marker.

src/stc/stc.cpp

@@ -622,7 +622,7 @@ void wxStyledTextCtrl::MarkerSetBackgroundSelected(int markerNumber, const wxCol
     SendMsg(SCI_MARKERSETBACKSELECTED, markerNumber, wxColourAsLong(back));
 }
 
-// Enable/disable highlight for current folding bloc (smallest one that contains the caret)
+// Enable/disable highlight for current folding block (smallest one that contains the caret)
 void wxStyledTextCtrl::MarkerEnableHighlight(bool enabled)
 {
     SendMsg(SCI_MARKERENABLEHIGHLIGHT, enabled, 0);

src/stc/stc.interface.h.in

@@ -868,7 +868,7 @@ public:
     @section event_types Event Types
 
     The following is a brief description of when the control generates these
-    events and a list of which methods provide relevent information.  Additional
+    events and a list of which methods provide relevant information.  Additional
     details can be found in the Scintilla documentation
     (http://www.scintilla.org/ScintillaDoc.html#Notifications).