[Dotgnu-pnet-commits] CVS: pnetlib/compat Accessibility.cs,NONE,1.1 Makefile.am,1.2,1.3 compat.build,1.5,1.6

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/compat
In directory subversions:/tmp/cvs-serv16250/compat

Modified Files:
        Makefile.am compat.build 
Added Files:
        Accessibility.cs 
Log Message:


Implement the minor "Accessibility" assembly, for compatibility.


--- NEW FILE ---
/*
 * Accessibility.cs - Definitions for the "Accessibility" assembly.
 *
 * Copyright (C) 2003  Southern Storm Software, Pty Ltd.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

// Don't use this.  It is a really ugly COM interop assembly under Windows,
// and is provided for strict 100% compatibility only.

namespace Accessibility
{

#if !ECMA_COMPAT

using System;
using System.Runtime.InteropServices;
using System.Runtime.CompilerServices;

[Guid("618736E0-3C3D-11CF-810C-00AA00389B71")]
[TypeLibType(0x1050)]
public interface IAccessible
{
        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC66))]
        [MethodImpl(MethodImplOptions.InternalCall)]
        void accDoDefaultAction
                        ([In] [MarshalAs(UnmanagedType.Struct)] out Object 
varChild);

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC67))]
        [MethodImpl(MethodImplOptions.InternalCall)]
        [return: MarshalAs(UnmanagedType.Struct)]
        Object accHitTest([In] int xLeft, [In] int yTop);

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC69))]
        [MethodImpl(MethodImplOptions.InternalCall)]
        void accLocation
                        (out int pxLeft, out int pyTop,
                         out int pcxWidth, out int pcyHeight,
                         [In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                Object varChild);

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC68))]
        [MethodImpl(MethodImplOptions.InternalCall)]
        [return: MarshalAs(UnmanagedType.Struct)]
        Object accNavigate
                        ([In] int navDir,
                         [In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                Object varStart);

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC6A))]
        [MethodImpl(MethodImplOptions.InternalCall)]
        void accSelect
                        ([In] int flagsSelect,
                         [In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                Object varChild);

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC76))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.IDispatch)]
        [IndexerName("accChild")]
        Object this[[In] [MarshalAs(UnmanagedType.Struct)] Object varChild]
                        {
                                get;
                        }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC77))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        int accChildCount { get; }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC6B))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.BStr)]
        [IndexerName("accDefaultAction")]
        String this[[In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                        Object varChild]
                        {
                                get;
                        }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC73))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.BStr)]
        [IndexerName("accDescription")]
        String this[[In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                        Object varChild]
                        {
                                get;
                        }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC77))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.Struct)]
        Object accFocus { get; }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC70))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.BStr)]
        [IndexerName("accHelp")]
        String this[[In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                        Object varChild]
                        {
                                get;
                        }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC6F))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        [IndexerName("accHelpTopic")]
        int this[[MarshalAs(UnmanagedType.BStr)] out String pszHelp,
                         [In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                        Object varChild]
                        {
                                get;
                        }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC6E))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.BStr)]
        [IndexerName("accKeyboardShortcut")]
        String this[[In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                        Object varChild]
                        {
                                get;
                        }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC75))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.BStr)]
        [IndexerName("accName")]
        String this[[In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                        Object varChild]
                        {
                                get; set;
                        }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC78))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.IDispatch)]
        Object accParent { get; }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC72))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.Struct)]
        [IndexerName("accRole")]
        Object this[[In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                        Object varChild]
                        {
                                get; set;
                        }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC6C))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.Struct)]
        Object accSelection { get; }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC71))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.Struct)]
        [IndexerName("accState")]
        Object this[[In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                        Object varChild]
                        {
                                get; set;
                        }

        [TypeLibFunc(0x0040)]
        [DispId(unchecked((int)0xFFFFEC74))]
        //[MethodImpl(MethodImplOptions.InternalCall)]
        //[return: MarshalAs(UnmanagedType.BStr)]
        [IndexerName("accValue")]
        String this[[In] [Optional] [MarshalAs(UnmanagedType.Struct)]
                                        Object varChild]
                        {
                                get; set;
                        }

}; // interface IAccessible

[Guid("03022430-ABC4-11D0-BDE2-00AA001A1953")]
[InterfaceType(1)]
[TypeLibType(1)]
public interface IAccessibleHandler
{
        [MethodImpl(MethodImplOptions.InternalCall)]
        void AccessibleObjectFromID
                        ([In] int hwnd, [In] int lObjectID,
                         [MarshalAs(UnmanagedType.Interface)]
                                out IAccessible pIAccessible);

}; // interface IAccessibleHandler

#else // ECMA_COMPAT

// The same as above, but without the horrible COM marker attributes.

using System;
using System.Runtime.CompilerServices;

public interface IAccessible
{
        void accDoDefaultAction(out Object varChild);
        Object accHitTest(int xLeft, int yTop);
        void accLocation
                        (out int pxLeft, out int pyTop,
                         out int pcxWidth, out int pcyHeight,
                         Object varChild);
        Object accNavigate(int navDir, Object varStart);
        void accSelect(int flagsSelect, Object varChild);

        [IndexerName("accChild")]
        Object this[Object varChild] { get; }

        int accChildCount { get; }
        Object accFocus { get; }
        Object accParent { get; }
        Object accSelection { get; }

        [IndexerName("accDefaultAction")]
        String this[Object varChild] { get; }

        [IndexerName("accDescription")]
        String this[Object varChild] { get; }

        [IndexerName("accHelp")]
        String this[Object varChild] { get; }

        [IndexerName("accHelpTopic")]
        int this[out String pszHelp, Object varChild] { get; }

        [IndexerName("accKeyboardShortcut")]
        String this[Object varChild] { get; }

        [IndexerName("accName")]
        String this[Object varChild] { get; set; }

        [IndexerName("accRole")]
        Object this[Object varChild] { get; set; }

        [IndexerName("accState")]
        Object this[Object varChild] { get; set; }

        [IndexerName("accValue")]
        String this[Object varChild] { get; set; }

}; // interface IAccessible

public interface IAccessibleHandler
{
        void AccessibleObjectFromID(int hwnd, int lObjectID,
                                                                out IAccessible 
pIAccessible);

}; // interface IAccessibleHandler

#endif // ECMA_COMPAT

} // namespace Accessibility

Index: Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/compat/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am 30 Dec 2002 01:06:23 -0000      1.2
--- Makefile.am 24 May 2003 09:54:05 -0000      1.3
***************
*** 7,11 ****
        "$(CSANT)" $(CSANT_FLAGS) -f compat.build all
  
! CLEANFILES = Microsoft.VisualC.dll Microsoft.Vsa.dll cscompmgd.dll
  
  install-exec-local:
--- 7,12 ----
        "$(CSANT)" $(CSANT_FLAGS) -f compat.build all
  
! CLEANFILES = Microsoft.VisualC.dll Microsoft.Vsa.dll cscompmgd.dll \
!                        Accessibility.dll
  
  install-exec-local:
***************
*** 15,18 ****
--- 16,20 ----
        $(INSTALL_DATA) Microsoft.Vsa.dll 
$(DESTDIR)$(libdir)/cscc/lib/Microsoft.Vsa.dll
        $(INSTALL_DATA) cscompmgd.dll $(DESTDIR)$(libdir)/cscc/lib/cscompmgd.dll
+       $(INSTALL_DATA) Accessibility.dll 
$(DESTDIR)$(libdir)/cscc/lib/Accessibility.dll
  
  uninstall-local:
***************
*** 21,22 ****
--- 23,25 ----
        rm -f $(DESTDIR)$(libdir)/cscc/lib/Microsoft.Vsa.dll
        rm -f $(DESTDIR)$(libdir)/cscc/lib/cscompmgd.dll
+       rm -f $(DESTDIR)$(libdir)/cscc/lib/Accessibility.dll

Index: compat.build
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/compat/compat.build,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** compat.build        15 Apr 2003 12:34:35 -0000      1.5
--- compat.build        24 May 2003 09:54:05 -0000      1.6
***************
*** 80,83 ****
--- 80,108 ----
                </compile>
  
+               <!-- Build the Accessibility.dll library -->
+               <compile output="Accessibility.dll"
+                                target="library"
+                                unsafe="true"
+                                nostdlib="true"
+                                optimize="true"
+                                debug="${CONFIG_DEBUG_LINES}">
+ 
+                       <sources>
+                               <file name="Accessibility.cs"/>
+                       </sources>
+ 
+                       <references>
+                               <file name="../runtime/mscorlib.dll"/>
+                       </references>
+ 
+                       <arg compiler="cscc" value="-Wno-empty-input"/>
+                       <arg compiler="cscc" value="-fminimize-parameters"/>
+                       <arg compiler="csc" value="/nowarn:626"/>
+                       <arg compiler="csc" value="/nowarn:649"/>
+                       <arg compiler="csc" value="/nowarn:168"/>
+                       <arg compiler="csc" value="/nowarn:67"/>
+                       <arg compiler="csc" value="/nowarn:169"/>
+               </compile>
+ 
        </target>
  </project>