ActiveX events should be sent to the window, not it's parent.

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 3e3721f596195e36af07645a8e0b06833372593a..e56792a52de548ee510ab5aa077aa139fc0ee27b 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -107,12 +107,6 @@
 static const wxChar WX_SECTION[] = wxT("wxWindows");
 static const wxChar eUSERNAME[]  = wxT("UserName");
 
 static const wxChar WX_SECTION[] = wxT("wxWindows");
 static const wxChar eUSERNAME[]  = wxT("UserName");
 

-// these are only used under Win16
-#if !defined(__WIN32__) && !defined(__WXMICROWIN__)
-static const wxChar eHOSTNAME[]  = wxT("HostName");
-static const wxChar eUSERID[]    = wxT("UserId");
-#endif // !Win32
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -238,7 +232,7 @@ bool wxGetUserId(wxChar *buf, int maxSize)
 {
 #if defined(__WXWINCE__)
     return FALSE;
 {
 #if defined(__WXWINCE__)
     return FALSE;

-#elif defined(__WIN32__) && !defined(__win32s__) && !defined(__WXMICROWIN__)
+#elif defined(__WIN32__) && !defined(__WXMICROWIN__)

     DWORD nSize = maxSize;
     if ( ::GetUserName(buf, &nSize) == 0 )
     {
     DWORD nSize = maxSize;
     if ( ::GetUserName(buf, &nSize) == 0 )
     {


@@ -252,7 +246,7 @@ bool wxGetUserId(wxChar *buf, int maxSize)
     }
 
     return TRUE;
     }
 
     return TRUE;

-#else   // Win16 or Win32s
+#else   // __WXMICROWIN__

     wxChar *user;
     const wxChar *default_id = wxT("anonymous");
 
     wxChar *user;
     const wxChar *default_id = wxT("anonymous");
 


@@ -469,23 +463,7 @@ bool wxDirExists(const wxString& dir)
 #elif defined(__WIN32__)
     DWORD attribs = GetFileAttributes(dir);
     return ((attribs != (DWORD)-1) && (attribs & FILE_ATTRIBUTE_DIRECTORY));
 #elif defined(__WIN32__)
     DWORD attribs = GetFileAttributes(dir);
     return ((attribs != (DWORD)-1) && (attribs & FILE_ATTRIBUTE_DIRECTORY));

-#else // Win16
-    #ifdef __BORLANDC__
-        struct ffblk fileInfo;
-    #else
-        struct find_t fileInfo;
-    #endif
-    // In Borland findfirst has a different argument
-    // ordering from _dos_findfirst. But _dos_findfirst
-    // _should_ be ok in both MS and Borland... why not?
-    #ifdef __BORLANDC__
-        return (findfirst(dir, &fileInfo, _A_SUBDIR) == 0 &&
-               (fileInfo.ff_attrib & _A_SUBDIR) != 0);
-    #else
-        return (_dos_findfirst(dir, _A_SUBDIR, &fileInfo) == 0) &&
-               ((fileInfo.attrib & _A_SUBDIR) != 0);
-    #endif
-#endif // Win32/16
+#endif // Win32/__WXMICROWIN__

 }
 
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 }
 
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)


@@ -604,17 +582,6 @@ bool wxGetEnv(const wxString& var, wxString *value)
 {
 #ifdef __WXWINCE__
     return FALSE;
 {
 #ifdef __WXWINCE__
     return FALSE;

-#elif defined(__WIN16__)
-    const wxChar* ret = wxGetenv(var);
-    if ( !ret )
-        return FALSE;
-
-    if ( value )
-    {
-        *value = ret;
-    }
-
-    return TRUE;

 #else // Win32
     // first get the size of the buffer
     DWORD dwRet = ::GetEnvironmentVariable(var, NULL, 0);
 #else // Win32
     // first get the size of the buffer
     DWORD dwRet = ::GetEnvironmentVariable(var, NULL, 0);


@@ -631,7 +598,7 @@ bool wxGetEnv(const wxString& var, wxString *value)
     }
 
     return TRUE;
     }
 
     return TRUE;

-#endif // Win16/32
+#endif // WinCE/32

 }
 
 bool wxSetEnv(const wxString& var, const wxChar *value)
 }
 
 bool wxSetEnv(const wxString& var, const wxChar *value)


@@ -930,8 +897,6 @@ bool wxShutdown(wxShutdownFlags wFlags)
     }
 
     return bOK;
     }
 
     return bOK;

-#else // Win16
-    return FALSE;

 #endif // Win32/16
 }
 
 #endif // Win32/16
 }
 


@@ -954,11 +919,7 @@ long wxGetFreeMemory()
 
 unsigned long wxGetProcessId()
 {
 
 unsigned long wxGetProcessId()
 {

-#ifdef __WIN32__

     return ::GetCurrentProcessId();
     return ::GetCurrentProcessId();

-#else
-    return 0;
-#endif

 }
 
 // Emit a beeeeeep
 }
 
 // Emit a beeeeeep


@@ -969,7 +930,6 @@ void wxBell()
 
 wxString wxGetOsDescription()
 {
 
 wxString wxGetOsDescription()
 {

-#ifdef __WIN32__

     wxString str;
 
     OSVERSIONINFO info;
     wxString str;
 
     OSVERSIONINFO info;


@@ -1012,9 +972,6 @@ wxString wxGetOsDescription()
     }
 
     return str;
     }
 
     return str;

-#else // Win16
-    return _("Windows 3.1");
-#endif // Win32/16

 }
 
 wxToolkitInfo& wxAppTraits::GetToolkitInfo()
 }
 
 wxToolkitInfo& wxAppTraits::GetToolkitInfo()