Uses wxUSE_WCHAR_T for compilers that don't support wchar_t.

[wxWidgets.git] / src / common / socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 3170622f400f39ef9fc4b62559ceffa9358f0b1d..8c576605c1a462c9b0c7588df02694cf451925b8 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -539,7 +539,7 @@ void wxSocketBase::Discard()
     #if wxHAVE_GLIBC2
         typedef socklen_t SOCKLEN_T;
     #else
     #if wxHAVE_GLIBC2
         typedef socklen_t SOCKLEN_T;
     #else

-        typedef int SOCKET_T;
+        typedef int SOCKLEN_T;

     #endif
 #endif // SOCKLEN_T
 
     #endif
 #endif // SOCKLEN_T
 


@@ -1606,7 +1606,7 @@ void wxMacSocketHandlerProc( void *refcon , short event )
 #endif
 #ifdef __WINDOWS__
 
 #endif
 #ifdef __WINDOWS__
 

-extern char wxPanelClassName[];
+extern wxChar wxPanelClassName[];

 
 LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message,
    WPARAM wParam, LPARAM lParam)
 
 LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message,
    WPARAM wParam, LPARAM lParam)


@@ -1645,7 +1645,7 @@ LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message,
     break;
 
   default:
     break;
 
   default:

-      wxFAIL_MSG("invalid socket event");
+      wxFAIL_MSG(_T("invalid socket event"));

       return (LRESULT)0;
   }
 
       return (LRESULT)0;
   }