From 34e87060c81b1a9e4fea242b6294b6e11ec89177 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 4 Sep 2014 12:36:14 +0000
Subject: [PATCH] Add wxDIRCTRL_DEFAULT_STYLE for consistency with other
 classes.

This is, by definition, the style used as default value for the style argument
of wxDirCtrl::Create().

Closes #16525.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/generic/dirctrlg.h |  8 +++++---
 interface/wx/dirctrl.h        | 10 ++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/wx/generic/dirctrlg.h b/include/wx/generic/dirctrlg.h
index b165a11c75..a36dcc2b48 100644
--- a/include/wx/generic/dirctrlg.h
+++ b/include/wx/generic/dirctrlg.h
@@ -45,7 +45,9 @@ enum
     // Editable labels
     wxDIRCTRL_EDIT_LABELS    = 0x0100,
     // Allow multiple selection
-    wxDIRCTRL_MULTIPLE       = 0x0200
+    wxDIRCTRL_MULTIPLE       = 0x0200,
+
+    wxDIRCTRL_DEFAULT_STYLE  = wxDIRCTRL_3D_INTERNAL
 };
 
 //-----------------------------------------------------------------------------
@@ -82,7 +84,7 @@ public:
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
-              long style = wxDIRCTRL_3D_INTERNAL,
+              long style = wxDIRCTRL_DEFAULT_STYLE,
               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr )
@@ -95,7 +97,7 @@ public:
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
-              long style = wxDIRCTRL_3D_INTERNAL,
+              long style = wxDIRCTRL_DEFAULT_STYLE,
               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr );
diff --git a/interface/wx/dirctrl.h b/interface/wx/dirctrl.h
index 6e087d1db5..71ca5bb183 100644
--- a/interface/wx/dirctrl.h
+++ b/interface/wx/dirctrl.h
@@ -18,7 +18,9 @@ enum
     // Editable labels
     wxDIRCTRL_EDIT_LABELS    = 0x0100,
     // Allow multiple selection
-    wxDIRCTRL_MULTIPLE       = 0x0200
+    wxDIRCTRL_MULTIPLE       = 0x0200,
+
+    wxDIRCTRL_DEFAULT_STYLE  = wxDIRCTRL_3D_INTERNAL
 };
 
 
@@ -35,7 +37,7 @@ enum
     @style{wxDIRCTRL_DIR_ONLY}
            Only show directories, and not files.
     @style{wxDIRCTRL_3D_INTERNAL}
-           Use 3D borders for internal controls.
+           Use 3D borders for internal controls. This is the default.
     @style{wxDIRCTRL_SELECT_FIRST}
            When setting the default path, select the first file in the
            directory.
@@ -100,7 +102,7 @@ public:
                      const wxString& dir = wxDirDialogDefaultFolderStr,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
-                     long style = wxDIRCTRL_3D_INTERNAL,
+                     long style = wxDIRCTRL_DEFAULT_STYLE,
                      const wxString& filter = wxEmptyString,
                      int defaultFilter = 0,
                      const wxString& name = wxTreeCtrlNameStr);
@@ -128,7 +130,7 @@ public:
                 const wxString& dir = wxDirDialogDefaultFolderStr,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxDIRCTRL_3D_INTERNAL,
+                long style = wxDIRCTRL_DEFAULT_STYLE,
                 const wxString& filter = wxEmptyString, int defaultFilter = 0,
                 const wxString& name = wxTreeCtrlNameStr);