  						} else {
 diff -r 3f9b065c4401 src/Editor.h
 --- a/src/Editor.h	Wed Jul 11 12:43:34 2012 +1000
-+++ b/src/Editor.h	Fri Jul 20 11:14:24 2012 -0400
++++ b/src/Editor.h	Fri Jul 20 14:12:05 2012 -0400
 @@ -268,6 +268,9 @@
  
  	bool convertPastes;
  
-+	bool marginNumberPadding; // the right-side padding of the number margin
-+	bool ctrlCharPadding; // the padding around control character text blobs
++	int marginNumberPadding; // the right-side padding of the number margin
++	int ctrlCharPadding; // the padding around control character text blobs
 +
  	Document *pdoc;
  
  	Editor();
 diff -r 3f9b065c4401 src/ScintillaBase.cxx
 --- a/src/ScintillaBase.cxx	Wed Jul 11 12:43:34 2012 +1000
-+++ b/src/ScintillaBase.cxx	Fri Jul 20 11:14:24 2012 -0400
++++ b/src/ScintillaBase.cxx	Fri Jul 20 14:12:05 2012 -0400
 @@ -226,27 +226,25 @@
  	if (rcPopupBounds.Height() == 0)
  		rcPopupBounds = rcClient;

 
diff -r 3f9b065c4401 src/Editor.cxx
--- a/src/Editor.cxx	Wed Jul 11 12:43:34 2012 +1000
+++ b/src/Editor.cxx	Fri Jul 20 11:14:24 2012 -0400
@@ -217,6 +217,9 @@
 
 	convertPastes = true;

diff -r 3f9b065c4401 include/Platform.h
--- a/include/Platform.h	Wed Jul 11 12:43:34 2012 +1000
+++ b/include/Platform.h	Fri Jul 20 14:12:05 2012 -0400
@@ -22,6 +22,7 @@
 #define PLAT_WX  0
 #define PLAT_QT 0
