updates from Adrián González Alba

[wxWidgets.git] / src / generic / dirdlgg.cpp

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 078123f9833df03e05ffc6568c00df325c53492e..5fb5435056f0b36e9e1a2527a5d349a324efef11 100644 (file)
--- 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/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"
 #endif
 
 #include "wx/statline.h"
 #include "wx/dirctrl.h"
 #include "wx/generic/dirdlgg.h"
 #include "wx/artprov.h"

-#include "wx/bmpbuttn.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -109,7 +109,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent,
     wxMenu *dirMenu = new wxMenu;
     dirMenu->Append(ID_GO_HOME, _("Home"));
 
     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"));
     }
     {
         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.
 
     // 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,
     {
         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__
     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")
     {
         // Only under Windows do we need the wxTR_EDIT_LABEL tree control style
         // before we can call EditLabel (required for "New directory")