Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxDIRCTRL_DEFAULT_STYLE for consistency with other classes.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2014-09-04 12:36:14 +00:00
parent 46a4234643
commit 34e87060c8
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/generic/dirctrlg.h
View File

@@ -45,7 +45,9 @@ enum
// Editable labels // Editable labels
wxDIRCTRL_EDIT_LABELS = 0x0100, wxDIRCTRL_EDIT_LABELS = 0x0100,
// Allow multiple selection // 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 wxString &dir = wxDirDialogDefaultFolderStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_3D_INTERNAL, long style = wxDIRCTRL_DEFAULT_STYLE,
const wxString& filter = wxEmptyString, const wxString& filter = wxEmptyString,
int defaultFilter = 0, int defaultFilter = 0,
const wxString& name = wxTreeCtrlNameStr ) const wxString& name = wxTreeCtrlNameStr )
@@ -95,7 +97,7 @@ public:
const wxString &dir = wxDirDialogDefaultFolderStr, const wxString &dir = wxDirDialogDefaultFolderStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_3D_INTERNAL, long style = wxDIRCTRL_DEFAULT_STYLE,
const wxString& filter = wxEmptyString, const wxString& filter = wxEmptyString,
int defaultFilter = 0, int defaultFilter = 0,
const wxString& name = wxTreeCtrlNameStr ); const wxString& name = wxTreeCtrlNameStr );

10
interface/wx/dirctrl.h
View File

@@ -18,7 +18,9 @@ enum
// Editable labels // Editable labels
wxDIRCTRL_EDIT_LABELS = 0x0100, wxDIRCTRL_EDIT_LABELS = 0x0100,
// Allow multiple selection // Allow multiple selection
wxDIRCTRL_MULTIPLE = 0x0200 wxDIRCTRL_MULTIPLE = 0x0200,
wxDIRCTRL_DEFAULT_STYLE = wxDIRCTRL_3D_INTERNAL
}; };
@@ -35,7 +37,7 @@ enum
@style{wxDIRCTRL_DIR_ONLY} @style{wxDIRCTRL_DIR_ONLY}
Only show directories, and not files. Only show directories, and not files.
@style{wxDIRCTRL_3D_INTERNAL} @style{wxDIRCTRL_3D_INTERNAL}
Use 3D borders for internal controls. Use 3D borders for internal controls. This is the default.
@style{wxDIRCTRL_SELECT_FIRST} @style{wxDIRCTRL_SELECT_FIRST}
When setting the default path, select the first file in the When setting the default path, select the first file in the
directory. directory.
@@ -100,7 +102,7 @@ public:
const wxString& dir = wxDirDialogDefaultFolderStr, const wxString& dir = wxDirDialogDefaultFolderStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_3D_INTERNAL, long style = wxDIRCTRL_DEFAULT_STYLE,
const wxString& filter = wxEmptyString, const wxString& filter = wxEmptyString,
int defaultFilter = 0, int defaultFilter = 0,
const wxString& name = wxTreeCtrlNameStr); const wxString& name = wxTreeCtrlNameStr);
@@ -128,7 +130,7 @@ public:
const wxString& dir = wxDirDialogDefaultFolderStr, const wxString& dir = wxDirDialogDefaultFolderStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDIRCTRL_3D_INTERNAL, long style = wxDIRCTRL_DEFAULT_STYLE,
const wxString& filter = wxEmptyString, int defaultFilter = 0, const wxString& filter = wxEmptyString, int defaultFilter = 0,
const wxString& name = wxTreeCtrlNameStr); const wxString& name = wxTreeCtrlNameStr);