fixed the just added wxStringTokenizer::GetPosition() test overwritten by the previou...

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

diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp
index 8e75239ea5f2d22a5e62c981e1701b34b37920cf..937b39039bca1af27f3c23a08c54e39ed8dd2c8a 100644 (file)
--- a/src/msw/gsockmsw.cpp
+++ b/src/msw/gsockmsw.cpp
@@ -1,12 +1,19 @@
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket)
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket)

- * Name:    gsockmsw.c
+ * Name:    gsockmsw.cpp

  * Author:  Guillermo Rodriguez Garcia <guille@iies.es>
  * Purpose: GSocket GUI-specific MSW code
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
 
  * Author:  Guillermo Rodriguez Garcia <guille@iies.es>
  * Purpose: GSocket GUI-specific MSW code
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 /*
  * TODO: for WinCE we need to replace WSAAsyncSelect
  * (Windows message-based notification of network events for a socket)
 /*
  * TODO: for WinCE we need to replace WSAAsyncSelect
  * (Windows message-based notification of network events for a socket)


@@ -15,10 +22,6 @@
  * using select() and sends a message to the main thread.
  */
 
  * using select() and sends a message to the main thread.
  */
 

-/*
- * PLEASE don't put C++ comments here - this is a C source file.
- */
-

 /* including rasasync.h (included from windows.h itself included from
  * wx/setup.h and/or winsock.h results in this warning for
  * RPCNOTIFICATION_ROUTINE
 /* including rasasync.h (included from windows.h itself included from
  * wx/setup.h and/or winsock.h results in this warning for
  * RPCNOTIFICATION_ROUTINE


@@ -55,7 +58,7 @@
 #include "wx/msw/gsockmsw.h"
 #include "wx/gsocket.h"
 
 #include "wx/msw/gsockmsw.h"
 #include "wx/gsocket.h"
 

-HINSTANCE wxGetInstance(void);
+extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);

 #define INSTANCE wxGetInstance()
 
 #else
 #define INSTANCE wxGetInstance()
 
 #else


@@ -94,7 +97,7 @@ HINSTANCE wxGetInstance(void);
 #define CLASSNAME  TEXT("_GSocket_Internal_Window_Class")
 
 /* implemented in utils.cpp */
 #define CLASSNAME  TEXT("_GSocket_Internal_Window_Class")
 
 /* implemented in utils.cpp */

-extern WXDLLIMPEXP_BASE HWND
+extern "C" WXDLLIMPEXP_BASE HWND

 wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
 
 /* Maximum number of different GSocket objects at a given time.
 wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
 
 /* Maximum number of different GSocket objects at a given time.


@@ -109,6 +112,8 @@ wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
 
 typedef int (PASCAL *WSAAsyncSelectFunc)(SOCKET,HWND,u_int,long);
 
 
 typedef int (PASCAL *WSAAsyncSelectFunc)(SOCKET,HWND,u_int,long);
 

+LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
+

 /* Global variables */
 
 extern HINSTANCE INSTANCE;
 /* Global variables */
 
 extern HINSTANCE INSTANCE;


@@ -119,9 +124,12 @@ static int firstAvailable;
 static WSAAsyncSelectFunc gs_WSAAsyncSelect = NULL;
 static HMODULE gs_wsock32dll = 0;
 
 static WSAAsyncSelectFunc gs_WSAAsyncSelect = NULL;
 static HMODULE gs_wsock32dll = 0;
 

+bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
+{   return true; }
+

 /* Global initializers */
 
 /* Global initializers */
 

-int _GSocket_GUI_Init(void)
+bool GSocketGUIFunctionsTableConcrete::OnInit()

 {
   static LPCTSTR pclassname = NULL;
   int i;
 {
   static LPCTSTR pclassname = NULL;
   int i;


@@ -129,7 +137,7 @@ int _GSocket_GUI_Init(void)
   /* Create internal window for event notifications */
   hWin = wxCreateHiddenWindow(&pclassname, CLASSNAME, _GSocket_Internal_WinProc);
   if (!hWin)
   /* Create internal window for event notifications */
   hWin = wxCreateHiddenWindow(&pclassname, CLASSNAME, _GSocket_Internal_WinProc);
   if (!hWin)

-      return FALSE;
+      return false;

 
   /* Initialize socket list */
   InitializeCriticalSection(&critical);
 
   /* Initialize socket list */
   InitializeCriticalSection(&critical);


@@ -145,16 +153,16 @@ int _GSocket_GUI_Init(void)
      sockets): */
   gs_wsock32dll = LoadLibraryA("wsock32.dll");
   if (!gs_wsock32dll)
      sockets): */
   gs_wsock32dll = LoadLibraryA("wsock32.dll");
   if (!gs_wsock32dll)

-      return FALSE;
+      return false;

   gs_WSAAsyncSelect =(WSAAsyncSelectFunc)GetProcAddress(gs_wsock32dll,
                                                         "WSAAsyncSelect");
   if (!gs_WSAAsyncSelect)
   gs_WSAAsyncSelect =(WSAAsyncSelectFunc)GetProcAddress(gs_wsock32dll,
                                                         "WSAAsyncSelect");
   if (!gs_WSAAsyncSelect)

-      return FALSE;
+      return false;

 
 

-  return TRUE;
+  return true;

 }
 
 }
 

-void _GSocket_GUI_Cleanup(void)
+void GSocketGUIFunctionsTableConcrete::OnExit()

 {
   /* Destroy internal window */
   DestroyWindow(hWin);
 {
   /* Destroy internal window */
   DestroyWindow(hWin);


@@ -173,7 +181,7 @@ void _GSocket_GUI_Cleanup(void)
 
 /* Per-socket GUI initialization / cleanup */
 
 
 /* Per-socket GUI initialization / cleanup */
 

-int _GSocket_GUI_Init_Socket(GSocket *socket)
+bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)

 {
   int i;
 
 {
   int i;
 


@@ -188,7 +196,7 @@ int _GSocket_GUI_Init_Socket(GSocket *socket)
     if (i == firstAvailable)    /* abort! */
     {
       LeaveCriticalSection(&critical);
     if (i == firstAvailable)    /* abort! */
     {
       LeaveCriticalSection(&critical);

-      return FALSE;
+      return false;

     }
   }
   socketList[i] = socket;
     }
   }
   socketList[i] = socket;


@@ -197,10 +205,10 @@ int _GSocket_GUI_Init_Socket(GSocket *socket)
 
   LeaveCriticalSection(&critical);
 
 
   LeaveCriticalSection(&critical);
 

-  return TRUE;
+  return true;

 }
 
 }
 

-void _GSocket_GUI_Destroy_Socket(GSocket *socket)
+void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket)

 {
   /* Remove the socket from the list */
   EnterCriticalSection(&critical);
 {
   /* Remove the socket from the list */
   EnterCriticalSection(&critical);


@@ -284,7 +292,7 @@ LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd,
  *  events for internal processing, but we will only notify users
  *  when an appropiate callback function has been installed.
  */
  *  events for internal processing, but we will only notify users
  *  when an appropiate callback function has been installed.
  */

-void _GSocket_Enable_Events(GSocket *socket)
+void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)

 {
   assert (socket != NULL);
 
 {
   assert (socket != NULL);
 


@@ -303,7 +311,7 @@ void _GSocket_Enable_Events(GSocket *socket)
 /* _GSocket_Disable_Events:
  *  Disable event notifications (when shutdowning the socket)
  */
 /* _GSocket_Disable_Events:
  *  Disable event notifications (when shutdowning the socket)
  */

-void _GSocket_Disable_Events(GSocket *socket)
+void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket)

 {
   assert (socket != NULL);
 
 {
   assert (socket != NULL);