don't duplicate SetInitialSocketBuffers()

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index b42c276494575624a2a6cce3337ba2b3fed0d071..c618fe3629e93d0fe2910f4581c81810be99c4d3 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -88,10 +88,10 @@ wxFileDialogHookFunction(HWND      hDlg,
     {
         case WM_NOTIFY:
             {
-                OFNOTIFY *pNotifyCode = wx_reinterpret_cast(OFNOTIFY *, lParam);
+                OFNOTIFY *pNotifyCode = reinterpret_cast<OFNOTIFY *>(lParam);
                 if ( pNotifyCode->hdr.code == CDN_INITDONE )
                 {
-                    wx_reinterpret_cast(wxFileDialog *,
+                    reinterpret_cast<wxFileDialog *>(
                                         pNotifyCode->lpOFN->lCustData)
                         ->MSWOnInitDone((WXHWND)hDlg);
                  }
@@ -331,7 +331,13 @@ static bool ShowCommFileDialog(OPENFILENAME *of, long style)
     }
 #endif // wxTRY_SMALLER_OPENFILENAME
 
-    if ( !success && errCode == FNERR_INVALIDFILENAME && of->lpstrFile[0] )
+    if ( !success &&
+            // FNERR_INVALIDFILENAME is not defined under CE (besides we don't
+            // use CommDlgExtendedError() there anyhow)
+#ifndef __WXWINCE__
+            errCode == FNERR_INVALIDFILENAME &&
+#endif // !__WXWINCE__
+                of->lpstrFile[0] )
     {
         // this can happen if the default file name is invalid, try without it
         // now