unicode fixes

[wxWidgets.git] / src / msw / dirdlg.cpp

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index ceca8d1fe91582f87214bc8d9501af5b4518d5ed..e168dad0a19e96f0f2d886e703025be1db88863e 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dirdlg.h"
 #endif
 
     #pragma implementation "dirdlg.h"
 #endif
 


@@ -42,6 +42,11 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

+#ifdef __WXWINCE__
+#include <winreg.h>
+#include <objbase.h>
+#include <shlguid.h>
+#endif

 #include <shlobj.h> // Win95 shell
 
 // ----------------------------------------------------------------------------
 #include <shlobj.h> // Win95 shell
 
 // ----------------------------------------------------------------------------


@@ -60,6 +65,10 @@
     #define BIF_NONEWFOLDERBUTTON  0x0200
 #endif
 
     #define BIF_NONEWFOLDERBUTTON  0x0200
 #endif
 

+#ifndef BIF_EDITBOX
+    #define BIF_EDITBOX 16
+#endif
+

 // ----------------------------------------------------------------------------
 // wxWindows macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWindows macros
 // ----------------------------------------------------------------------------


@@ -131,7 +140,11 @@ int wxDirDialog::ShowModal()
     bi.hwndOwner      = parent ? GetHwndOf(parent) : NULL;
     bi.pidlRoot       = NULL;
     bi.pszDisplayName = NULL;
     bi.hwndOwner      = parent ? GetHwndOf(parent) : NULL;
     bi.pidlRoot       = NULL;
     bi.pszDisplayName = NULL;

+#ifdef __WXWINCE__
+    bi.lpszTitle      = m_message.mb_str();
+#else

     bi.lpszTitle      = m_message.c_str();
     bi.lpszTitle      = m_message.c_str();

+#endif

     bi.ulFlags        = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT;
     bi.lpfn           = BrowseCallbackProc;
     bi.lParam         = (LPARAM)m_path.c_str();    // param for the callback
     bi.ulFlags        = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT;
     bi.lpfn           = BrowseCallbackProc;
     bi.lParam         = (LPARAM)m_path.c_str();    // param for the callback


@@ -213,7 +226,9 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
             // initial selection here
             //
             // wParam = TRUE => lParam is a string and not a PIDL
             // initial selection here
             //
             // 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;
 
         case BFFM_SELCHANGED:
             break;
 
         case BFFM_SELCHANGED: