don't generate duplicate event for numpad keys with numlock on (patch 1448853)

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

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 0bb55362d5586f8a68f9f5f8c754182a625aadbe..018f4e13239fdc33c8e9c4037c604a9ae68cb35c 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dirdlg.cpp
+// Name:        src/msw/dirdlg.cpp

 // Purpose:     wxDirDialog
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxDirDialog
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dirdlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,9 +24,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_DIRDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+#if wxUSE_DIRDLG

 
 

-#if defined(__WIN95__) && !defined(__GNUWIN32_OLD__) && wxUSE_OLE
+#if wxUSE_OLE && !defined(__GNUWIN32_OLD__) && (!defined(__WXWINCE__) || \
+    (defined(__HANDHELDPC__) && (_WIN32_WCE >= 500)))

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"


@@ -93,7 +90,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
     m_message = message;
     m_parent = parent;
 
     m_message = message;
     m_parent = parent;
 

-    SetStyle(style);
+    SetWindowStyle(style);

     SetPath(defaultPath);
 }
 
     SetPath(defaultPath);
 }
 


@@ -185,6 +182,10 @@ int wxDirDialog::ShowModal()
 
     m_path = pidl.GetPath();
 
 
     m_path = pidl.GetPath();
 

+    // change current working directory if asked so
+    if (HasFlag(wxDD_CHANGE_DIR))
+        wxSetWorkingDirectory(m_path);
+

     return m_path.empty() ? wxID_CANCEL : wxID_OK;
 }
 
     return m_path.empty() ? wxID_CANCEL : wxID_OK;
 }
 


@@ -244,9 +245,7 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
     return 0;
 }
 
     return 0;
 }
 

-
-#else
-    #include "../generic/dirdlgg.cpp"

 #endif // compiler/platform on which the code here compiles
 
 #endif // compiler/platform on which the code here compiles
 

-#endif // wxUSE_DIRDLG && !(__SMARTPHONE__ && __WXWINCE__)
+#endif // wxUSE_DIRDLG
+