X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/141d782d567f92933f6fe868fff5bace77e8ecd2..24aab8e81a8627802e4111d9c99a50ece8d0026e:/src/generic/dirdlgg.cpp diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp index 078123f983..5fb5435056 100644 --- a/src/generic/dirdlgg.cpp +++ b/src/generic/dirdlgg.cpp @@ -26,13 +26,13 @@ #include "wx/intl.h" #include "wx/log.h" #include "wx/msgdlg.h" + #include "wx/bmpbuttn.h" #endif #include "wx/statline.h" #include "wx/dirctrl.h" #include "wx/generic/dirdlgg.h" #include "wx/artprov.h" -#include "wx/bmpbuttn.h" // ---------------------------------------------------------------------------- // constants @@ -109,7 +109,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent, wxMenu *dirMenu = new wxMenu; dirMenu->Append(ID_GO_HOME, _("Home")); - if (style & wxDD_NEW_DIR_BUTTON) + if (!HasFlag(wxDD_DIR_MUST_EXIST)) { dirMenu->Append(ID_NEW, _("New directory")); } @@ -133,7 +133,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent, // I'm not convinced we need a New button, and we tend to get annoying // accidental-editing with label editing enabled. - if (style & wxDD_NEW_DIR_BUTTON) + if (!HasFlag(wxDD_DIR_MUST_EXIST)) { wxBitmapButton* newButton = new wxBitmapButton(this, ID_NEW, @@ -158,7 +158,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent, long dirStyle = wxDIRCTRL_DIR_ONLY | wxDEFAULT_CONTROL_BORDER; #ifdef __WXMSW__ - if (style & wxDD_NEW_DIR_BUTTON) + if (!HasFlag(wxDD_DIR_MUST_EXIST)) { // Only under Windows do we need the wxTR_EDIT_LABEL tree control style // before we can call EditLabel (required for "New directory")