set error to GSOCK_TIMEOUT if the socket timed out (modified and extended patch 1303554)

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

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 519176b336ca6a310567111baa1c08c4272a19cb..e483c687efd58791ba3e573617c19f72312aea39 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation
-#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"
 


@@ -61,7 +57,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
                                     (DLGPROC) wxDlgProc);
 
     if ( !m_hWnd )
                                     (DLGPROC) wxDlgProc);
 
     if ( !m_hWnd )

-        return FALSE;
+        return false;

 
     SubclassWin(GetHWND());
 
 
     SubclassWin(GetHWND());
 


@@ -84,7 +80,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
             CreateWindowFromHWND(this, (WXHWND) hWndNext);
     }
 
             CreateWindowFromHWND(this, (WXHWND) hWndNext);
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)
 }
 
 bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)


@@ -98,7 +94,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)
                                     (DLGPROC)wxDlgProc);
 
     if ( !m_hWnd )
                                     (DLGPROC)wxDlgProc);
 
     if ( !m_hWnd )

-        return FALSE;
+        return false;

 
     SubclassWin(GetHWND());
 
 
     SubclassWin(GetHWND());
 


@@ -121,7 +117,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)
             CreateWindowFromHWND(this, (WXHWND) hWndNext);
     }
 
             CreateWindowFromHWND(this, (WXHWND) hWndNext);
     }
 

-    return TRUE;
+    return true;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -305,7 +301,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
             wxLogError(wxT("Please make SS_BITMAP statics into owner-draw buttons."));
         }
 #endif
             wxLogError(wxT("Please make SS_BITMAP statics into owner-draw buttons."));
         }
 #endif

-#endif /* wxUSE_STATBMP */
+#endif /* wxUSE_STATBMP */

     }
 #endif
     else
     }
 #endif
     else