wxSpinButton::GetValue() returns correct result now

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

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 80b5e4dbb4e11359bc1d6f0463c0473bef3cee12..4be95f9efe7c7f9fba64c757cdd2694de8d1ab30 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -66,7 +66,7 @@ int wxDirDialog::ShowModal(void)
   if (m_parent) hWnd = (HWND) m_parent->GetHWND();
 
     BROWSEINFO bi;
   if (m_parent) hWnd = (HWND) m_parent->GetHWND();
 
     BROWSEINFO bi;

-    LPSTR lpBuffer; 
+    LPTSTR lpBuffer;

 //    LPITEMIDLIST pidlPrograms;  // PIDL for Programs folder 
     LPITEMIDLIST pidlBrowse;    // PIDL selected by user 
     LPMALLOC pMalloc = NULL;
 //    LPITEMIDLIST pidlPrograms;  // PIDL for Programs folder 
     LPITEMIDLIST pidlBrowse;    // PIDL selected by user 
     LPMALLOC pMalloc = NULL;


@@ -77,7 +77,7 @@ int wxDirDialog::ShowModal(void)
       return wxID_CANCEL;
     
     // Allocate a buffer to receive browse information. 
       return wxID_CANCEL;
     
     // Allocate a buffer to receive browse information. 

-    if ((lpBuffer = (LPSTR) pMalloc->Alloc(MAX_PATH)) == NULL) 
+    if ((lpBuffer = (LPTSTR) pMalloc->Alloc(MAX_PATH)) == NULL) 

     {
         pMalloc->Release();
         return wxID_CANCEL;
     {
         pMalloc->Release();
         return wxID_CANCEL;


@@ -94,11 +94,10 @@ int wxDirDialog::ShowModal(void)
 */
  
     // Fill in the BROWSEINFO structure. 
 */
  
     // Fill in the BROWSEINFO structure. 

-    wxWX2MBbuf message = m_message.mb_str();

     bi.hwndOwner = hWnd;
     bi.pidlRoot = NULL; // pidlPrograms; 
     bi.pszDisplayName = lpBuffer; 
     bi.hwndOwner = hWnd;
     bi.pidlRoot = NULL; // pidlPrograms; 
     bi.pszDisplayName = lpBuffer; 

-    bi.lpszTitle = (const char*)message; // BC++ 4.52 says LPSTR, not LPTSTR?
+    bi.lpszTitle = m_message; // BC++ 4.52 says LPSTR, not LPTSTR?

     bi.ulFlags = 0; 
     bi.lpfn = NULL; 
     bi.lParam = 0; 
     bi.ulFlags = 0; 
     bi.lpfn = NULL; 
     bi.lParam = 0;