X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..18a82b9cd35b9c91ff381b6b34922788a8d9b897:/src/msw/dirdlg.cpp

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index e168dad0a1..d334ee245e 100644
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_DIRDLG
+#if wxUSE_DIRDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE
 
@@ -70,7 +70,7 @@
 #endif
 
 // ----------------------------------------------------------------------------
-// wxWindows macros
+// wxWidgets macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
@@ -140,7 +140,9 @@ int wxDirDialog::ShowModal()
     bi.hwndOwner      = parent ? GetHwndOf(parent) : NULL;
     bi.pidlRoot       = NULL;
     bi.pszDisplayName = NULL;
-#ifdef __WXWINCE__
+    // Please don't change this without checking it compiles
+    // with eVC++ first.
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
     bi.lpszTitle      = m_message.mb_str();
 #else
     bi.lpszTitle      = m_message.c_str();
@@ -158,10 +160,6 @@ int wxDirDialog::ShowModal()
         bi.ulFlags |= BIF_EDITBOX;
     }
 
-    // normally the commented out part should work -- but in practice
-    // BIF_NONEWFOLDERBUTTON doesn't have any effect (Win2k, comctl 5.81) so I
-    // have to disable it [for now]
-#if 0
     // to have the "New Folder" button we must use the "new" dialog style which
     // is also the only way to have a resizable dialog
     //
@@ -169,20 +167,23 @@ int wxDirDialog::ShowModal()
     const bool needNewDir = HasFlag(wxDD_NEW_DIR_BUTTON);
     if ( (needNewDir || HasFlag(wxRESIZE_BORDER)) && (verComCtl32 >= 500) )
     {
-        bi.ulFlags |= BIF_NEWDIALOGSTYLE;
-
-        // we'll get the "New Folder" button by default now, don't show it if
-        // not needed
-        if ( !needNewDir )
-            bi.ulFlags |= BIF_NONEWFOLDERBUTTON;
-    }
-#else
-    if ( HasFlag(wxDD_NEW_DIR_BUTTON) && verComCtl32 >= 500 )
-    {
-        // use the new style to make the "New Folder" button appear
-        bi.ulFlags |= BIF_NEWDIALOGSTYLE;
+        if (needNewDir)
+        {
+            bi.ulFlags |= BIF_NEWDIALOGSTYLE;
+        }
+        else
+        {
+            // Versions < 600 doesn't support BIF_NONEWFOLDERBUTTON
+            // The only way to get rid of the Make New Folder button is use
+            // the old dialog style which doesn't have the button thus we
+            // simply don't set the New Dialog Style for such comctl versions.
+            if (verComCtl32 >= 600)
+            {
+                bi.ulFlags |= BIF_NEWDIALOGSTYLE;
+                bi.ulFlags |= BIF_NONEWFOLDERBUTTON;
+            }
+        }
     }
-#endif
 
     // do show the dialog
     LPITEMIDLIST pidl = SHBrowseForFolder(&bi);
@@ -227,7 +228,7 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
             //
             // wParam = TRUE => lParam is a string and not a PIDL
 #ifndef __WXWINCE__
-            SendMessage(hwnd, BFFM_SETSELECTION, TRUE, pData);
+            ::SendMessage(hwnd, BFFM_SETSELECTION, TRUE, pData);
 #endif
             break;
 
@@ -290,4 +291,4 @@ static void ItemListFree(LPITEMIDLIST pidl)
     #include "../generic/dirdlgg.cpp"
 #endif // compiler/platform on which the code here compiles
 
-#endif // wxUSE_DIRDLG
+#endif // wxUSE_DIRDLG && !(__SMARTPHONE__ && __WXWINCE__)