From 7c32ef2ba3bc53339df1d8e6aa637dcc6b6a1081 Mon Sep 17 00:00:00 2001
From: John Roberts <johnr@iinet.net.au>
Date: Fri, 4 Mar 2016 14:56:17 +0100
Subject: [PATCH] Remove extra borders around wxFilePickerCtrl in wxOSX

Don't use extra borders to reserve space for the focus ring, this breaks
alignment of wxFilePickerCtrl with the other controls.

Closes #17416.
---
 docs/changes.txt        |  1 +
 include/wx/pickerbase.h | 17 ++---------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index b90c896d10..0820cb4d17 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -66,6 +66,7 @@ wxMSW:
 
 wxOSX:
 
+- Remove extra borders around wxFilePickerCtrl (John Roberts).
 - Turn off automatic quotes substitutions in wxTextCtrl (Xlord2).
 
 
diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index 6c1f1cb0d0..f4ec165784 100644
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -152,25 +152,12 @@ protected:
 
     int GetDefaultPickerCtrlFlag() const
     {
-        // on macintosh, without additional borders
-        // there's not enough space for focus rect
-        return wxALIGN_CENTER_VERTICAL
-#ifdef __WXMAC__
-            | wxTOP | wxRIGHT | wxBOTTOM
-#endif
-            ;
+        return wxALIGN_CENTER_VERTICAL;
     }
 
     int GetDefaultTextCtrlFlag() const
     {
-        // on macintosh, without wxALL there's not enough space for focus rect
-        return wxALIGN_CENTER_VERTICAL
-#ifdef __WXMAC__
-            | wxALL
-#else
-            | wxRIGHT
-#endif
-            ;
+        return wxALIGN_CENTER_VERTICAL | wxRIGHT;
     }
 
     void PostCreation();