Changed name to wxFIXED_MINSIZE since that is more descriptive of what

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

diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c
index 96b237f1043e5e8b6bf33413c3cc50615225ee52..246ae71c82b3f0066a621dc1156e160734f0ce8d 100644 (file)
--- a/src/msw/gsockmsw.c
+++ b/src/msw/gsockmsw.c
@@ -36,8 +36,8 @@
 #endif
 
 #ifndef __GSOCKET_STANDALONE__
 #endif
 
 #ifndef __GSOCKET_STANDALONE__

-#include "wx/defs.h"
-#include "wx/setup.h"
+#   include "wx/platform.h"
+#   include "wx/setup.h"

 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)


@@ -86,7 +86,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 HWND
+extern 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.


@@ -99,6 +99,7 @@ wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
 #error "MAXSOCKETS is too big!"
 #endif
 
 #error "MAXSOCKETS is too big!"
 #endif
 

+typedef int (PASCAL *WSAAsyncSelectFunc)(SOCKET,HWND,u_int,long);

 
 /* Global variables */
 
 
 /* Global variables */
 


@@ -107,12 +108,14 @@ static HWND hWin;
 static CRITICAL_SECTION critical;
 static GSocket* socketList[MAXSOCKETS];
 static int firstAvailable;
 static CRITICAL_SECTION critical;
 static GSocket* socketList[MAXSOCKETS];
 static int firstAvailable;

+static WSAAsyncSelectFunc gs_WSAAsyncSelect = NULL;
+static HMODULE gs_wsock32dll = 0;

 
 /* Global initializers */
 
 int _GSocket_GUI_Init(void)
 {
 
 /* Global initializers */
 
 int _GSocket_GUI_Init(void)
 {

-  LPCTSTR pclassname;
+  static LPCTSTR pclassname = NULL;

   int i;
 
   /* Create internal window for event notifications */
   int i;
 
   /* Create internal window for event notifications */


@@ -129,6 +132,17 @@ int _GSocket_GUI_Init(void)
   }
   firstAvailable = 0;
 
   }
   firstAvailable = 0;
 

+  /* Load WSAAsyncSelect from wsock32.dll (we don't link against it
+     statically to avoid dependency on wsock32.dll for apps that don't use
+     sockets): */
+  gs_wsock32dll = LoadLibraryA("wsock32.dll");
+  if (!gs_wsock32dll)
+      return FALSE;
+  gs_WSAAsyncSelect =(WSAAsyncSelectFunc)GetProcAddress(gs_wsock32dll,
+                                                        "WSAAsyncSelect");
+  if (!gs_WSAAsyncSelect)
+      return FALSE;
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -138,6 +152,13 @@ void _GSocket_GUI_Cleanup(void)
   DestroyWindow(hWin);
   UnregisterClass(CLASSNAME, INSTANCE);
 
   DestroyWindow(hWin);
   UnregisterClass(CLASSNAME, INSTANCE);
 

+  /* Unlock wsock32.dll */
+  if (gs_wsock32dll)
+  {
+      FreeLibrary(gs_wsock32dll);
+      gs_wsock32dll = 0;
+  }
+

   /* Delete critical section */
   DeleteCriticalSection(&critical);
 }
   /* Delete critical section */
   DeleteCriticalSection(&critical);
 }


@@ -267,7 +288,7 @@ void _GSocket_Enable_Events(GSocket *socket)
     long lEvent = socket->m_server?
                   FD_ACCEPT : (FD_READ | FD_WRITE | FD_CONNECT | FD_CLOSE);
 
     long lEvent = socket->m_server?
                   FD_ACCEPT : (FD_READ | FD_WRITE | FD_CONNECT | FD_CLOSE);
 

-    WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, lEvent);
+    gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, lEvent);

   }
 }
 
   }
 }
 


@@ -280,7 +301,7 @@ void _GSocket_Disable_Events(GSocket *socket)
 
   if (socket->m_fd != INVALID_SOCKET)
   {
 
   if (socket->m_fd != INVALID_SOCKET)
   {

-    WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, 0);
+    gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, 0);

   }
 }
 
   }
 }