Compare commits

..
Author SHA1 Message Date
Atsushi Eno 41ca39c136 oops, forgot to apply the patch here in bug #457089 by Michael Barker.
svn path=/branches/messaging-2008/mcs/; revision=120980
2008-12-08 07:06:43 +00:00
Atsushi Eno 56f2a5eee8 Apply RabbitMQ support patch by Michael Barker, on bug #457089.
svn path=/branches/messaging-2008/mcs/; revision=120957
2008-12-07 09:55:03 +00:00
Atsushi Eno 571a0e148c 2008-10-27 Atsushi Enomoto <[email protected]>
Patch by Michael Barker:
	a patch that adds support for passing all of the Message
	properties via RabbitMQ (as per version 1.1 of System.Messaging).
	This includes Recoverable (supporting persistence) and Priority (which
	would support priority based delivery if RabbitMQ supported it) as
	well as state and argument checking.


svn path=/branches/messaging-2008/mcs/; revision=117134
2008-10-27 10:10:13 +00:00
Atsushi Eno 6abd64b916 add missing files (see bug #432471).
svn path=/branches/messaging-2008/mcs/; revision=116496
2008-10-20 08:06:16 +00:00
Atsushi Eno 7b8ca08adf import AMQP/Rabbit based implementation by Michael Barker (see r116493).
svn path=/branches/messaging-2008/mcs/; revision=116494
2008-10-20 07:49:40 +00:00
Atsushi Eno 7966931ae7 import RabbitMQ.Client (see bug #432471 and
http://lists.ximian.com/pipermail/mono-devel-list/2008-October/029498.html).


svn path=/branches/messaging-2008/mcs/; revision=116493
2008-10-20 07:31:10 +00:00
1503 changed files with 77297 additions and 65041 deletions

No files matched your search

-75
View File
@@ -1,78 +1,3 @@
2009-01-05 Zoltan Varga <[email protected]>
* configure.in: Disable sigaltstack on freebsd as it doesn't seem to work.
2008-12-15 Marek Habersack <[email protected]>
* data/Makefile.am (EXTRA_DIST): added
system.web.extensions_1.0.pc.in. Also added to pkgconfig_DATA
* data/system.web.extensions_1.0.pc.in: added. This file serves
the purpose of making MonoDevelop see the 1.0 version of the
System.Web.Extensions assembly in the project references
editor. This will also make legacy 2.0 ASP.NET apps not fail when
they reference the 1.0 version of the assembly in their project
files.
* configure.in: added data/system.web.extensions_1.0.pc to AC_OUTPUT
2008-12-05 Marek Habersack <[email protected]>
* configure.in: check whether round (3) and rint (3) are present
in the C library.
Mon Nov 10 17:37:08 CET 2008 Paolo Molaro <[email protected]>
* configure.in: check for sys/user.h and struct kinfo_proc members.
2008-11-07 Bill Holmes <[email protected]>
* winconfig.h : Removing HAVE_DIRENT_H, HAVE_STDINT_H,
HAVE_VISIBILITY_HIDDEN, HAVE_ZLIB for the VC builds.
Code is contributed under MIT/X11 license.
2008-11-05 Bill Holmes <[email protected]>
* configure.in : Adding a auto configure check for dirent.h.
Code is contributed under MIT/X11 license.
2008-10-30 Jonathan Pryor <[email protected]>
* Makefile.am: Build `docs` after `runtime`, so that it can depend
upon mdoc.exe for it's operation.
2008-10-30 Jonathan Pryor <[email protected]>
* man/mdoc-assemble.1: Document //node use within .source files.
2008-10-27 Jb Evain <[email protected]>
* data/cecil.pc.in: update version.
2008-10-22 Zoltan Varga <[email protected]>
* scripts/Makefile.am: Add gacutil1 script.
2008-10-21 Atsushi Enomoto <[email protected]>
* data/dotnet35.pc.in : added sys.cm.dataannotations.dll too.
2008-10-21 Atsushi Enomoto <[email protected]>
* data/net_2_0/web.config : added new assemblies and namespaces in
pages and compilation sections.
2008-10-21 Atsushi Enomoto <[email protected]>
* data/dotnet35.pc.in : added new assemblies (dlinq, abstractions,
routing, dynamic data).
2008-10-20 Jonathan Pryor <[email protected]>
* scripts/mod.in: Remove bash-isms.
2008-10-18 Jonathan Pryor <[email protected]>
* configure.in: Generate data/monodoc.pc.
+2 -2
View File
@@ -1,11 +1,11 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I .
SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc docs
SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support data runtime scripts man samples web tools msvc docs
DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support docs data runtime scripts man samples web tools msvc
EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in dtrace-prelink.sh build-mingw32.sh LICENSE mkinstalldirs
+1 -2
View File
@@ -500,5 +500,4 @@ This is Mono.
If the directory ../olive is present (as an
independent checkout) from the Mono module, that
directory is automatically configured to share the
same prefix than this module gets
same prefix than this module gets.
+2 -19
View File
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mono,2.2)
AM_INIT_AUTOMAKE(mono,2.1)
AM_MAINTAINER_MODE
API_VER=1.0
@@ -119,8 +119,7 @@ case "$host" in
AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread is a pointer])
libdl=
libgc_threads=pthreads
# This doesn't seem to work as of 7.0 on amd64
with_sigaltstack=no
with_sigaltstack=yes
# TLS is only partially implemented on -CURRENT (compiler support
# but NOT library support)
#
@@ -266,7 +265,6 @@ fi
AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h)
AC_CHECK_HEADERS(sys/user.h)
AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
if test x$have_zlib = xyes; then
@@ -1472,20 +1470,11 @@ if test x$platform_win32 = xno; then
)
AC_SUBST(XATTR_LIB)
dnl kinfo_proc.kp_proc works on darwin but fails on other simil-bsds
AC_CHECK_MEMBERS(
[struct kinfo_proc.kp_proc],,,
[#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/proc.h>
])
dnl *********************************
dnl *** Checks for Windows compilation ***
dnl *********************************
AC_CHECK_HEADERS(sys/time.h)
AC_CHECK_HEADERS(sys/param.h)
AC_CHECK_HEADERS(dirent.h)
dnl *********************************
dnl *** Check for Console 2.0 I/O ***
@@ -1583,9 +1572,6 @@ if test "x$ac_cv_truncl" != "xyes"; then
AC_CHECK_LIB(sunmath, aintl, [ AC_DEFINE(HAVE_AINTL, 1, [Has the 'aintl' function]) LIBS="$LIBS -lsunmath"])
fi
AC_CHECK_FUNCS(round)
AC_CHECK_FUNCS(rint)
dnl ****************************
dnl *** Look for /dev/random ***
dnl ****************************
@@ -2322,15 +2308,12 @@ data/mono.pc
data/mono-cairo.pc
data/mono-nunit.pc
data/mono-options.pc
data/mono-lineeditor.pc
data/monodoc.pc
data/dotnet.pc
data/dotnet35.pc
data/wcf.pc
data/cecil.pc
data/smcs.pc
data/system.web.extensions_1.0.pc
data/system.web.extensions.design_1.0.pc
samples/Makefile
support/Makefile
data/config
+5 -9
View File
@@ -6,25 +6,21 @@ EXTRA_DIST = \
config.in \
browscap.ini mono.supp mono.d README \
mono.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in monodoc.pc.in \
mono-nunit.pc.in mono-cairo.pc.in mono-options.pc.in cecil.pc.in smcs.pc.in \
mono-lineeditor.pc.in system.web.extensions_1.0.pc.in system.web.extensions.design_1.0.pc.in
mono-nunit.pc.in mono-cairo.pc.in mono-options.pc.in cecil.pc.in smcs.pc.in
pkgconfigdir = $(libdir)/pkgconfig
if JIT_SUPPORTED
if INTERP_SUPPORTED
pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc
pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc
else
pkgconfig_DATA= mono.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc
pkgconfig_DATA= mono.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc
endif
else
pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc
pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc
endif
DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc
DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc
mono_DATA = config \
browscap.ini
+1 -1
View File
@@ -1,5 +1,5 @@
assemblies_dir=@prefix@/lib/mono
Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.9.0__0738eb9f132ed756/Mono.Cecil.dll
Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.8.8607__0738eb9f132ed756/Mono.Cecil.dll
Name: Mono Internal -- Do not use.
Description: Mono Internal Libraries -- Do not use
+1 -1
View File
@@ -2,4 +2,4 @@
Name: Standard libraries in a .NET setup
Description: References all the standard .NET libraries for compilation (.NET Framework 3.5 compatibility)
Version: @VERSION@
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.JScript.dll -r:Microsoft.VisualC.dll -r:Microsoft.Vsa.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll -r:System.Configuration.dll -r:System.Core.dll -r:System.Xml.Linq.dll -r:System.Data.DataSetExtensions.dll -r:System.Data.Linq.dll -r:System.Web.Abstractions.dll -r:System.Web.Routing.dll -r:System.Web.DynamicData.dll -r:System.ComponentModel.DataAnnotations.dll
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.JScript.dll -r:Microsoft.VisualC.dll -r:Microsoft.Vsa.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll -r:System.Configuration.dll -r:System.Core.dll -r:System.Xml.Linq.dll -r:System.Data.DataSetExtensions.dll
-7
View File
@@ -1,7 +0,0 @@
prefix=${pcfiledir}/../..
assemblies_dir=${prefix}/lib/mono-source-libs
Sources=${assemblies_dir}/getline.cs
Name: Mono.Terminal.LineEditor
Description: Terminal text entry editor using System.Console.
Version: 0.2.1
+1 -1
View File
@@ -1,5 +1,5 @@
prefix=${pcfiledir}/../..
assemblies_dir=${prefix}/lib/mono-source-libs
assemblies_dir=${prefix}/lib/mono-options
Sources=${assemblies_dir}/Options.cs
Name: Mono.Options
-12
View File
@@ -1,15 +1,3 @@
2008-12-03 Marek Habersack <[email protected]>
* machine.config: rename serviceModelHostingEnvironment to
serviceHostingEnvironment.
2008-11-14 Gonzalo Paniagua Javier <[email protected]>
* DefaultWsdlHelpGenerator.aspx: use javascript instead of
HttpWebRequest to avoid a deadlock if the web service uses Session.
Bug #444343 fixed.
re: miguel
2008-10-09 Gonzalo Paniagua Javier <[email protected]>
* web.config: default values for httpRuntime are different in 2.0
+63 -92
View File
@@ -34,73 +34,6 @@
<%@ Page debug="true" %>
<html>
<script language="javascript" type="text/javascript">
var req;
function getXML (command, url, qs) {
if (url == "" || url.substring (0, 4) != "http")
return;
var post_data = null;
req = getReq ();
req.onreadystatechange = stateChange;
if (command == "GET") {
url = url + "?" + qs;
} else {
post_data = qs;
}
req.open (command, url, true);
if (command == "POST")
req.setRequestHeader ("Content-Type", "application/x-www-form-urlencoded");
req.send (post_data);
}
function stateChange () {
if (req.readyState == 4) {
var node = document.getElementById("testresult_div");
var text = "";
if (req.status == 200) {
node.innerHTML = "<div class='code-xml'>" + formatXml (req.responseText) + "</div>";
} else {
var ht = "<b style='color: red'>" + formatXml (req.status + " - " + req.statusText) + "</b>";
if (req.responseText != "")
ht = ht + "\n<div class='code-xml'>" + formatXml (req.responseText) + "</div>";
node.innerHTML = ht;
}
}
}
function formatXml (text)
{
var re = / /g;
text = text.replace (re, "&nbsp;");
re = /\t/g;
text = text.replace (re, "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
re = /\<\s*(\/?)\s*(.*?)\s*(\/?)\s*\>/g;
text = text.replace (re,"{blue:&lt;$1}{maroon:$2}{blue:$3&gt;}");
re = /{(\w*):(.*?)}/g;
text = text.replace (re,"<span style='color:$1'>$2</span>");
re = /"(.*?)"/g;
text = text.replace (re,"\"<span style='color:purple'>$1</span>\"");
re = /\r\n|\r|\n/g;
text = text.replace (re, "<br/>");
return text;
}
function getReq () {
if (window.XMLHttpRequest) {
return new XMLHttpRequest(); // Firefox, Safari, ...
} else if (window.ActiveXObject) {
return new ActiveXObject("Microsoft.XMLHTTP");
}
}
</script>
<script language="C#" runat="server">
ServiceDescriptionCollection descriptions;
@@ -396,31 +329,21 @@ class NoCheckCertificatePolicy : ICertificatePolicy {
}
}
string GetOrPost ()
{
return (CurrentOperationProtocols.IndexOf ("HttpGet") >= 0) ? "GET" : "POST";
}
string GetQS ()
{
string GetTestResult ()
{
if (!HasFormResult) return null;
bool fill = false;
string qs = "";
NameValueCollection query_string = Request.QueryString;
for (int n = 0; n < query_string.Count; n++) {
for (int n=0; n<Request.QueryString.Count; n++)
{
if (fill) {
if (qs != "") qs += "&";
qs += query_string.GetKey(n) + "=" + Server.UrlEncode (query_string [n]);
qs += Request.QueryString.GetKey(n) + "=" + Server.UrlEncode (Request.QueryString [n]);
}
if (query_string.GetKey(n) == "ext") fill = true;
if (Request.QueryString.GetKey(n) == "ext") fill = true;
}
return qs;
}
string GetTestResultUrl ()
{
if (!HasFormResult) return "";
string location = null;
ServiceDescription desc = descriptions [0];
Service service = desc.Services[0];
@@ -435,7 +358,59 @@ string GetTestResultUrl ()
if (location == null)
return "Could not locate web service";
return location + "/" + CurrentOperationName;
try
{
string url = location + "/" + CurrentOperationName;
Uri uri = new Uri (url);
WebRequest req;
if (CurrentOperationProtocols.IndexOf ("HttpGet") < 0) {
req = WebRequest.Create (url);
req.Method="POST";
if (!String.IsNullOrEmpty (qs)) {
req.ContentType = "application/x-www-form-urlencoded";
byte [] postBuffer = Encoding.UTF8.GetBytes (qs);
req.ContentLength = postBuffer.Length;
using (Stream requestStream = req.GetRequestStream())
requestStream.Write (postBuffer, 0, postBuffer.Length);
}
}
else
req = WebRequest.Create (url + "?" + qs);
if (url.StartsWith ("https:"))
ServicePointManager.CertificatePolicy = new NoCheckCertificatePolicy ();
HttpCookieCollection cookies = Request.Cookies;
int last = cookies.Count;
if (last > 0) {
CookieContainer container = new CookieContainer ();
for (int i = 0; i < last; i++) {
HttpCookie hcookie = cookies [i];
Cookie cookie = new Cookie (hcookie.Name, hcookie.Value, hcookie.Path, hcookie.Domain);
container.Add (uri, cookie);
}
((HttpWebRequest) req).CookieContainer = container;
}
WebResponse resp = req.GetResponse();
StreamReader sr = new StreamReader (resp.GetResponseStream());
string s = sr.ReadToEnd ();
sr.Close ();
return "<div class='code-xml'>" + ColorizeXml(WrapText(s,CodeTextColumns)) + "</div>";
}
catch (Exception ex)
{
string res = "<b style='color:red'>" + ex.Message + "</b>";
WebException wex = ex as WebException;
if (wex != null)
{
WebResponse resp = wex.Response;
if (resp != null) {
StreamReader sr = new StreamReader (resp.GetResponseStream());
string s = sr.ReadToEnd ();
sr.Close ();
res += "<div class='code-xml'>" + ColorizeXml(WrapText(s,CodeTextColumns)) + "</div>";
}
}
return res;
}
}
string GenerateOperationMessages (string protocol, bool generateInput)
@@ -1772,11 +1747,7 @@ This service does not contain any public web method.
</form>
<div id="testFormResult" style="display:<%= (HasFormResult?"block":"none") %>">
The web service returned the following result:<br/><br/>
<div class="codePanel" id="testresult_div">
</div>
<script language="javascript">
getXML ("<%= GetOrPost () %>", "<%= GetTestResultUrl () %>", "<%= GetQS () %>");
</script>
<div class="codePanel"><%=GetTestResult()%></div>
</div>
<% } else {%>
The test form is not available for this operation because it has parameters with a complex structure.
+1 -1
View File
@@ -81,7 +81,7 @@
<section name="commonBehaviors" type="System.ServiceModel.Configuration.CommonBehaviorsSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="diagnostic" type="System.ServiceModel.Configuration.DiagnosticSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="extensions" type="System.ServiceModel.Configuration.ExtensionsSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="serviceHostingEnvironment" type="System.ServiceModel.Configuration.ServiceHostingEnvironmentSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="serviceModelHostingEnvironment" type="System.ServiceModel.Configuration.ServiceHostingEnvironmentSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="services" type="System.ServiceModel.Configuration.ServicesSection, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</sectionGroup>
<section name="system.webServer" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -1,4 +0,0 @@
Name: System.Web.Extensions.Design
Description: System.Web.Extensions.Design ASP.NET 2.0 add-on
Version: 1.0.61025.0
Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.Design.dll
-4
View File
@@ -1,4 +0,0 @@
Name: System.Web.Extensions
Description: System.Web.Extensions ASP.NET 2.0 add-on
Version: 1.0.61025.0
Libs: -r:@prefix@/lib/mono/gac/System.Web.Extensions/1.0.61025.0__31bf3856ad364e35/System.Web.Extensions.dll
-66
View File
@@ -1,66 +0,0 @@
2008-11-18 Jonathan Pryor <[email protected]>
* Makefile.am (EXTRA_DIST): Add mono-file-formats{.config,.source} and
mono-tools{.config,.source} (fixes the build).
2008-11-18 Jonathan Pryor <[email protected]>
* docs.make, Makefile.am: Build mono-file-formats{.tree,.zip},
mono-tool{.tree,.zip} files.
* mono-file-formats.config, mono-tools.config: Alter paths to man
pages so that they're valid for building from mono/docs.
* monoapi.make: Rename to docs.make.
2008-11-18 Jonathan Pryor <[email protected]>
* docs.make, Makefile.am: Build mono-file-formats{.tree,.zip},
mono-tool{.tree,.zip} files.
* mono-file-formats.config, mono-tools.config: Alter paths to man
pages so that they're valid for building from mono/docs.
* monoapi.make: Rename to docs.make.
2008-11-01 Raja R Harinath <[email protected]>
* Makefile.am: Clean up for srcdir != builddir.
(deploy/.stamp): Compute location of 'mono-wrapper' and pass to exdoc.
* exdoc (mono-wrapper): Use $runtimedir to look for 'mono-wrapper'.
2008-10-31 Jonathan Pryor <[email protected]>
* check, Makefile.am (EXTRA_DIST): Rename to check-exports. This was
needed to fix `make distdir...`, because (1) with a file named
`check` which (2) was listed in $(EXTRA_DIST), while (3) `check` is
ALSO a .PHONY target, this caused make to look for the `check` file,
not find it due to (3), and then proceed to try to build convert.exe
from convert.cs...for reasons I don't care about. This obviously
can't work during `make distdir`, as mcs hasn't been built yet, thus
leading to pain, suffering, and a broken build.
2008-10-30 Jonathan Pryor <[email protected]>
* . (svn:ignore), deploy (svn:ignore): Ignore generated files.
* AgilityPack.dll, api-style.css, ChangeLog, check, check-coverage,
convert.cs, current-api, deploy, documented, exdoc, ignore,
mono-api-metadata.html, monoapi.source, produce-lists, public,
public-api, README, sources, toc.xml, TODO, wapi: Copy from
../mono/docscripts.
* exdoc: Use the in-tree mono program to run convert.exe.
* Makefile.am: Mention files to clean/distribute; extract
documentation (with exdoc) and then assemble documentation (with
monoapi.make's assemble target) for use by monodoc.
* monoapi.make: Added; Makefile to use mcs' buid/rules.make to compile
convert.cs and assemble documentation. (This is a separate file so
that we can include mcs' build/rules.make, which needs topdir set to
behave properly BUT must be $(mcs_topdir) from Makefile.am's
perspective.)
* monoapi.source: Add a /monodoc/node element for use with monodoc 2.2.
2006-11-19 Miguel de Icaza <[email protected]>
* exdoc: Move to use CSS instead of tables, this will break
GtkHTML rendering.
* ignore: Updated with more hidden APIs.
* Bunch of documentation work.
+1 -71
View File
@@ -1,36 +1,14 @@
sourcesdir = $(prefix)/lib/monodoc/sources
sources_DATA = \
monoapi.source \
$(ASSEMBLED_DOCS)
ASSEMBLED_DOCS = \
mono-file-formats.tree mono-file-formats.zip \
mono-tools.tree mono-tools.zip \
monoapi.tree monoapi.zip
EXTRA_DIST = \
abc-removal.txt \
AgilityPack.dll \
aot-compiler.txt \
api-style.css \
assembly-bundle \
check-exports \
check-coverage \
convert.cs \
current-api \
deploy \
docs.make \
documented \
embedded-api \
exception-handling.txt \
exceptions \
exdoc \
file-share-modes \
gc-issues \
gc-variables-in-c \
glossary.txt \
ignore \
internal-calls \
ir-desc \
jit-imt \
@@ -41,65 +19,17 @@ EXTRA_DIST = \
magic.diff \
mini-doc.txt \
mini-porting.txt \
mono-api-metadata.html \
mono-file-formats.config\
mono-file-formats.source\
mono_handle_d \
mono-tools.config \
mono-tools.source \
monoapi.source \
new-regalloc \
object-layout \
opcode-decomp.txt \
precise-gc \
produce-lists \
public \
public-api \
README \
release-notes-1.0.html \
remoting \
ssapre.txt \
stack-alignment \
stack-overflow.txt \
thread-safety.txt \
threading \
toc.xml \
TODO \
thread-safety.txt \
tree-mover.txt \
unmanaged-calls
dist-hook:
$(mkdir_p) $(distdir)/sources
$(mkdir_p) $(distdir)/svgs
cp sources/* $(distdir)/sources
cp svgs/* $(distdir)/svgs
clean-local:
-rm -Rf $(srcdir)/html
-rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe*
-cd $(srcdir) && rm -f $(ASSEMBLED_DOCS)
monoapi.zip : monoapi.tree
monoapi.tree: docs.make Makefile.am toc.xml deploy/.stamp
cp api-style.css deploy
cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@
mono-tools.zip : mono-tools.tree
mono-tools.tree: docs.make Makefile.am deploy/.stamp
cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@
mono-file-formats.zip : mono-file-formats.tree
mono-file-formats.tree: docs.make Makefile.am deploy/.stamp
cd $(srcdir) && $(MAKE) -f $< topdir=$(mcs_topdir_from_srcdir) $@
$(srcdir)/deploy/.stamp: convert.exe Makefile.am
$(mkdir_p) $(srcdir)/html
runtimedir=`cd ../runtime && pwd`; export runtimedir; \
cd $(srcdir) && MONO_PATH=$(mcs_topdir_from_srcdir)/class/lib/net_2_0 perl ./exdoc -h . ../mono/*/*.c
touch $@
extract: $(srcdir)/deploy/.stamp
convert.exe: docs.make convert.cs Makefile.am
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
View File
Whitespace-only changes.
-26
View File
@@ -1,26 +0,0 @@
thisdir = docs
SUBDIRS =
include $(topdir)/build/rules.make
ASSEMBLED_DOCS = \
mono-file-formats.tree mono-file-formats.zip \
mono-tools.tree mono-tools.zip \
monoapi.tree monoapi.zip
convert.exe: convert.cs AgilityPack.dll
$(CSCOMPILE) -out:$@ $< -r:AgilityPack.dll
monoapi.zip : monoapi.tree
monoapi.tree: toc.xml docs.make
$(MDOC) assemble -o monoapi -f hb $<
mono-tools.zip : mono-tools.tree
mono-tools.tree: mono-tools.config docs.make
$(MDOC) assemble -o mono-tools -f man $<
mono-file-formats.zip : mono-file-formats.tree
mono-file-formats.tree: mono-file-formats.config docs.make
$(MDOC) assemble -o mono-file-formats -f man $<
.doc-stamp:
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0"?>
<manpages>
<manpage name="mdoc(5)" page="../man/mdoc.5" />
<manpage name="mono-config(5)" page="../man/mono-config.5" />
</manpages>
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0"?>
<monodoc>
<node label="Mono File Formats" name="mono-formats" parent="formats" />
<source provider="man" basefile="mono-file-formats" path="mono-formats"/>
</monodoc>
-55
View File
@@ -1,55 +0,0 @@
<?xml version="1.0"?>
<manpages>
<manpage name="al(1)" page="../man/al.1" />
<manpage name="caspol(1)" page="../man/caspol.1" />
<manpage name="cert2spc(1)" page="../man/cert2spc.1" />
<manpage name="certmgr(1)" page="../man/certmgr.1" />
<manpage name="chktrust(1)" page="../man/chktrust.1" />
<manpage name="cilc(1)" page="../man/cilc.1" />
<manpage name="disco(1)" page="../man/disco.1" />
<manpage name="dtd2xsd(1)" page="../man/dtd2xsd.1" />
<manpage name="gacutil(1)" page="../man/gacutil.1" />
<manpage name="genxs(1)" page="../man/genxs.1" />
<manpage name="httpcfg(1)" page="../man/httpcfg.1" />
<manpage name="ilasm(1)" page="../man/ilasm.1" />
<manpage name="macpack(1)" page="../man/macpack.1" />
<manpage name="makecert(1)" page="../man/makecert.1" />
<manpage name="mconfig(1)" page="../man/mconfig.1" />
<manpage name="mcs(1)" page="../man/mcs.1" />
<manpage name="mdassembler(1)" page="../man/mdassembler.1" />
<manpage name="mdcs2ecma(1)" page="../man/mdcs2ecma.1" />
<manpage name="mdnormalizer(1)" page="../man/mdnormalizer.1" />
<manpage name="mdoc(1)" page="../man/mdoc.1" />
<manpage name="mdoc-assemble(1)" page="../man/mdoc-assemble.1" />
<manpage name="mdoc-export-html(1)" page="../man/mdoc-export-html.1" />
<manpage name="mdoc-export-msxdoc(1)" page="../man/mdoc-export-msxdoc.1" />
<manpage name="mdoc-update(1)" page="../man/mdoc-update.1" />
<manpage name="mdoc-validate(1)" page="../man/mdoc-validate.1" />
<manpage name="mdvalidator(1)" page="../man/mdvalidator.1" />
<manpage name="mkbundle(1)" page="../man/mkbundle.1" />
<manpage name="mono(1)" page="../man/mono.1" />
<manpage name="mono-service(1)" page="../man/mono-service.1" />
<manpage name="mono-shlib-cop(1)" page="../man/mono-shlib-cop.1" />
<manpage name="monodocer(1)" page="../man/monodocer.1" />
<manpage name="monodocs2html(1)" page="../man/monodocs2html.1" />
<manpage name="monolinker(1)" page="../man/monolinker.1" />
<manpage name="monop(1)" page="../man/monop.1" />
<manpage name="monostyle(1)" page="../man/monostyle.1" />
<manpage name="mono-xmltool(1)" page="../man/mono-xmltool.1" />
<manpage name="mozroots(1)" page="../man/mozroots.1" />
<manpage name="oldmono(1)" page="../man/oldmono.1" />
<manpage name="permview(1)" page="../man/permview.1" />
<manpage name="prj2make(1)" page="../man/prj2make.1" />
<manpage name="resgen(1)" page="../man/resgen.1" />
<manpage name="secutil(1)" page="../man/secutil.1" />
<manpage name="setreg(1)" page="../man/setreg.1" />
<manpage name="sgen(1)" page="../man/sgen.1" />
<manpage name="signcode(1)" page="../man/signcode.1" />
<manpage name="sn(1)" page="../man/sn.1" />
<manpage name="soapsuds(1)" page="../man/soapsuds.1" />
<manpage name="sqlsharp(1)" page="../man/sqlsharp.1" />
<manpage name="vbnc(1)" page="../man/vbnc.1" />
<manpage name="wsdl(1)" page="../man/wsdl.1" />
<manpage name="wsdl2(1)" page="../man/wsdl2.1" />
<manpage name="xsd(1)" page="../man/xsd.1" />
</manpages>
-22
View File
@@ -1,25 +1,3 @@
2008-11-05 Bill Holmes <[email protected]>
* src/gutf8.c, src/unicode-data.h, src/gunicode.c :
Fixing the MSVC builds.
Contributed under MIT/X11 license.
2008-11-04 Atsushi Enomoto <[email protected]>
* src/gutf8.c, src/gunicode.c, src/glib.h:
implemented g_unichar_type(), g_unichar_toupper(),
g_unichar_tolower(), g_unichar_totitle(), g_utf8_strup()
and g_utf8_strdown(). Fixed some surrogate pair bugs.
* TODO : removed implemented things.
* test/unicode.c, test/tests.h, test/utf8.c, test/Makefile.am:
added new tests.
2008-11-04 Atsushi Enomoto <[email protected]>
* src/unicode-data.h : new header for some new unicode manipulation
functions.
2008-10-17 Miguel de Icaza <[email protected]>
* Allow types to be defined on the eglib-config.h file, that could
+2 -1
View File
@@ -14,7 +14,8 @@ Macros:
* Unimplemented, not supported currently:
(none as yet.)
g_unichar_tolower Used for deprecated unmanaged string collation
g_unichar_type Used for deprecated unmanaged string collation
* Dead Code
+1
View File
@@ -36,6 +36,7 @@ libeglib_la_SOURCES = \
gfile.c \
gfile-posix.c \
gpattern.c \
gdir.c \
gmarkup.c \
gutf8.c \
gunicode.c \
+1
View File
@@ -33,6 +33,7 @@
void
g_get_current_time (GTimeVal *result)
{
g_return_if_fail (result != NULL);
struct timeval tv;
g_return_if_fail (result != NULL);
+2 -2
View File
@@ -34,11 +34,11 @@ void
g_get_current_time (GTimeVal *result)
{
long int l;
g_return_if_fail (result != NULL);
l = GetTickCount();
g_return_if_fail (result != NULL);
result->tv_sec = l / 1000;
result->tv_usec = (l % 1000) * 1000;
}
+203
View File
@@ -0,0 +1,203 @@
/*
* Directory utility functions.
*
* Author:
* Gonzalo Paniagua Javier ([email protected])
*
* (C) 2006 Novell, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#ifndef _MSC_VER
#include <unistd.h>
#include <dirent.h>
#else
#include <io.h>
#endif
#ifdef G_OS_WIN32
#include <winsock2.h>
#endif
struct _GDir {
#ifdef G_OS_WIN32
HANDLE handle;
gchar* current;
gchar* next;
#else
DIR *dir;
#endif
};
GDir *
g_dir_open (const gchar *path, guint flags, GError **error)
{
#ifdef G_OS_WIN32
GDir *dir;
gunichar2* path_utf16;
gunichar2* path_utf16_search;
WIN32_FIND_DATA find_data;
g_return_val_if_fail (path != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
dir = g_new0 (GDir, 1);
path_utf16 = u8to16 (path);
dir->handle = FindFirstFile (path_utf16, &find_data);
if (dir->handle == INVALID_HANDLE_VALUE) {
if (error) {
gint err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
}
g_free (dir);
g_free (path_utf16);
return NULL;
}
/* now get files */
FindClose (dir->handle);
path_utf16_search = g_malloc ((wcslen(path_utf16) + 3)*sizeof(gunichar2));
wcscpy (path_utf16_search, path_utf16);
wcscat (path_utf16_search, L"\\*");
dir->handle = FindFirstFile (path_utf16_search, &find_data);
g_free (path_utf16_search);
while ((wcscmp (find_data.cFileName, L".") == 0) || (wcscmp (find_data.cFileName, L"..") == 0)) {
if (!FindNextFile (dir->handle, &find_data)) {
if (error) {
gint err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
}
g_free (dir);
g_free (path_utf16);
return NULL;
}
}
dir->current = NULL;
dir->next = u16to8 (find_data.cFileName);
g_free (path_utf16);
return dir;
#else
GDir *dir;
g_return_val_if_fail (path != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
(void) flags; /* this is not used */
dir = g_new (GDir, 1);
dir->dir = opendir (path);
if (dir->dir == NULL) {
if (error) {
gint err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
}
g_free (dir);
return NULL;
}
return dir;
#endif
}
const gchar *
g_dir_read_name (GDir *dir)
{
#ifdef G_OS_WIN32
WIN32_FIND_DATA find_data;
g_return_val_if_fail (dir != NULL && dir->handle != 0, NULL);
if (dir->current)
g_free (dir->current);
dir->current = NULL;
dir->current = dir->next;
if (!dir->current)
return NULL;
dir->next = NULL;
do {
if (!FindNextFile (dir->handle, &find_data)) {
dir->next = NULL;
return dir->current;
}
} while ((wcscmp (find_data.cFileName, L".") == 0) || (wcscmp (find_data.cFileName, L"..") == 0));
dir->next = u16to8 (find_data.cFileName);
return dir->current;
#else
struct dirent *entry;
g_return_val_if_fail (dir != NULL && dir->dir != NULL, NULL);
do {
entry = readdir (dir->dir);
if (entry == NULL)
return NULL;
} while ((strcmp (entry->d_name, ".") == 0) || (strcmp (entry->d_name, "..") == 0));
return entry->d_name;
#endif
}
void
g_dir_rewind (GDir *dir)
{
#ifdef G_OS_WIN32
#else
g_return_if_fail (dir != NULL && dir->dir != NULL);
rewinddir (dir->dir);
#endif
}
void
g_dir_close (GDir *dir)
{
#ifdef G_OS_WIN32
g_return_if_fail (dir != NULL && dir->handle != 0);
if (dir->current)
g_free (dir->current);
dir->current = NULL;
if (dir->next)
g_free (dir->next);
dir->next = NULL;
FindClose (dir->handle);
dir->handle = 0;
g_free (dir);
#else
g_return_if_fail (dir != NULL && dir->dir != 0);
closedir (dir->dir);
dir->dir = NULL;
g_free (dir);
#endif
}
-33
View File
@@ -531,41 +531,10 @@ gpointer g_convert_error_quark(void);
typedef guint32 gunichar;
typedef enum {
G_UNICODE_CONTROL,
G_UNICODE_FORMAT,
G_UNICODE_UNASSIGNED,
G_UNICODE_PRIVATE_USE,
G_UNICODE_SURROGATE,
G_UNICODE_LOWERCASE_LETTER,
G_UNICODE_MODIFIER_LETTER,
G_UNICODE_OTHER_LETTER,
G_UNICODE_TITLECASE_LETTER,
G_UNICODE_UPPERCASE_LETTER,
G_UNICODE_COMBINING_MARK,
G_UNICODE_ENCLOSING_MARK,
G_UNICODE_NON_SPACING_MARK,
G_UNICODE_DECIMAL_NUMBER,
G_UNICODE_LETTER_NUMBER,
G_UNICODE_OTHER_NUMBER,
G_UNICODE_CONNECT_PUNCTUATION,
G_UNICODE_DASH_PUNCTUATION,
G_UNICODE_CLOSE_PUNCTUATION,
G_UNICODE_FINAL_PUNCTUATION,
G_UNICODE_INITIAL_PUNCTUATION,
G_UNICODE_OTHER_PUNCTUATION,
G_UNICODE_OPEN_PUNCTUATION,
G_UNICODE_CURRENCY_SYMBOL,
G_UNICODE_MODIFIER_SYMBOL,
G_UNICODE_MATH_SYMBOL,
G_UNICODE_OTHER_SYMBOL,
G_UNICODE_LINE_SEPARATOR,
G_UNICODE_PARAGRAPH_SEPARATOR,
G_UNICODE_SPACE_SEPARATOR
} GUnicodeType;
gunichar g_unichar_toupper (gunichar c);
gunichar g_unichar_tolower (gunichar c);
gunichar g_unichar_totitle (gunichar c);
GUnicodeType g_unichar_type (gunichar c);
gboolean g_unichar_isxdigit (gunichar c);
gint g_unichar_xdigit_value (gunichar c);
@@ -601,8 +570,6 @@ typedef enum {
G_CONVERT_ERROR_NOT_ABSOLUTE_PATH
} GConvertError;
gchar* g_utf8_strup (const gchar *str, gssize len);
gchar* g_utf8_strdown (const gchar *str, gssize len);
gunichar2 *g_utf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **error);
gchar *g_utf16_to_utf8 (const gunichar2 *str, glong len, glong *items_read, glong *items_written, GError **error);
gunichar2 *g_ucs4_to_utf16 (const gunichar *str, glong len, glong *items_read, glong *items_written, GError **error);
+3 -84
View File
@@ -35,7 +35,6 @@
*/
#include <stdio.h>
#include <glib.h>
#include <unicode-data.h>
#include <errno.h>
#ifdef _MSC_VER
/* FIXME */
@@ -83,95 +82,15 @@ static const gulong offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E208
GUnicodeType
g_unichar_type (gunichar c)
{
int i;
guint16 cp = (guint16) c;
for (i = 0; i < unicode_category_ranges_count; i++) {
if (cp < unicode_category_ranges [i].start)
continue;
if (unicode_category_ranges [i].end <= cp)
continue;
return unicode_category [i] [cp - unicode_category_ranges [i].start];
}
/*
// 3400-4DB5: OtherLetter
// 4E00-9FC3: OtherLetter
// AC00-D7A3: OtherLetter
// D800-DFFF: OtherSurrogate
// E000-F8FF: OtherPrivateUse
// 20000-2A6D6 OtherLetter
// F0000-FFFFD OtherPrivateUse
// 100000-10FFFD OtherPrivateUse
*/
if (0x3400 <= cp && cp < 0x4DB5)
return G_UNICODE_OTHER_LETTER;
if (0x4E00 <= cp && cp < 0x9FC3)
return G_UNICODE_OTHER_LETTER;
if (0xAC00<= cp && cp < 0xD7A3)
return G_UNICODE_OTHER_LETTER;
if (0xD800 <= cp && cp < 0xDFFF)
return G_UNICODE_SURROGATE;
if (0xE000 <= cp && cp < 0xF8FF)
return G_UNICODE_PRIVATE_USE;
/* since the argument is UTF-16, we cannot check beyond FFFF */
/* It should match any of above */
g_error ("%s", "g_unichar_type is not implemented");
return 0;
}
gunichar
g_unichar_case (gunichar c, gboolean upper)
{
gint8 i, i2;
guint32 cp = (guint32) c, v;
for (i = 0; i < simple_case_map_ranges_count; i++) {
if (cp < simple_case_map_ranges [i].start)
return c;
if (simple_case_map_ranges [i].end <= cp)
continue;
if (c < 0x10000) {
const guint16 *tab = upper ? simple_upper_case_mapping_lowarea [i] : simple_lower_case_mapping_lowarea [i];
v = tab [cp - simple_case_map_ranges [i].start];
} else {
const guint32 *tab;
i2 = (gint8)(i - (upper ? simple_upper_case_mapping_lowarea_table_count : simple_lower_case_mapping_lowarea_table_count));
tab = upper ? simple_upper_case_mapping_higharea [i2] : simple_lower_case_mapping_higharea [i2];
v = tab [cp - simple_case_map_ranges [i].start];
}
return v != 0 ? (gunichar) v : c;
}
return c;
}
gunichar
g_unichar_toupper (gunichar c)
{
return g_unichar_case (c, TRUE);
}
gunichar
g_unichar_tolower (gunichar c)
{
return g_unichar_case (c, FALSE);
}
gunichar
g_unichar_totitle (gunichar c)
{
guint8 i;
guint32 cp;
cp = (guint32) c;
for (i = 0; i < simple_titlecase_mapping_count; i++) {
if (simple_titlecase_mapping [i].codepoint == cp)
return simple_titlecase_mapping [i].title;
if (simple_titlecase_mapping [i].codepoint > cp)
/* it is ordered, hence no more match */
break;
}
return g_unichar_toupper (c);
g_error ("%s", "g_unichar_type is not implemented");
return 0;
}
gboolean
+3 -41
View File
@@ -21,40 +21,6 @@ g_convert_error_quark ()
return error_quark;
}
gunichar*
utf8_case_conv (const gchar *str, gssize len, gboolean upper)
{
glong i, u16len, u32len;
gunichar2 *u16str;
gunichar *u32str;
gchar *u8str;
GError **err = NULL;
u16str = g_utf8_to_utf16 (str, (glong)len, NULL, &u16len, err);
u32str = g_utf16_to_ucs4 (u16str, u16len, NULL, &u32len, err);
for (i = 0; i < u32len; i++) {
u32str [i] = upper ? g_unichar_toupper (u32str [i]) : g_unichar_tolower (u32str [i]);
}
g_free (u16str);
u16str = g_ucs4_to_utf16 (u32str, u32len, NULL, &u16len, err);
u8str = g_utf16_to_utf8 (u16str, u16len, NULL, NULL, err);
g_free (u32str);
g_free (u16str);
return (gunichar*)u8str;
}
gchar*
g_utf8_strup (const gchar *str, gssize len)
{
return (gchar*)utf8_case_conv (str, len, TRUE);
}
gchar*
g_utf8_strdown (const gchar *str, gssize len)
{
return (gchar*)utf8_case_conv (str, len, FALSE);
}
gunichar2*
g_utf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **error)
{
@@ -302,14 +268,12 @@ g_utf16_to_utf8 (const gunichar2 *str, glong len, glong *items_read, glong *item
while (len < 0 ? str [in_pos] : in_pos < len) {
ch = str [in_pos];
if (surrogate) {
if (ch >= 0xDC00 && ch <= 0xDFFF) {
surrogate = 0;
if (ch >= 0xDC00 && ch <= 0xDFFF)
codepoint = 0x10000 + (ch - 0xDC00) + ((surrogate - 0xD800) << 10);
surrogate = 0;
} else {
surrogate = 0;
else
/* invalid surrogate pair */
continue;
}
} else {
/* fast path optimization */
if (ch < 0x80) {
@@ -332,8 +296,6 @@ g_utf16_to_utf8 (const gunichar2 *str, glong len, glong *items_read, glong *item
}
in_pos++;
if (surrogate != 0)
continue;
if (codepoint < 0x80)
ret [out_pos++] = (gchar) codepoint;
else if (codepoint < 0x0800) {
File diff suppressed because it is too large. Load diff
-1
View File
@@ -21,7 +21,6 @@ SOURCES = \
pattern.c \
dir.c \
markup.c \
unicode.c \
utf8.c \
endian.c \
module.c \
-2
View File
@@ -18,7 +18,6 @@ DEFINE_TEST_GROUP_INIT_H(file_tests_init);
DEFINE_TEST_GROUP_INIT_H(pattern_tests_init);
DEFINE_TEST_GROUP_INIT_H(dir_tests_init);
DEFINE_TEST_GROUP_INIT_H(markup_tests_init);
DEFINE_TEST_GROUP_INIT_H(unicode_tests_init);
DEFINE_TEST_GROUP_INIT_H(utf8_tests_init);
DEFINE_TEST_GROUP_INIT_H(endian_tests_init);
DEFINE_TEST_GROUP_INIT_H(module_tests_init);
@@ -43,7 +42,6 @@ static Group test_groups [] = {
{"file", file_tests_init},
{"pattern", pattern_tests_init},
{"dir", dir_tests_init},
{"unicode", unicode_tests_init},
{"utf8", utf8_tests_init},
{"endian", endian_tests_init},
{"module", module_tests_init},
-99
View File
@@ -1,99 +0,0 @@
#include "test.h"
/*
* g_unichar_type
*/
RESULT
test_g_unichar_type ()
{
if (g_unichar_type ('A') != G_UNICODE_UPPERCASE_LETTER)
return FAILED ("#1");
if (g_unichar_type ('a') != G_UNICODE_LOWERCASE_LETTER)
return FAILED ("#2");
if (g_unichar_type ('1') != G_UNICODE_DECIMAL_NUMBER)
return FAILED ("#3");
if (g_unichar_type (0xA3) != G_UNICODE_CURRENCY_SYMBOL)
return FAILED ("#4");
return NULL;
}
/*
* g_unichar_toupper
*/
RESULT
test_g_unichar_toupper ()
{
if (g_unichar_toupper (0) != 0)
return FAILED ("#0");
if (g_unichar_toupper ('a') != 'A')
return FAILED ("#1");
if (g_unichar_toupper ('1') != '1')
return FAILED ("#2");
if (g_unichar_toupper (0x1C4) != 0x1C4)
return FAILED ("#3");
if (g_unichar_toupper (0x1F2) != 0x1F1)
return FAILED ("#4");
if (g_unichar_toupper (0x1F3) != 0x1F1)
return FAILED ("#5");
if (g_unichar_toupper (0xFFFF) != 0xFFFF)
return FAILED ("#6");
if (g_unichar_toupper (0x10428) != 0x10400)
return FAILED ("#7");
return NULL;
}
/*
* g_unichar_tolower
*/
RESULT
test_g_unichar_tolower ()
{
if (g_unichar_tolower (0) != 0)
return FAILED ("#0");
if (g_unichar_tolower ('A') != 'a')
return FAILED ("#1");
if (g_unichar_tolower ('1') != '1')
return FAILED ("#2");
if (g_unichar_tolower (0x1C5) != 0x1C6)
return FAILED ("#3");
if (g_unichar_tolower (0x1F1) != 0x1F3)
return FAILED ("#4");
if (g_unichar_tolower (0x1F2) != 0x1F3)
return FAILED ("#5");
if (g_unichar_tolower (0xFFFF) != 0xFFFF)
return FAILED ("#6");
return NULL;
}
/*
* g_unichar_totitle
*/
RESULT
test_g_unichar_totitle ()
{
if (g_unichar_toupper (0) != 0)
return FAILED ("#0");
if (g_unichar_totitle ('a') != 'A')
return FAILED ("#1");
if (g_unichar_totitle ('1') != '1')
return FAILED ("#2");
if (g_unichar_totitle (0x1C4) != 0x1C5)
return FAILED ("#3");
if (g_unichar_totitle (0x1F2) != 0x1F2)
return FAILED ("#4");
if (g_unichar_totitle (0x1F3) != 0x1F2)
return FAILED ("#5");
if (g_unichar_toupper (0xFFFF) != 0xFFFF)
return FAILED ("#6");
return NULL;
}
static Test unicode_tests [] = {
{"g_unichar_type", test_g_unichar_type},
{"g_unichar_toupper", test_g_unichar_toupper},
{"g_unichar_tolower", test_g_unichar_tolower},
{"g_unichar_totitle", test_g_unichar_totitle},
{NULL, NULL}
};
DEFINE_TEST_GROUP_INIT(unicode_tests_init, unicode_tests)
+5 -136
View File
@@ -82,8 +82,8 @@ compare_utf16_to_utf8 (const gchar *expected, const gunichar2 *utf16, glong len_
RESULT
test_utf16_to_utf8 ()
{
const gchar *src0 = "", *src1 = "ABCDE", *src2 = "\xE5\xB9\xB4\x27", *src3 = "\xEF\xBC\xA1", *src4 = "\xEF\xBD\x81", *src5 = "\xF0\x90\x90\x80";
gunichar2 str0 [] = {0}, str1 [6], str2 [] = {0x5E74, 39, 0}, str3 [] = {0xFF21, 0}, str4 [] = {0xFF41, 0}, str5 [] = {0xD801, 0xDC00, 0};
const gchar *src0 = "", *src1 = "ABCDE", *src2 = "\xE5\xB9\xB4\x27";
gunichar2 str0 [] = {0}, str1 [6], str2 [] = {0x5E74, 39, 0};
RESULT result;
gchar_to_gunichar2 (str1, src1);
@@ -97,15 +97,6 @@ test_utf16_to_utf8 ()
if (result != OK)
return result;
result = compare_utf16_to_utf8 (src2, str2, 2, 4);
if (result != OK)
return result;
result = compare_utf16_to_utf8 (src3, str3, 1, 3);
if (result != OK)
return result;
result = compare_utf16_to_utf8 (src4, str4, 1, 3);
if (result != OK)
return result;
result = compare_utf16_to_utf8 (src5, str5, 2, 4);
if (result != OK)
return result;
@@ -203,7 +194,6 @@ test_utf8_seq ()
if (out_read != 2) {
return FAILED ("out_read is expected to be 2 but was %d\n", out_read);
}
g_free (dst);
return OK;
}
@@ -211,8 +201,8 @@ test_utf8_seq ()
RESULT
test_utf8_to_utf16 ()
{
const gchar *src0 = "", *src1 = "ABCDE", *src2 = "\xE5\xB9\xB4\x27", *src3 = "\xEF\xBC\xA1", *src4 = "\xEF\xBD\x81";
gunichar2 str0 [] = {0}, str1 [6], str2 [] = {0x5E74, 39, 0}, str3 [] = {0xFF21, 0}, str4 [] = {0xFF41, 0};
const gchar *src0 = "", *src1 = "ABCDE", *src2 = "\xE5\xB9\xB4\x27";
gunichar2 str0 [] = {0}, str1 [6], str2 [] = {0x5E74, 39, 0};
RESULT result;
gchar_to_gunichar2 (str1, src1);
@@ -226,12 +216,6 @@ test_utf8_to_utf16 ()
if (result != OK)
return result;
result = compare_utf8_to_utf16 (str2, src2, 4, 2);
if (result != OK)
return result;
result = compare_utf8_to_utf16 (str3, src3, 3, 1);
if (result != OK)
return result;
result = compare_utf8_to_utf16 (str4, src4, 3, 1);
if (result != OK)
return result;
@@ -326,8 +310,6 @@ test_ucs4_to_utf16 ()
static gunichar2 exp4[4] = {'h',0xdbff,0xdfff,'\0'};
static gunichar str5[7] = {0xD7FF,0xD800,0xDFFF,0xE000,0x110000,0x10FFFF,'\0'};
static gunichar2 exp5[5] = {0xD7FF,0xE000,0xdbff,0xdfff,'\0'};
static gunichar str6[2] = {0x10400, '\0'};
static gunichar2 exp6[3] = {0xD801, 0xDC00, '\0'};
static glong read_write[12] = {1,1,0,0,0,0,1,1,0,0,1,2};
gunichar2* res;
glong items_read, items_written, current_write_index;
@@ -355,8 +337,8 @@ test_ucs4_to_utf16 ()
items_read = items_written = 0;
res = g_ucs4_to_utf16 (str2, 2, &items_read, &items_written, &err);
check_result = ucs4_to_utf16_check_result (res, 0, items_read, 1, items_written, 0, err, TRUE);
g_free (res);
if (check_result) return check_result;
g_free (res);
items_read = items_written = 0;
err = 0;
@@ -385,13 +367,6 @@ test_ucs4_to_utf16 ()
current_write_index += items_written;
}
items_read = items_written = 0;
err = 0;
res = g_ucs4_to_utf16 (str6, 1, &items_read, &items_written, &err);
check_result = ucs4_to_utf16_check_result (res, exp6, items_read, 1, items_written, 2, err, FALSE);
if (check_result) return check_result;
g_free (res);
return OK;
}
@@ -436,8 +411,6 @@ test_utf16_to_ucs4 ()
static gunichar2 str4[20] = {0xDC00,0xDFFF,0xDFF,0xD800,0xDBFF,0xD800,0xDC00,0xD800,0xDFFF,
0xD800,0xE000,0xDBFF,0xDBFF,0xDBFF,0xDC00,0xDBFF,0xDFFF,0xDBFF,0xE000,'\0'};
static gunichar exp4[6] = {0xDFF,0x10000,0x103ff,0x10fc00,0x10FFFF,'\0'};
static gunichar2 str5[3] = {0xD801, 0xDC00, 0};
static gunichar exp5[2] = {0x10400, 0};
static glong read_write[33] = {1,0,0,1,0,0,1,1,1,2,1,0,2,2,1,2,2,1,2,1,0,2,1,0,2,2,1,2,2,1,2,1,0};
gunichar* res;
glong items_read, items_written, current_read_index,current_write_index;
@@ -508,13 +481,6 @@ test_utf16_to_ucs4 ()
current_write_index += items_written;
}
items_read = items_written = 0;
err = 0;
res = g_utf16_to_ucs4 (str5, 2, &items_read, &items_written, &err);
check_result = utf16_to_ucs4_check_result (res, exp5, items_read, 2, items_written, 1, err, FALSE);
if (check_result) return check_result;
g_free (res);
return OK;
}
RESULT
@@ -670,101 +636,6 @@ test_utf8_validate()
return OK;
}
glong
utf8_byteslen (const gchar *src)
{
int i = 0;
do {
if (src [i] == '\0')
return i;
i++;
} while (TRUE);
}
RESULT
test_utf8_strcase_each (const gchar *src, const gchar *expected, gboolean strup)
{
gchar *tmp;
glong len, len2;
RESULT r;
len = utf8_byteslen (src);
tmp = strup ? g_utf8_strup (src, len) : g_utf8_strdown (src, len);
len2 = utf8_byteslen (tmp);
r = compare_strings_utf8_RESULT (expected, tmp, len < len2 ? len2 : len);
g_free (tmp);
return r;
}
RESULT
test_utf8_strup_each (const gchar *src, const gchar *expected)
{
return test_utf8_strcase_each (src, expected, TRUE);
}
RESULT
test_utf8_strdown_each (const gchar *src, const gchar *expected)
{
return test_utf8_strcase_each (src, expected, FALSE);
}
/*
* g_utf8_strup
*/
RESULT
test_utf8_strup ()
{
RESULT r;
if ((r = test_utf8_strup_each ("aBc", "ABC")) != OK)
return r;
if ((r = test_utf8_strup_each ("x86-64", "X86-64")) != OK)
return r;
// U+3B1 U+392 -> U+391 U+392
if ((r = test_utf8_strup_each ("\xCE\xB1\xCE\x92", "\xCE\x91\xCE\x92")) != OK)
return r;
// U+FF21 -> U+FF21
if ((r = test_utf8_strup_each ("\xEF\xBC\xA1", "\xEF\xBC\xA1")) != OK)
return r;
// U+FF41 -> U+FF21
if ((r = test_utf8_strup_each ("\xEF\xBD\x81", "\xEF\xBC\xA1")) != OK)
return r;
// U+10428 -> U+10400
if ((r = test_utf8_strup_each ("\xF0\x90\x90\xA8", "\xF0\x90\x90\x80")) != OK)
return r;
return OK;
}
/*
* g_utf8_strdown
*/
RESULT
test_utf8_strdown ()
{
RESULT r;
if ((r = test_utf8_strdown_each ("aBc", "abc")) != OK)
return r;
if ((r = test_utf8_strdown_each ("X86-64", "x86-64")) != OK)
return r;
// U+391 U+3B2 -> U+3B1 U+3B2
if ((r = test_utf8_strdown_each ("\xCE\x91\xCE\xB2", "\xCE\xB1\xCE\xB2")) != OK)
return r;
/*
// U+FF41 -> U+FF41
if ((r = test_utf8_strdown_each ("\xEF\xBC\x81", "\xEF\xBC\x81")) != OK)
return r;
// U+FF21 -> U+FF41
if ((r = test_utf8_strdown_each ("\xEF\xBC\xA1", "\xEF\xBD\x81")) != OK)
return r;
// U+10400 -> U+10428
if ((r = test_utf8_strdown_each ("\xF0\x90\x90\x80", "\xF0\x90\x90\xA8")) != OK)
return r;
*/
return OK;
}
/*
* test initialization
*/
@@ -781,8 +652,6 @@ static Test utf8_tests [] = {
{"g_utf8_get_char", test_utf8_get_char },
{"g_utf8_next_char", test_utf8_next_char },
{"g_utf8_validate", test_utf8_validate },
{"g_utf8_strup", test_utf8_strup},
{"g_utf8_strdown", test_utf8_strdown},
{NULL, NULL}
};
-13
View File
@@ -1,16 +1,3 @@
2008-12-31 Massimiliano Mantione <[email protected]>
* mono.1: Merged the profiler documentation from trunk (r122288),
removing the "ts" option (it does not exist anymore) and explaining
the defaults for allocation and heap profiling.
2008-12-12 Rolf Bjarne Kvinge <[email protected]>
* Makefile.am, vbnc.1: Remove vbnc.1. It's living in the
mono-basic module now.
[Backport of r121406.]
2008-10-18 Jonathan Pryor <[email protected]>
* Makefile.am (man_MANS): Remove unpackaged files.
+1
View File
@@ -48,6 +48,7 @@ man_MANS = \
sn.1 \
soapsuds.1 \
sqlsharp.1 \
vbnc.1 \
wsdl.1 \
xsd.1
+16 -48
View File
@@ -4,44 +4,22 @@
..
.TH csharp 1 "4 September 2008"
.SH NAME
csharp, gsharp \- Interactive C# Shell
csharp \- Interactive C# Shell
.SH SYNOPSIS
.B csharp [--attach PID]
.B csharp
[options]
.P
.B gsharp [file1 [file2]]
.SH DESCRIPTION
The
.I csharp
is an interactive C# shell that allows the user to enter and evaluate
C# statements and expressions from the command line. The regular
.I mcs
command line options can be used in this version of the compiler.
C# statements and expressions from the command line.
.PP
The
.I gsharp
command is a GUI version of the C# interpreter that uses Gtk# and
provides an area to attach widgets as well. This version can be
attached to other Gtk# applications in a safe way as it injects itself
into the main loop of a Gtk# application, avoiding any problems
arising from the multi-threaded nature of injecting itself into a
target process.
.PP
This version allows a number of scripts to be specified in the command
line.
.SH OPTIONS
.TP
.I "\-\-attach"
This is an advanced option and should only be used if you have a deep
understanding of multi-threading. This option is availble on the
.I csharp
command and allows the compiler to be injected into other processes.
This is done by injecting the C# shell in a separate thread that runs
concurrently with your application. This means that you must take
special measures to avoid crashing the target application while using
it. For example, you might have to take the proper locks before
issuing any commands that might affect the target process state, or
sending commands through a method dispatcher.
This command is a shortcut to invoke the
.I gmcs
command with the
.I \-\- shell
command line option. All of the regular compiler options available
to gmcs are available in the interactive shell.
.SH OPERATION
Once you launch the csharp command, you will be greeted with the
interactive prompt:
@@ -201,8 +179,7 @@ csharp>
.SH INTERACTIVE EDITING
The C# interactive shell contains a line-editor that provides a more
advanced command line editing functionality than the operating system
provides. These are available in the command line version, the GUI
versions uses the standard Gtk# key bindings.
provides.
.PP
The command set is similar to many other applications (cursor keys)
and incorporates some of the Emacs commands for editing as well as a
@@ -311,22 +288,13 @@ csharp>
.PP
The return value is a TimeSpan, that you can store in a variable for
benchmarking purposes.
.SH GUI METHODS AND PROPERTIES
In addition to the methods and properties available in the console
version there are a handful of extra properties available on the GUI
version. For example a "PaneContainer" Gtk.Container is exposed that
you can use to host Gtk# widgets while prototyping or the "MainWindow"
property that gives you access to the current toplevel window.
.SH STARTUP FILES
The C# shell will load all the Mono assemblies and C# script files
located in the ~/.config/csharp directory on Unix. The assemblies are
loaded before the source files are loaded.
.PP
C# script files are files
that have the extension .cs and they should only contain statements
and expressions, they can not contain full class definitions (at least
not as of Mono 2.0). Full class definitions should be compiled into
dlls and stored in that directory.
The C# shell will load all the C# script files and Mono assemblies
located in the ~/.config/csharp directory on Unix. C# script files
are files that have the extension .cs and they should only contain
statements and expressions, they can not contain full class
definitions (at least not as of Mono 2.0). Full class definitions
should be compiled into dlls and stored in that directory.
.SH AUTHORS
The Mono C# Compiler was written by Miguel de Icaza, Ravi Pratap,
Martin Baulig, Marek Safar and Raja Harinath. The development was
-3
View File
@@ -361,9 +361,6 @@ Shows the compiler version.
.I \-warnaserror, \-warnaserror+
Treat warnings as errors.
.TP
.I \-warnaserror:W1,[Wn]
Treats one or more compiler warnings as errors.
.TP
.I \-warn:LEVEL
Sets the warning level. 0 is the lowest warning level, and 4 is the
highest. The default is 4.
+1 -21
View File
@@ -31,29 +31,10 @@ The \fI.source\fR file has the following format:
<?xml version="1.0"?>
<monodoc>
<node label="LABEL" name="PATH" parent="PARENT">
<node label="LABEL2" name="PATH2" />
<!-- ... -->
</node>
<source provider="PROVIDER" basefile="BASEFILE" path="PATH" />
<!-- other <source/> elements -->
</monodoc>
.fi
The \fI/monodoc/node\fR node is an optional node that specifies where in the
monodoc tree the documentation should be displayed, and \fI//node\fR elements
may be nested to any depth to create trees. \fI//node/@label\fR is the label
that will be displayed within the monodoc tree.
.PP
\fI//node/@name\fR is the name of the monodoc tree node, and may be used as
the value of the \fI/monodoc/source/@path\fR value.
.PP
\fI//node/@parent\fR is the node name to use as the parent node.
\fI$MONO_INSTALL_PREFIX/lib/monodoc/monodoc.xml\fR contains a list of such
names, and this can be any \fI//node/@name\fR value. If the
\fI//node/@parent\fR value isn't found, then it's inserted under the
"Various" tree node.
.PP
The \fI/monodoc/source/@provider\fR attribute specifies which format provider
should be used when reading the \fI.tree\fR and \fI.zip\fR files; this
\fImust\fR correspond to one of the \fI--format\fR values.
@@ -66,8 +47,7 @@ value.
The \fI/monodoc/source/@path\fR attribute specifies the parent node in
\fBmonodoc\fR(1)'s tree view where the documentation will be inserted.
See the \fI$MONO_INSTALL_PREFIX/lib/monodoc/monodoc.xml\fR
file for a list of \fIPATH\fR values (the \fI//node/@name\fR values), or it
may be a \fI//node/@name\fR value in the same \fI.source\fR file.
file for a list of \fIPATH\fR values (the \fI//node/@name\fR values).
.PP
Once the \fIBASEFILE.source\fR has been written, the documentation can be
installed so that \fBmonodoc\fR(1) will display the documentation with the
+21 -61
View File
@@ -548,7 +548,7 @@ repository.
.PP
This profiler is activated passing the \fB--profile=logging\fR option to
the mono runtime, and is controlled attaching further options, like
\fB--profile=logging:statistical\fR for doing statistical profiling (multiple
\fB--profile=logging:stat\fR for doing statistical profiling (multiple
options are separated by commas).
.PP
As a quick primer, here are a few examples of the most common usage modes:
@@ -557,70 +557,32 @@ To write the resulting data to "mydata.mprof" (defaults to statistical
profiling):
.nf
mono --profile=logging:output=mydata.mprof program.exe
mono --profile=logging:o=mydata.mprof program.exe
.fi
.PP
To perform statistical profiling, inspecting call chains up to depth 8:
.nf
mono --profile=logging:statistical=8 program.exe
mono --profile=logging:s=8 program.exe
.fi
.PP
To profile allocations (by default the call stack will be analized for
each allocation, producing detailed caller method attribution infornation):
To profile allocations with caller method attribution:
.nf
mono --profile=logging:allocations program.exe
mono --profile=logging:a,ts program.exe
.fi
.PP
To profile garbage collection activity at a high level (collection time and objects freed
at each collection for each class are reported, but heap snapshots are not saved to disk):
To profile garbage collection activity (collection time and objects freed
at each collection):
.nf
mono --profile=logging:allocations-summary program.exe
mono --profile=logging:g,as program.exe
.fi
.PP
To perform heap profiling taking heap snapshots:
.nf
mono --profile=logging:heap=all program.exe
mono --profile=logging:heap=<signal> program.exe
.fi
If "all" is specified, a heap snapshot is taken at each collection.
If, instead, a signal name or number is given (one of SIGUSR1, SIGUSR2 and
SIGPROF, remembering that SIGPROF is not compatible with the statistical
profiler), a garbage collection is forced and a snapshot is taken every
time the signal is received.
Heap profiling also enables full allocation profiling (with call stacks),
and each allocation can be related to its corresponding object in the
snapshots, enabling investigations like "find all objects of a given class
allocated by a given method and still live at a given collection, and then
find all objects referencing them".
.PP
Then you would need to invoke the decoder \fImprof-decoder(1)\fR
on the output file to see the profiling results, or to examine heap
snapshots and allocations in detail \fImprof-heap-viewer(1)\fR.
on the output file to see the profiling results.
.PP
The operating modes described above are the default ones, and are sufficient
to use the profiler.
.PP
To further customize the profiler behavior there are more options, described
below.
These options can be individually enabled and disabled prefixing them with
an (optional) '+' character or a '-' character.
For instance, the "allocations" option by default records also the full call
stack at each allocation.
If only the caller is wanted, one should use "allocations,-save-allocation-stack",
or to disable call tracking completely (making the profiler less intrusive)
"allocations,-save-allocation-caller,-save-allocation-stack".
In practice the "allocation" option by default behaves like
"allocations,save-allocation-caller,save-allocation-stack", but the user can
tune this to his needs.
.PP
These are all the available options, organized by category:
These are all the available oprions, organized by category:
.PP
\fBExecution profiling modes\fR
.RS
@@ -656,20 +618,18 @@ will use the stack data).
.TP
\fIallocations\fR, \fIalloc\fR or \fIa\fR
Collect information about each allocation (object class and size).
By default this also implies "+save-allocation-caller" and
"+save-allocation-stack".
.TP
\fIsave-allocation-caller\fR, \fIsac\fR
Save the direct caller of each allocation. The profiler filters out wrapper
methods, and also recognizes if the allocation has been performed by the
runtime while jitting a method.
If combined with the "ts" option, for each allocation the profiler will
also show the responsible method (and also correctly dintinguish allocations
performed during JIT time).
These information are also available when combining the "a" and "c" options,
but since "c" is much more intrusive "ts" should be preferred.
.TP
\fIsave-allocation-stack\fR, \fIsas\fR
Save the full managed execution stack at each allocation.
While the "sac" option saves the direct caller, this one records the whole
stack trace.
Note that in the call stack the wrapper methods are not filtered out.
Anyway the "sac" and "sas" options can be combined, and the decoder will
Save the execution stack at each allocation. While the "ts" option saves the
direct caller, this one records the whole stack trace. Note that for technical
reasons the decoder will correctly ignore wrapper methods only using the data
saved by the "ts" option (the stack traces still contain all the wrappers).
Anyway the "ts" and "sas" options can be combined, and the decoder will
attribute the allocation to the correct method even if the wrapper is at the
top of the stack trace.
.TP
@@ -1295,7 +1255,7 @@ The default is 180 seconds.
\fBMONO_THREADS_PER_CPU\fR
The maximum number of threads in the general threadpool will be
20 + (MONO_THREADS_PER_CPU * number of CPUs). The default value for this
variable is 10.
variable is 5.
.TP
\fBMONO_XMLSERIALIZER_THS\fR
Controls the threshold for the XmlSerializer to produce a custom
+162
View File
@@ -0,0 +1,162 @@
.TH vbnc 1 "21 February 2006"
.SH NAME
vbnc \- Mono Visual Basic Compiler.
.SH SYNOPSIS
.B vbnc
[option] [source-files]
.SH DESCRIPTION
.PP
.I (vbnc)
is a CIL compiler for the VisualBasic.NET language.
.PP
Applications developed on Windows with vbc can execute on Mono and applications
compiled with 'vbnc' can be executed on .NET runtime.
.PP
The Mono Visual Basic compiler accepts the same options as
the Microsoft VB.NET compiler. Those options can start with a slash or a
dash (/checked is the same as -checked).
.PP
Visual Basic.NET source files normally ends with a ".vb" extension.
Compilation of VB.NET source code requires all the files that make
up a library, module or executable to be provided on the command line.
There is no support for partial compilation. To achieve the benefits
of partial compilation, you should compile programs into their own
assemblies, and later reference them with the "-r" flag.
.PP
The Mono Basic compiler generates images (.exe files) that contain
CIL byte code that can be executed by any system that implements a Common
Language Infrastructure virtual machine such as the Microsoft .NET
runtime engine on Windows or the Mono runtime engine on Unix systems.
Executables are not bound to a specific CPU or operating system.
.PP
The Mono Basic compiler by default only references these assemblies:
mscorlib.dll, Microsoft.VisualBasic.dll, System.dll and System.Xml.dll.
If you want to reference extra libraries you must manually specify
them using the the -r: command line option.
.PP
.SH OPTIONS
.TP
.I \-addmodule:MODULE1[,MODULE2]
Includes the specified modules in the resulting assembly.
.TP
.I -codepage:ID
Specifies the code page used to process the input files from the
point it is specified on. By default files will be processed in the
current code page. The compiler will also automatically detect
Unicode/UTF8 files that have an embedded byte mark at the beginning.
.TP
Other popular encodings are 28591 (Latin1), 1252 (iso-8859-1) and 65001 (UTF-8).
.TP
.I \-define:SYMLIST, -d:SYMLIST
Defines the symbol listed by the semi-colon separeted list SYMLIST
SYMBOL. This can be tested in the source code by the pre-processor,
or can be used by methods that have been tagged with the Conditional
attribute.
.TP
.I \-debug:AMOUNT
Specify the amount of debugging information to emit. Possible values for
AMOUNT are "full" and "pdbonly".
.TP
.I \-imports:import-list
Declare global Imports for listed namespaces.
.TP
.I \-ignorewarn:XXXX
Ignores warning number XXXX.
.TP
.I -lib:PATHLIST, -libpath:PATHLIST
Each path specified in the comma-separated list will direct the
compiler to look for libraries in that specified path.
.TP
.I \-main:CLASS
Tells the compiler which CLASS or MODULE contains the entry point. Useful when
you are compiling several classes with a Main method.
.TP
.I \-nologo
Suppress printing copyright information on startup.
.TP
.I \-nostdlib, -nostdlib+
Use this flag if you want to compile the core library. This makes the
compiler load its internal types from the assembly being compiled.
.TP
.I \-noconfig, \-noconfig+
Disables the default compiler configuration to be loaded. The
compiler by default has references to the system assemblies.
.TP
.I \-nowarn
Makes the compiler ignore warnings.
.TP
.I \-optioncompare:binary, \-optioncompare:text
Select between binary and text string comparisons. The default is binary
string comparisons.
.TP
.I \-optionexplicit[+|-]
Require explicit declaration of variables
.TP
.I \-optionstrict[+|-]
Enforce strict language semantics
.TP
.I \-out:FNAME, -o FNAME
Names the output file to be generated.
.TP
.I -q -quiet
Commands the compiler to show only error messages for syntax-related errors
and warnings.
.TP
.I -resource:RESOURCE[,ID]
Embeds to the given resource file. The optional ID can be used to
give a different name to the resource. If not specified, the resource
name will be the file name.
.TP
.I -linkresource:RESOURCE[,ID]
Links to the specified RESOURCE. The optional ID can be used to give
a name to the linked resource.
.TP
.I -r:ASSEMBLY1[,ASSEMBLY2], \-r ASSEMBLY1[,ASSEMBLY2]
Reference the named assemblies. Use this to use classes from the named
assembly in your program. The assembly will be loaded from either the
system directory where all the assemblies live, or from the path
explicitly given with the -L option.
.PP
You can also use a semicolon to separate the assemblies instead of a
comma.
.TP
.I \-removeintchecks[+|-]
Remove integer checks. Default off.
.TP
.I \-rootnamespace:namespace
Specifies the root namespace for all type declarations
.TP
.I \-target:KIND, \-t:KIND
Used to specify the desired target. The possible values are: exe
(plain executable), winexe (Windows.Forms executable), library
(component libraries) and module (partial library).
.TP
.I \-utf8output[+|-]
Emit compiler output in UTF8 character encoding. Currently ignored.
.TP
.I \-\-version
Shows the compiler version.
.TP
.I \-warnaserror, \-warnaserror+
Treat warnings as errors.
.SH STABILITY
As of early 2007, the Mono Visual Basic compiler is still considered preview
software. The compiler is almost feature-complete (targeting the Microsoft
Visual Basic 8 compiler), only lacking support for the 'My' namespace.
Frequent crashes are still occuring, especially with incorrect code.
.PP
.SH AUTHORS
See the ChangeLog for authors
.PP
.SH LICENSE
The Mono Visual Basic compiler is released under the terms of the GNU LGPL.
Alternative licenses are available from Novell.
.PP
.SH SEE ALSO
mcs(1), mono(1), mint(1), sn(1)
.PP
.SH BUGS
To report bugs in the compiler, you can file bug reports in our
bug tracking system: http://bugzilla.ximian.com.
.SH MAILING LIST
The Mono Basic Mailing List is available at: [email protected]
-47
View File
@@ -1,50 +1,3 @@
2008-11-18 Jonathan Pryor <[email protected]>
* docs/Makefile: Don't build mono-file-formats.*, mono-tools.*
* docs/mono-file-formats.config, docs/mono-file-formats.source,
docs/mono-tools.config, docs/mono-tools.source: Removed (now located
in mono/docs).
2008-11-02 Jonathan Pryor <[email protected]>
* docs/Makefile (MONO_DIRS): Add Mono.Simd.
2008-10-31 Jonathan Pryor <[email protected]>
* docs/Makefile: Restructure the *.tree/*.zip rules to support
concurrent builds (`make -jN`).
2008-10-27 Jonathan Pryor <[email protected]>
* docs/Makefile (DISTFILES): Add mono-file-formats.config.
2008-10-22 Jonathan Pryor <[email protected]>
* docs (svn:ignore): Ignore generated files.
* docs/lang-csharp.source: Added; combined .source file for the C#
language specification and error reference.
* docs/Makefile: Support lang-csharp.source, mono-file-formats.*, etc.
* *.tree/*.zip should be rebuilt when Makefile is changed.
* docs/mono-file-formats.config, docs/mono-file-formats.source: Added;
moving file format documentation out from mono-tools.* so that it's
easier to find.
* docs/mono-tools.config: Move mdoc(5), mono-config(5) to
mono-file-formats.config.
* docs/mono-tools.source, docs/Mono.source, docs/netdocs.source,
docs/Novell.source, docs/nunit-docs.source: Add /monodoc/node
information so that the documentation is inserted into the correct
location.
* docs/monodoc.xml: Vastly simplify the default monodoc.xml as
structure can be/has been pushed out into the .source files. This
should help simplify the life of downstream packagers who wish to
add additional documentation to monodoc.
* docs/ecma334.source, docs/cs-errors.source: Remove (replaced with
lang-csharp.source).
2008-10-20 Jonathan Pryor <[email protected]>
* docs/Makefile (MONO_DIRS): Add Mono.Data.SqliteClient docs.
2008-10-18 Jonathan Pryor <[email protected]>
* docs/Makefile (MONODOC_INSTALL_DIR): Prefix path with $(DESTDIR) so
-12
View File
@@ -1,15 +1,3 @@
2008-11-05 Marek Habersack <[email protected]>
* Makefile (net_2_0_dirs): Npgsql requires .NET 2.0+ now.
2008-10-21 Atsushi Enomoto <[email protected]>
* Malefile: ... and Sys.ComponentModel.DataAnnotations.dll.
2008-10-21 Atsushi Enomoto <[email protected]>
* Malefile: added Sys.Web.DynamicData to the build.
2008-10-17 Jonathan Pryor <[email protected]>
* I18N/Makefile: Add doc-update target support.
+6 -5
View File
@@ -77,7 +77,10 @@ common_dirs := \
Novell.Directory.Ldap \
Mono.Security.Win32 \
System.DirectoryServices \
Mono.Messaging \
System.Messaging \
RabbitMQ.Client \
Mono.Messaging.RabbitMQ \
System.ServiceProcess \
System.Drawing.Design \
System.Design \
@@ -109,15 +112,13 @@ net_2_0_dirs := \
System.Web.Extensions.Design_1.0 \
System.Web.Extensions \
System.Web.Extensions.Design \
System.ComponentModel.DataAnnotations \
System.Web.DynamicData \
System.Runtime.Serialization \
System.IdentityModel \
System.IdentityModel.Selectors \
System.ServiceModel \
System.ServiceModel.Web \
Mono.Management \
Mono.Options \
System.ServiceModel.Web \
Mono.Management \
Mono.Options \
Mono.Simd
net_2_1_dirs := \
+1 -21
View File
@@ -1,28 +1,8 @@
2008-11-08 Andreia Gaita <[email protected]>
* SWF2k5-tests.csproj: Fix the previous ChangeLog entry (bad merge). Update
regenerated test project.
2008-11-08 Andreia Gaita <[email protected]>
* build-csproj2k5-tests: Added net_2_0 configuration to go along with the
profile targets (so MD doesn't complain at me)
2008-10-31 Andreia Gaita <[email protected]>
* System.Windows.Forms.dll.sources, SWF.csproj,
SWF2k5.csproj:
Added internal classes for debugging purposes
2008-10-23 Andreia Gaita <[email protected]>
* SWF.csproj, SWF2k5.csproj: Update project files
2008-09-29 Jonathan Pobst <[email protected]>
* System.Windows.Forms.dll.resources: Removed unused dialog-*.png images.
2008-09-18 Mike Gorse <[email protected]>
2008-09-18 Mike Gorse <<[email protected]>
* System.Windows.Forms.dll.sources: Added IKeyFilter.cs.
+91 -15
View File
@@ -228,16 +228,6 @@
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.Internal\Accessor.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.Internal\DebugHelper.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.PropertyGridInternal\PropertiesTab.cs"
SubType = "Code"
@@ -2078,11 +2068,6 @@
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms\IKeyFilter.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms\IMessageFilter.cs"
SubType = "Code"
@@ -3448,11 +3433,26 @@
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms\ThemeClearlooks.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms\ThemeEngine.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms\ThemeGtk.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms\ThemeNice.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms\ThemeVisualStyles.cs"
SubType = "Code"
@@ -4293,11 +4293,26 @@
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.Theming\ThemeElementsClearlooks.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.Theming\ThemeElementsDefault.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.Theming\ThemeElementsGtk.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.Theming\ThemeElementsNice.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.Theming\ThemeElementsVisualStyles.cs"
SubType = "Code"
@@ -4328,6 +4343,11 @@
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.Theming\Nice\TabControlPainter.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.Theming\VisualStyles\CheckBoxPainter.cs"
SubType = "Code"
@@ -4643,6 +4663,46 @@
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.X11Internal\X11Atoms.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.X11Internal\X11Display.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.X11Internal\X11Exception.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.X11Internal\X11Hwnd.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.X11Internal\X11RootHwnd.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.X11Internal\X11ThreadQueue.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.X11Internal\Xlib.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "System.Windows.Forms.X11Internal\XplatUIX11-new.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "resources\SplitterNS.cur"
CustomToolNameSpace = "System.Windows.Forms.SplitterNS.cur"
@@ -4787,14 +4847,30 @@
RelPath = "resources\user-home.png"
BuildAction = "EmbeddedResource"
/>
<File
RelPath = "resources\dialog-error.png"
BuildAction = "EmbeddedResource"
/>
<File
RelPath = "resources\16_dialog-error.png"
BuildAction = "EmbeddedResource"
/>
<File
RelPath = "resources\dialog-information.png"
BuildAction = "EmbeddedResource"
/>
<File
RelPath = "resources\16_dialog-information.png"
BuildAction = "EmbeddedResource"
/>
<File
RelPath = "resources\dialog-question.png"
BuildAction = "EmbeddedResource"
/>
<File
RelPath = "resources\dialog-warning.png"
BuildAction = "EmbeddedResource"
/>
<File
RelPath = "resources\16_dialog-warning.png"
BuildAction = "EmbeddedResource"
@@ -1,402 +1,353 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5E6430B2-6B9F-4E76-802E-20207EF80391}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>System.Windows.Forms_test</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<RootNamespace>
</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>.\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1,NET_2_0,__MonoCS__,DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms_test_net_2_0</AssemblyName>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 2.0|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_2_0 __MonoCS__ DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms_test</AssemblyName>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1 ONLY_1_1 __MonoCS__</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms_test</AssemblyName>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release 2.0|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_2_0 __MonoCS__</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
<OutputType>Library</OutputType>
<AssemblyName>System.Windows.Forms_test</AssemblyName>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'net_2_0|AnyCPU' ">
<OutputPath>.\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1,NET_2_0,__MonoCS__,DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<AssemblyName>System.Windows.Forms_test_net_2_0</AssemblyName>
<OutputType>Library</OutputType>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\winforms-unittests\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Accessibility">
<Name>Accessibility</Name>
</Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
</Reference>
<Reference Include="System.Windows.Forms">
<Name>System.Windows.Forms</Name>
</Reference>
<Reference Include="System.Xml">
<Name>System.Xml</Name>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Test\System.Windows.Forms\ApplicationTest.cs" />
<Compile Include="Test\System.Windows.Forms\AutoCompleteStringCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ApplicationContextTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingsCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingContextTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingManagerBaseTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingMemberInfoTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingNavigatorTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingSourceTest.cs" />
<Compile Include="Test\System.Windows.Forms\ButtonBaseTest.cs" />
<Compile Include="Test\System.Windows.Forms\ButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckBoxEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckedListBoxEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckedListBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ColumnClickEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ColumnHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\ColumnStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\ComboBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\Common.cs" />
<Compile Include="Test\System.Windows.Forms\CommonDialogsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ContainerControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ContextMenuTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlBindingsCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlBindingsConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlHandleTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlLogger.cs" />
<Compile Include="Test\System.Windows.Forms\ControlLogger2.cs" />
<Compile Include="Test\System.Windows.Forms\ControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlPaintTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlPropertyEventsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\CursorTest.cs" />
<Compile Include="Test\System.Windows.Forms\CurrencyManagerTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataBindingTests.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridColumnStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTableStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTextBoxColumnTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewAdvancedBorderStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewBandTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewButtonCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCellCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCellStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCheckBoxCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewClipboardHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewClipboardTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewColumnCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewColumnHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewColumnTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewComboBoxCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCommon.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewDataBindingTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewElementTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewLinkCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewImageCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewRowCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewRowHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewRowTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxColumnTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataObjectTest.cs" />
<Compile Include="Test\System.Windows.Forms\DateTimePickerTest.cs" />
<Compile Include="Test\System.Windows.Forms\DefaultLayoutTest.cs" />
<Compile Include="Test\System.Windows.Forms\DragEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ErrorProviderTest.cs" />
<Compile Include="Test\System.Windows.Forms\FlowPanelTests.cs" />
<Compile Include="Test\System.Windows.Forms\FocusTest.cs" />
<Compile Include="Test\System.Windows.Forms\FolderBrowserDialogTest.cs" />
<Compile Include="Test\System.Windows.Forms\FormEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\FormHandleTest.cs" />
<Compile Include="Test\System.Windows.Forms\FormTest.cs" />
<Compile Include="Test\System.Windows.Forms\EventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\EventLogger.cs" />
<Compile Include="Test\System.Windows.Forms\GridColumnStylesCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\GridTableStylesCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\GroupBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\HelpProviderTest.cs" />
<Compile Include="Test\System.Windows.Forms\HScrollPropertiesTest.cs" />
<Compile Include="Test\System.Windows.Forms\ImageKeyConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\ImageListStreamerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ImageListTest.cs" />
<Compile Include="Test\System.Windows.Forms\InputLanguageTest.cs" />
<Compile Include="Test\System.Windows.Forms\KeyEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\KeysConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\LabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\LinkAreaTest.cs" />
<Compile Include="Test\System.Windows.Forms\LinkConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\LinkLabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBindingHelperTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBoxEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewCollectionsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewGroupTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewGroupCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\MaskedTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\MdiFormHandleTest.cs" />
<Compile Include="Test\System.Windows.Forms\MdiFormTest.cs" />
<Compile Include="Test\System.Windows.Forms\MessageTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuStripTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\MonthCalendarTest.cs" />
<Compile Include="Test\System.Windows.Forms\NotifyIconTest.cs" />
<Compile Include="Test\System.Windows.Forms\NumericUpDownTest.cs" />
<Compile Include="Test\System.Windows.Forms\PaddingTest.cs" />
<Compile Include="Test\System.Windows.Forms\PaddingConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\PaintEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\PanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\PictureBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\PrintDialogTest.cs" />
<Compile Include="Test\System.Windows.Forms\ProgressBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\PropertyGridTest.cs" />
<Compile Include="Test\System.Windows.Forms\PropertyManagerTest.cs" />
<Compile Include="Test\System.Windows.Forms\RadioButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\RowStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\RichTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\SaveFileDialogTest.cs" />
<Compile Include="Test\System.Windows.Forms\ScrollableControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ScrollBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\SelectionRangeTest.cs" />
<Compile Include="Test\System.Windows.Forms\SendKeysTest.cs" />
<Compile Include="Test\System.Windows.Forms\SplitterTest.cs" />
<Compile Include="Test\System.Windows.Forms\SplitContainerTests.cs" />
<Compile Include="Test\System.Windows.Forms\StatusBarPanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\StatusBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\StatusStripTest.cs" />
<Compile Include="Test\System.Windows.Forms\SystemInformationTest.cs" />
<Compile Include="Test\System.Windows.Forms\TabControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\TableLayoutTest.cs" />
<Compile Include="Test\System.Windows.Forms\TestHelper.cs" />
<Compile Include="Test\System.Windows.Forms\TestImageIndexConverter.cs" />
<Compile Include="Test\System.Windows.Forms\TextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\TimerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolBarButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripComboBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripContainerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripContentPanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripControlHostTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripDropDownTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripItemCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripLabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripManagerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripMenuItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripOverflowButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripOverflowTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripPanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripProgressBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripSeparatorTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripStatusLabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolTipTest.cs" />
<Compile Include="Test\System.Windows.Forms\TrackBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeNodeCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeNodeTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewHitTestInfoTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewImageKeyConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewImageIndexConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewEventsTest.cs" />
<Compile Include="Test\System.Windows.Forms\UpDownTest.cs" />
<Compile Include="Test\System.Windows.Forms\UserControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\VScrollPropertiesTest.cs" />
<Compile Include="Test\System.Windows.Forms.Layout\TableLayoutSettingsTypeConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms.Layout\ArrangedElementCollectionTest.cs" />
<Compile Include="Test\System.Resources\CompatTest.cs" />
<Compile Include="Test\System.Resources\CultureTest.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeTest.cs" />
<Compile Include="Test\System.Resources\ResXFileRefTest.cs" />
<Compile Include="Test\System.Resources\ResXResourceReaderTest.cs" />
<Compile Include="Test\System.Resources\WriterTest.cs" />
<Compile Include="..\..\build\common\Consts.cs">
<Link>Consts.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="Test\System.Windows.Forms\ChangeLog" />
</ItemGroup>
<ItemGroup>
<None Include="Test\System.Resources\ChangeLog" />
</ItemGroup>
<ItemGroup>
<None Include="Test\System.Windows.Forms.Layout\ChangeLog" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
<ProjectGuid>{5E6430B2-6B9F-4E76-802E-20207EF80391}</ProjectGuid>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
</Project>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5E6430B2-6B9F-4E76-802E-20207EF80391}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>System.Windows.Forms_test</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<RootNamespace>
</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1 ONLY_1_1 __MonoCS__ DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 2.0|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_2_0 __MonoCS__ DEBUG</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_1_1 ONLY_1_1 __MonoCS__</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release 2.0|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>NET_2_0 __MonoCS__</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>3</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\winforms-unittests\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Accessibility">
<Name>Accessibility</Name>
</Reference>
<Reference Include="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Drawing">
<Name>System.Drawing</Name>
</Reference>
<Reference Include="System.Windows.Forms">
<Name>System.Windows.Forms</Name>
</Reference>
<Reference Include="System.Xml">
<Name>System.Xml</Name>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="common\Consts.cs" />
<Compile Include="Test\System.Windows.Forms\ApplicationTest.cs" />
<Compile Include="Test\System.Windows.Forms\AutoCompleteStringCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ApplicationContextTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingsCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingContextTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingManagerBaseTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingMemberInfoTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingNavigatorTest.cs" />
<Compile Include="Test\System.Windows.Forms\BindingSourceTest.cs" />
<Compile Include="Test\System.Windows.Forms\ButtonBaseTest.cs" />
<Compile Include="Test\System.Windows.Forms\ButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckBoxEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckedListBoxEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\CheckedListBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ColumnClickEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ColumnHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\ColumnStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\ComboBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\Common.cs" />
<Compile Include="Test\System.Windows.Forms\CommonDialogsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ContainerControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ContextMenuTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlBindingsCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlBindingsConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlHandleTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlLogger.cs" />
<Compile Include="Test\System.Windows.Forms\ControlLogger2.cs" />
<Compile Include="Test\System.Windows.Forms\ControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlPaintTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlPropertyEventsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ControlStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\CursorTest.cs" />
<Compile Include="Test\System.Windows.Forms\CurrencyManagerTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataBindingTests.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridColumnStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTableStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTextBoxColumnTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewAdvancedBorderStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewBandTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewButtonCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCellCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCellStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCheckBoxCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewClipboardHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewClipboardTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewColumnCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewColumnHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewColumnTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewComboBoxCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewCommon.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewDataBindingTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewElementTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewLinkCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewImageCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewRowCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewRowHeaderTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewRowTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxCellTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataGridViewTextBoxColumnTest.cs" />
<Compile Include="Test\System.Windows.Forms\DataObjectTest.cs" />
<Compile Include="Test\System.Windows.Forms\DateTimePickerTest.cs" />
<Compile Include="Test\System.Windows.Forms\DefaultLayoutTest.cs" />
<Compile Include="Test\System.Windows.Forms\DragEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ErrorProviderTest.cs" />
<Compile Include="Test\System.Windows.Forms\FlowPanelTests.cs" />
<Compile Include="Test\System.Windows.Forms\FocusTest.cs" />
<Compile Include="Test\System.Windows.Forms\FolderBrowserDialogTest.cs" />
<Compile Include="Test\System.Windows.Forms\FormHandleTest.cs" />
<Compile Include="Test\System.Windows.Forms\FormTest.cs" />
<Compile Include="Test\System.Windows.Forms\EventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\EventLogger.cs" />
<Compile Include="Test\System.Windows.Forms\GridColumnStylesCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\GridTableStylesCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\GroupBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\HelpProviderTest.cs" />
<Compile Include="Test\System.Windows.Forms\HScrollPropertiesTest.cs" />
<Compile Include="Test\System.Windows.Forms\ImageKeyConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\ImageListStreamerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ImageListTest.cs" />
<Compile Include="Test\System.Windows.Forms\InputLanguageTest.cs" />
<Compile Include="Test\System.Windows.Forms\KeyEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\KeysConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\LabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\LinkAreaTest.cs" />
<Compile Include="Test\System.Windows.Forms\LinkConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\LinkLabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBindingHelperTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBoxEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewCollectionsTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewEventTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewGroupTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewGroupCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ListViewItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\MaskedTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\MdiFormHandleTest.cs" />
<Compile Include="Test\System.Windows.Forms\MdiFormTest.cs" />
<Compile Include="Test\System.Windows.Forms\MessageTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuStripTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuTest.cs" />
<Compile Include="Test\System.Windows.Forms\MenuItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\MonthCalendarTest.cs" />
<Compile Include="Test\System.Windows.Forms\NotifyIconTest.cs" />
<Compile Include="Test\System.Windows.Forms\NumericUpDownTest.cs" />
<Compile Include="Test\System.Windows.Forms\PaddingTest.cs" />
<Compile Include="Test\System.Windows.Forms\PaddingConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\PaintEventArgsTest.cs" />
<Compile Include="Test\System.Windows.Forms\PanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\PictureBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\PrintDialogTest.cs" />
<Compile Include="Test\System.Windows.Forms\ProgressBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\PropertyGridTest.cs" />
<Compile Include="Test\System.Windows.Forms\PropertyManagerTest.cs" />
<Compile Include="Test\System.Windows.Forms\RadioButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\RowStyleTest.cs" />
<Compile Include="Test\System.Windows.Forms\RichTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\SaveFileDialogTest.cs" />
<Compile Include="Test\System.Windows.Forms\ScrollableControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\ScrollBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\SelectionRangeTest.cs" />
<Compile Include="Test\System.Windows.Forms\SendKeysTest.cs" />
<Compile Include="Test\System.Windows.Forms\SplitterTest.cs" />
<Compile Include="Test\System.Windows.Forms\SplitContainerTests.cs" />
<Compile Include="Test\System.Windows.Forms\StatusBarPanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\StatusBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\StatusStripTest.cs" />
<Compile Include="Test\System.Windows.Forms\SystemInformationTest.cs" />
<Compile Include="Test\System.Windows.Forms\TabControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\TableLayoutTest.cs" />
<Compile Include="Test\System.Windows.Forms\TestHelper.cs" />
<Compile Include="Test\System.Windows.Forms\TestImageIndexConverter.cs" />
<Compile Include="Test\System.Windows.Forms\TextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\TimerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolBarButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripComboBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripContainerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripContentPanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripControlHostTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripDropDownTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripItemCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripLabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripManagerTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripMenuItemTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripOverflowButtonTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripOverflowTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripPanelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripProgressBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripSeparatorTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripStatusLabelTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolStripTextBoxTest.cs" />
<Compile Include="Test\System.Windows.Forms\ToolTipTest.cs" />
<Compile Include="Test\System.Windows.Forms\TrackBarTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeNodeCollectionTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeNodeTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewHitTestInfoTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewImageKeyConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewImageIndexConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewTest.cs" />
<Compile Include="Test\System.Windows.Forms\TreeViewEventsTest.cs" />
<Compile Include="Test\System.Windows.Forms\UpDownTest.cs" />
<Compile Include="Test\System.Windows.Forms\UserControlTest.cs" />
<Compile Include="Test\System.Windows.Forms\VScrollPropertiesTest.cs" />
<Compile Include="Test\System.Windows.Forms.Layout\TableLayoutSettingsTypeConverterTest.cs" />
<Compile Include="Test\System.Windows.Forms.Layout\ArrangedElementCollectionTest.cs" />
<Compile Include="Test\System.Resources\CompatTest.cs" />
<Compile Include="Test\System.Resources\CultureTest.cs" />
<Compile Include="Test\System.Resources\ResXDataNodeTest.cs" />
<Compile Include="Test\System.Resources\ResXFileRefTest.cs" />
<Compile Include="Test\System.Resources\ResXResourceReaderTest.cs" />
<Compile Include="Test\System.Resources\WriterTest.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Test\System.Windows.Forms\ChangeLog" />
</ItemGroup>
<ItemGroup>
<None Include="Test\System.Resources\ChangeLog" />
</ItemGroup>
<ItemGroup>
<None Include="Test\System.Windows.Forms.Layout\ChangeLog" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
+19 -3
View File
@@ -173,8 +173,6 @@
<Compile Include="System.Windows.Forms.Design\ToolStripItemDesignerAvailability.cs" />
<Compile Include="System.Windows.Forms.Design\ToolStripItemDesignerAvailabilityAttribute.cs" />
<Compile Include="System.Windows.Forms.Design\WindowsFormsComponentEditor.cs" />
<Compile Include="System.Windows.Forms.Internal\Accessor.cs" />
<Compile Include="System.Windows.Forms.Internal\DebugHelper.cs" />
<Compile Include="System.Windows.Forms.PropertyGridInternal\PropertiesTab.cs" />
<Compile Include="System.Windows.Forms.RTF\Charcode.cs" />
<Compile Include="System.Windows.Forms.RTF\Charset.cs" />
@@ -543,7 +541,6 @@
<Compile Include="System.Windows.Forms\IDropTarget.cs" />
<Compile Include="System.Windows.Forms\IFeatureSupport.cs" />
<Compile Include="System.Windows.Forms\IFileReaderService.cs" />
<Compile Include="System.Windows.Forms\IKeyFilter.cs" />
<Compile Include="System.Windows.Forms\IMessageFilter.cs" />
<Compile Include="System.Windows.Forms\IRootGridEntry.cs" />
<Compile Include="System.Windows.Forms\IWin32Window.cs" />
@@ -817,7 +814,10 @@
<Compile Include="System.Windows.Forms\TextImageRelation.cs" />
<Compile Include="System.Windows.Forms\TextRenderer.cs" />
<Compile Include="System.Windows.Forms\Theme.cs" />
<Compile Include="System.Windows.Forms\ThemeClearlooks.cs" />
<Compile Include="System.Windows.Forms\ThemeEngine.cs" />
<Compile Include="System.Windows.Forms\ThemeGtk.cs" />
<Compile Include="System.Windows.Forms\ThemeNice.cs" />
<Compile Include="System.Windows.Forms\ThemeVisualStyles.cs" />
<Compile Include="System.Windows.Forms\ThemeWin32Classic.cs" />
<Compile Include="System.Windows.Forms\ThreadExceptionDialog.cs" />
@@ -986,13 +986,17 @@
<Compile Include="System.Windows.Forms.CarbonInternal\Structs.cs" />
<Compile Include="System.Windows.Forms.CarbonInternal\WindowHandler.cs" />
<Compile Include="System.Windows.Forms.Theming\ThemeElements.cs" />
<Compile Include="System.Windows.Forms.Theming\ThemeElementsClearlooks.cs" />
<Compile Include="System.Windows.Forms.Theming\ThemeElementsDefault.cs" />
<Compile Include="System.Windows.Forms.Theming\ThemeElementsGtk.cs" />
<Compile Include="System.Windows.Forms.Theming\ThemeElementsNice.cs" />
<Compile Include="System.Windows.Forms.Theming\ThemeElementsVisualStyles.cs" />
<Compile Include="System.Windows.Forms.Theming\Default\ButtonPainter.cs" />
<Compile Include="System.Windows.Forms.Theming\Default\CheckBoxPainter.cs" />
<Compile Include="System.Windows.Forms.Theming\Default\RadioButtonPainter.cs" />
<Compile Include="System.Windows.Forms.Theming\Default\TabControlPainter.cs" />
<Compile Include="System.Windows.Forms.Theming\Default\ToolStripPainter.cs" />
<Compile Include="System.Windows.Forms.Theming\Nice\TabControlPainter.cs" />
<Compile Include="System.Windows.Forms.Theming\VisualStyles\CheckBoxPainter.cs" />
<Compile Include="System.Windows.Forms.Theming\VisualStyles\RadioButtonPainter.cs" />
<Compile Include="System.Windows.Forms.Theming\VisualStyles\TabControlPainter.cs" />
@@ -1160,12 +1164,24 @@
<EmbeddedResource Include="resources\user-home.png">
<LogicalName>user-home.png</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="resources\dialog-error.png">
<LogicalName>dialog-error.png</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="resources\16_dialog-error.png">
<LogicalName>16_dialog-error.png</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="resources\dialog-information.png">
<LogicalName>dialog-information.png</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="resources\16_dialog-information.png">
<LogicalName>16_dialog-information.png</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="resources\dialog-question.png">
<LogicalName>dialog-question.png</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="resources\dialog-warning.png">
<LogicalName>dialog-warning.png</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="resources\16_dialog-warning.png">
<LogicalName>16_dialog-warning.png</LogicalName>
</EmbeddedResource>
@@ -1,7 +0,0 @@
2008-10-31 Andreia Gaita <[email protected]>
* DebugHelper.cs: Wrapper for Debug.* methods,
with some extras to ease debugging.
* Accessor.cs: Provides access to various internal properties, for
testing purposes.
@@ -1,281 +0,0 @@
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
// Copyright (c) 2008 Novell, Inc.
//
// Authors:
// Andreia Gaita ([email protected])
//
//#define DEBUG
//#define TRACE
using System;
#if NET_2_0
using System.Collections.Generic;
#else
using System.Collections;
#endif
using System.Reflection;
using System.Text;
using System.IO;
using System.Diagnostics;
namespace System.Windows.Forms
{
internal class DebugHelper
{
static DebugHelper () {
Debug.AutoFlush = true;
}
struct Data {
public MethodBase method;
public object[] args;
public Data (MethodBase m, object[] a) {
this.method = m;
this.args = a;
}
}
#if NET_2_0
static Stack<Data> methods = new Stack<Data>();
#else
class DataStack : System.Collections.Stack {
public new Data Peek () {
return (Data) base.Peek ();
}
public new Data Pop () {
return (Data) base.Pop ();
}
public DataStack (int initialCapacity) : base (initialCapacity) {}
public DataStack () : base () {}
public DataStack (ICollection icol) : base (icol) {}
}
static DataStack methods = new DataStack();
#endif
[Conditional("DEBUG")]
internal static void DumpCallers () {
StackTrace trace = new StackTrace(true);
int count = trace.FrameCount;
Debug.Indent ();
for (int i = 1; i < count; i++) {
StackFrame parentFrame = trace.GetFrame(i);
MethodBase parentMethod = parentFrame.GetMethod();
string file = parentFrame.GetFileName();
if (file != null && file.Length > 1)
file = file.Substring (file.LastIndexOf (Path.DirectorySeparatorChar) + 1);
Debug.WriteLine(parentMethod.DeclaringType.Name + "." + parentMethod.Name +
" at " + file + ":" + parentFrame.GetFileLineNumber()
);
}
Debug.Unindent ();
}
[Conditional("DEBUG")]
internal static void DumpCallers (int count) {
StackTrace trace = new StackTrace(true);
int c = (count > trace.FrameCount ? trace.FrameCount : count);
Debug.Indent ();
for (int i = 1; i < c; i++) {
StackFrame parentFrame = trace.GetFrame(i);
MethodBase parentMethod = parentFrame.GetMethod();
string file = parentFrame.GetFileName();
if (file != null && file.Length > 1)
file = file.Substring (file.LastIndexOf (Path.DirectorySeparatorChar) + 1);
Debug.WriteLine(parentMethod.DeclaringType.Name + "." + parentMethod.Name +
" at " + file + ":" + parentFrame.GetFileLineNumber()
);
}
Debug.Unindent ();
}
[Conditional("DEBUG")]
internal static void Enter ()
{
StackTrace trace = new StackTrace();
methods.Push (new Data (trace.GetFrame(1).GetMethod(), null));
Print ();
Debug.Indent ();
}
[Conditional("DEBUG")]
internal static void Enter (object[] args)
{
StackTrace trace = new StackTrace();
methods.Push (new Data (trace.GetFrame(1).GetMethod(), args));
Print ();
Debug.Indent ();
}
[Conditional("DEBUG")]
internal static void Leave ()
{
if (methods.Count > 0) {
methods.Pop ();
Debug.Unindent ();
}
}
[Conditional("DEBUG")]
internal static void Print ()
{
if (methods.Count == 0)
return;
Data data = methods.Peek ();
Debug.WriteLine (data.method.DeclaringType.Name + "." + data.method.Name);
}
[Conditional("DEBUG")]
internal static void Print (int index)
{
if (methods.Count == 0 || methods.Count <= index || index < 0)
return;
#if NET_2_0
Stack<Data> temp = new Stack<Data>(index-1);
#else
DataStack temp = new DataStack(index-1);
#endif
for (int i = 0; i < index; i++)
temp.Push (methods.Pop ());
Data data = methods.Peek ();
for (int i = 0; i < temp.Count; i++)
methods.Push (temp.Pop());
temp = null;
Debug.WriteLine (data.method.DeclaringType.Name + "." + data.method.Name);
}
[Conditional("DEBUG")]
internal static void Print (string methodName, string parameterName)
{
if (methods.Count == 0)
return;
#if NET_2_0
Stack<Data> temp = new Stack<Data>();
#else
DataStack temp = new DataStack();
#endif
Data data = methods.Peek ();
bool foundit = false;
for (int i = 0; i < methods.Count; i++)
{
data = methods.Peek ();
if (data.method.Name.Equals (methodName)) {
foundit = true;
break;
}
temp.Push (methods.Pop ());
}
for (int i = 0; i < temp.Count; i++)
methods.Push (temp.Pop());
temp = null;
if (!foundit)
return;
Debug.WriteLine (data.method.DeclaringType.Name + "." + data.method.Name);
ParameterInfo[] pi = data.method.GetParameters ();
for (int i = 0; i < pi.Length; i++) {
if (pi[i].Name == parameterName) {
Debug.Indent ();
Debug.Write (parameterName + "=");
if (pi[i].ParameterType == typeof(IntPtr))
Debug.WriteLine (String.Format ("0x{0:x}", ((IntPtr)data.args[i]).ToInt32()));
else
Debug.WriteLine (data.args[i]);
Debug.Unindent ();
}
}
}
[Conditional("DEBUG")]
internal static void Print (string parameterName)
{
if (methods.Count == 0)
return;
Data data = methods.Peek ();
ParameterInfo[] pi = data.method.GetParameters ();
for (int i = 0; i < pi.Length; i++) {
if (pi[i].Name == parameterName) {
Debug.Indent ();
Debug.Write (parameterName + "=");
if (pi[i].ParameterType == typeof(IntPtr))
Debug.WriteLine (String.Format ("0x{0:x}", data.args[i]));
else
Debug.WriteLine (data.args[i]);
Debug.Unindent ();
}
}
}
[Conditional("DEBUG")]
internal static void WriteLine (object arg)
{
Debug.WriteLine (arg);
}
[Conditional("DEBUG")]
internal static void WriteLine (string format, params object[] arg)
{
Debug.WriteLine (String.Format (format, arg));
}
[Conditional("DEBUG")]
internal static void WriteLine (string message)
{
Debug.WriteLine (message);
}
[Conditional("DEBUG")]
internal static void Indent ()
{
Debug.Indent ();
}
[Conditional("DEBUG")]
internal static void Unindent ()
{
Debug.Unindent ();
}
[Conditional("TRACE")]
internal static void TraceWriteLine (string format, params object[] arg)
{
Debug.WriteLine (String.Format (format, arg));
}
[Conditional("TRACE")]
internal static void TraceWriteLine (string message)
{
Debug.WriteLine (message);
}
}
}
@@ -1,15 +1,3 @@
2008-11-07 Jonathan Pobst <[email protected]>
* DefaultLayout.cs: Apply patch from Jonathan Anderson that keeps
undocked autosize controls from moving when resized.
[Fixes bug #439479]
2008-11-06 Jonathan Pobst <[email protected]>
* DefaultLayout.cs: Apply patch from Jonathan Anderson that better
handles AutoSize controls when docked.
[Fixes bug #439443]
2008-10-13 Jonathan Pobst <[email protected]>
* TableLayout.cs: My previous fix broke a test, tweak it a bit.
@@ -171,17 +171,11 @@ namespace System.Windows.Forms.Layout
|| !child.AutoSize)
continue;
AnchorStyles anchor = child.Anchor;
left = child.Left;
top = child.Top;
Size preferredsize = GetPreferredControlSize (child);
if (((anchor & AnchorStyles.Left) != 0) || ((anchor & AnchorStyles.Right) == 0))
child.dist_right += child.Width - preferredsize.Width;
if (((anchor & AnchorStyles.Top) != 0) || ((anchor & AnchorStyles.Bottom) == 0))
child.dist_bottom += child.Height - preferredsize.Height;
child.SetBoundsInternal (left, top, preferredsize.Width, preferredsize.Height, BoundsSpecified.None);
}
}
@@ -253,7 +247,7 @@ namespace System.Windows.Forms.Layout
int height;
Size preferredsize = child.PreferredSize;
if (child.GetAutoSizeMode () == AutoSizeMode.GrowAndShrink || (child.Dock != DockStyle.None && !(child is Button))) {
if (child.GetAutoSizeMode () == AutoSizeMode.GrowAndShrink || child is TableLayoutPanel) {
width = preferredsize.Width;
height = preferredsize.Height;
} else {
@@ -1,161 +1,157 @@
2008-10-20 Jonathan Pobst <monkey@jpobst.com>
* ToolStripPainter.cs: Don't paint over a set BackgroundImage.
2008-10-09 Everaldo Canuto <[email protected]>
* LinkLabelPainter.cs: Take Padding into account when drawing the linklabel
text.
2008-10-08 Everaldo Canuto <[email protected]>
* LabelPainter.cs: Use control.PaddingClientRectangle instead of calculate
rectangle with padding. Also break some lines that theres more than 120
characters.
2008-09-24 Jonathan Pobst <[email protected]>
* TabControlPainter.cs: Add 1 pixel to the tab text rectangle
to keep the text from getting cut off on XP.
[Fixes bug #428116]
2008-09-16 Jonathan Pobst <monkey@jpobst.com>
* TabControlPainter.cs: Hook tab painting into ShowFocusCues.
2008-07-31 George Giolfan <georgegiolfan@yahoo.com>
* TabControlPainter.cs: Added DrawScrollButton, GetButtonState.
2008-06-09 Carlos Alberto Cortez <[email protected]>
* TabControlPainter.cs: When calculating the display rectangle for
TabPage elements, don't include TabControlSelectedDelta.Y as part of
the page height, since it is only added ad the end (this is the way
it's done in TabControl). This way having a lot of pages with
Multiline as true doesn't add much extra space between the tab pages
labels and the actual tab pages area.
Fixes #393912.
2008-05-21 George Giolfan <[email protected]>
* TabControlPainter.cs: Added HasHotElementStyles.
2008-05-19 George Giolfan <georgegiolfan@yahoo.com>
* TabControlPainter.cs: Refactored: Extracted DrawBackground.
2008-05-16 Carlos Alberto Cortez <[email protected]>
* TabControlPainter.cs: Use HotPrefix.Show as the value of
StringFormat.HotPrefix when drawing the tab text.
Fixes #355193.
2008-05-16 Carlos Alberto Cortez <[email protected]>
* TabControlPainter.cs: Use StringAlignment.Near as the value for
StringFormat.Alignment when drawing the tab text.
Fixes part of #352399.
2008-02-25 Jonathan Pobst <[email protected]>
* LabelPainter.cs: Take Padding into account when drawing
the label text.
2008-01-23 Everaldo Canuto <[email protected]>
* LabelPainter.cs: Added.
2008-01-22 Everaldo Canuto <[email protected]>
* LinkLabelPainter.cs: Change Draw method to virtual.
2008-01-22 Everaldo Canuto <e[email protected]>
* LinkLabelPainter.cs: Added.
2007-09-04 Everaldo Canuto <[email protected]>
* CheckBoxPainter.cs: Adjust checkbox light color to ControlLightLight to
mimic win32 look. Fixes #82656 (2.0).
2007-08-28 Jonathan Pobst <[email protected]>
* RadioButtonPainter.cs: Added.
2007-08-22 Jonathan Pobst <monkey@jpobst.com>
* CheckBoxPainter.cs: Added.
2007-08-19 Everaldo Canuto <[email protected]>
* TabControlPainter.cs: Fix regression in default padding x.
2007-08-19 Everaldo Canuto <[email protected]>
* TabControlPainter.cs: Fix border thickness, padding and tab text format to
be horizontal centralized. Fixes #82471.
2007-08-18 Everaldo Canuto <[email protected]>
* TabControlPainter.cs: Remove one vertical pixel from tab drawing, the
bottom line was one pixel more than needed.
2007-07-26 Everaldo Canuto <[email protected]>
* TabControlPainter.cs: Adjust vertical image position on tab. Fixes #81837.
2007-07-26 Everaldo Canuto <[email protected]>
* TabControlPainter.cs: Uses str_rect to draw text since it take in account
the image size. Fixes #81836.
2007-07-20 Jonathan Pobst <[email protected]>
* ToolStripPainter.cs: Patch from Rolf. We weren't painting a
Checked button as sunken. [Fixes bug #82151]
2007-07-16 Jonathan Pobst <[email protected]>
* ButtonPainter.cs: For flat buttons, draw mouse highlight when
button is focused. Remove random extra rectangle.
2007-07-16 Jonathan Pobst <[email protected]>
* ButtonPainter.cs: For Flat button, if no mouse over / press
backcolor is specified, calculate one from the normal backcolor.
2007-07-12 Jonathan Pobst <[email protected]>
* ButtonPainter.cs: For Flat button, if BorderSize is 0, don't
draw the rectangle. Setting the pen's width to 1 isn't good
enough, it still draws the border. [Fixes bug #82081]
2007-07-03 Jonathan Pobst <[email protected]>
* ToolStripPainter.cs: Added. This is where we paint toolstrips
using the ToolStripSystemRenderer.
2007-05-04 Andreia Gaita <[email protected]>
* TabControlPainter.cs: Use ControlPaint static methods
instead of ThemeEngine ones (seeing as they're there and
all :p )
2007-04-15 Andreia Gaita <[email protected]>
* ButtonPainter.cs: refactoring of the button drawing
that was originally located in ThemeElementsDefault
* TabControlPainter.cs: refactoring of the tabcontrol
drawing code originally located in the ThemeWin32Classic.
Also, fixes and changes:
- replaced most hardcoded values with properties to
make it easier to customize implementations.
- fixed left and right alignment drawing problems
- fixed flatbutton border drawing on left and
right alignment
- fixed #79619
- fixed paddings, spacings and positioning.
2008-10-09 Everaldo Canuto <ecanuto@novell.com>
* LinkLabelPainter.cs: Take Padding into account when drawing the linklabel
text.
2008-10-08 Everaldo Canuto <[email protected]>
* LabelPainter.cs: Use control.PaddingClientRectangle instead of calculate
rectangle with padding. Also break some lines that theres more than 120
characters.
2008-09-24 Jonathan Pobst <[email protected]>
* TabControlPainter.cs: Add 1 pixel to the tab text rectangle
to keep the text from getting cut off on XP.
[Fixes bug #428116]
2008-09-16 Jonathan Pobst <[email protected]>
* TabControlPainter.cs: Hook tab painting into ShowFocusCues.
2008-07-31 George Giolfan <georgegiolfan@yahoo.com>
* TabControlPainter.cs: Added DrawScrollButton, GetButtonState.
2008-06-09 Carlos Alberto Cortez <calberto.cortez@gmail.com>
* TabControlPainter.cs: When calculating the display rectangle for
TabPage elements, don't include TabControlSelectedDelta.Y as part of
the page height, since it is only added ad the end (this is the way
it's done in TabControl). This way having a lot of pages with
Multiline as true doesn't add much extra space between the tab pages
labels and the actual tab pages area.
Fixes #393912.
2008-05-21 George Giolfan <[email protected]>
* TabControlPainter.cs: Added HasHotElementStyles.
2008-05-19 George Giolfan <[email protected]>
* TabControlPainter.cs: Refactored: Extracted DrawBackground.
2008-05-16 Carlos Alberto Cortez <calberto.cortez@gmail.com>
* TabControlPainter.cs: Use HotPrefix.Show as the value of
StringFormat.HotPrefix when drawing the tab text.
Fixes #355193.
2008-05-16 Carlos Alberto Cortez <[email protected]>
* TabControlPainter.cs: Use StringAlignment.Near as the value for
StringFormat.Alignment when drawing the tab text.
Fixes part of #352399.
2008-02-25 Jonathan Pobst <[email protected]>
* LabelPainter.cs: Take Padding into account when drawing
the label text.
2008-01-23 Everaldo Canuto <[email protected]>
* LabelPainter.cs: Added.
2008-01-22 Everaldo Canuto <[email protected]>
* LinkLabelPainter.cs: Change Draw method to virtual.
2008-01-22 Everaldo Canuto <[email protected]>
* LinkLabelPainter.cs: Added.
2007-09-04 Everaldo Canuto <e[email protected]>
* CheckBoxPainter.cs: Adjust checkbox light color to ControlLightLight to
mimic win32 look. Fixes #82656 (2.0).
2007-08-28 Jonathan Pobst <[email protected]>
* RadioButtonPainter.cs: Added.
2007-08-22 Jonathan Pobst <[email protected]>
* CheckBoxPainter.cs: Added.
2007-08-19 Everaldo Canuto <ecanuto@novell.com>
* TabControlPainter.cs: Fix regression in default padding x.
2007-08-19 Everaldo Canuto <[email protected]>
* TabControlPainter.cs: Fix border thickness, padding and tab text format to
be horizontal centralized. Fixes #82471.
2007-08-18 Everaldo Canuto <[email protected]>
* TabControlPainter.cs: Remove one vertical pixel from tab drawing, the
bottom line was one pixel more than needed.
2007-07-26 Everaldo Canuto <[email protected]>
* TabControlPainter.cs: Adjust vertical image position on tab. Fixes #81837.
2007-07-26 Everaldo Canuto <[email protected]>
* TabControlPainter.cs: Uses str_rect to draw text since it take in account
the image size. Fixes #81836.
2007-07-20 Jonathan Pobst <[email protected]>
* ToolStripPainter.cs: Patch from Rolf. We weren't painting a
Checked button as sunken. [Fixes bug #82151]
2007-07-16 Jonathan Pobst <[email protected]>
* ButtonPainter.cs: For flat buttons, draw mouse highlight when
button is focused. Remove random extra rectangle.
2007-07-16 Jonathan Pobst <[email protected]>
* ButtonPainter.cs: For Flat button, if no mouse over / press
backcolor is specified, calculate one from the normal backcolor.
2007-07-12 Jonathan Pobst <[email protected]>
* ButtonPainter.cs: For Flat button, if BorderSize is 0, don't
draw the rectangle. Setting the pen's width to 1 isn't good
enough, it still draws the border. [Fixes bug #82081]
2007-07-03 Jonathan Pobst <[email protected]>
* ToolStripPainter.cs: Added. This is where we paint toolstrips
using the ToolStripSystemRenderer.
2007-05-04 Andreia Gaita <[email protected]>
* TabControlPainter.cs: Use ControlPaint static methods
instead of ThemeEngine ones (seeing as they're there and
all :p )
2007-04-15 Andreia Gaita <[email protected]>
* ButtonPainter.cs: refactoring of the button drawing
that was originally located in ThemeElementsDefault
* TabControlPainter.cs: refactoring of the tabcontrol
drawing code originally located in the ThemeWin32Classic.
Also, fixes and changes:
- replaced most hardcoded values with properties to
make it easier to customize implementations.
- fixed left and right alignment drawing problems
- fixed flatbutton border drawing on left and
right alignment
- fixed #79619
- fixed paddings, spacings and positioning.
@@ -166,8 +166,7 @@ namespace System.Windows.Forms.Theming.Default
public virtual void OnRenderToolStripBackground (ToolStripRenderEventArgs e)
{
if (e.ToolStrip.BackgroundImage == null)
e.Graphics.Clear (e.BackColor);
e.Graphics.Clear (e.BackColor);
if (e.ToolStrip is StatusStrip)
e.Graphics.DrawLine (Pens.White, e.AffectedBounds.Left, e.AffectedBounds.Top, e.AffectedBounds.Right, e.AffectedBounds.Top);
@@ -1,7 +1,3 @@
2008-10-20 Jonathan Pobst <[email protected]>
* ToolStripPainter.cs: Don't paint over a set BackgroundImage.
2008-09-16 Jonathan Pobst <[email protected]>
* TabControlPainter.cs: Hook tab painting into ShowFocusCues.
@@ -192,9 +192,6 @@ namespace System.Windows.Forms.Theming.VisualStyles
}
public override void OnRenderToolStripBackground (ToolStripRenderEventArgs e)
{
if (e.ToolStrip.BackgroundImage != null)
return;
if (!ThemeVisualStyles.RenderClientAreas) {
base.OnRenderToolStripBackground (e);
return;
@@ -17,8 +17,6 @@ System.Windows.Forms.Design/PropertyTab.cs
System.Windows.Forms.Design/ToolStripItemDesignerAvailability.cs
System.Windows.Forms.Design/ToolStripItemDesignerAvailabilityAttribute.cs
System.Windows.Forms.Design/WindowsFormsComponentEditor.cs
System.Windows.Forms.Internal/Accessor.cs
System.Windows.Forms.Internal/DebugHelper.cs
System.Windows.Forms.PropertyGridInternal/PropertiesTab.cs
System.Windows.Forms.RTF/Charcode.cs
System.Windows.Forms.RTF/Charset.cs
@@ -324,7 +324,7 @@ namespace System.Windows.Forms
addNewItem.Enabled = isNull ? addNewItem.Enabled : this.bindingSource.AllowNew;
if (moveFirstItem != null)
moveFirstItem.Enabled = isNull ? moveFirstItem.Enabled : bindingSource.Position > 0;
moveFirstItem.Enabled = isNull ? moveFirstItem.Enabled : bindingSource.Position != 0;
if (moveLastItem != null)
moveLastItem.Enabled = isNull ? moveLastItem.Enabled : bindingSource.Position < (bindingSource.Count - 1);
@@ -338,15 +338,11 @@ namespace System.Windows.Forms
if (deleteItem != null)
deleteItem.Enabled = isNull ? deleteItem.Enabled : (bindingSource.Count != 0 && bindingSource.AllowRemove);
if (countItem != null) {
if (countItem != null)
countItem.Text = string.Format(countItemFormat, isNull ? 0 : bindingSource.Count);
countItem.Enabled = !isNull && bindingSource.Count > 0;
}
if (positionItem != null) {
if (positionItem != null)
positionItem.Text = string.Format("{0}", isNull ? 0 : bindingSource.Position + 1);
positionItem.Enabled = !isNull && bindingSource.Count > 0;
}
}
finally
{
@@ -489,4 +485,4 @@ namespace System.Windows.Forms
}
}
#endif
#endif
@@ -1,280 +1,3 @@
2008-11-30 Ivan N. Zlatev <[email protected]>
* GroupBoxRenderer.cs: Fix when VisualStyles disabled:
- No caption text is drawn because Color.Empty is used.
- Fix top and height off by 1.
[Fixes bug #448764]
2008-11-24 Jonathan Pobst <[email protected]>
* Form.cs: Don't change min/max size if it is empty.
[Fixes bug #447873]
2008-11-21 Jonathan Pobst <[email protected]>
* XPlatUI.cs: Take new Platform.MacOSX into account.
[Fixes bug #447663]
2008-11-20 Jonathan Pobst <[email protected]>
* ComboBox.cs: Call HideWindow instead of Hide when closing the dropdown
through DroppedDown so the proper events get called and state gets reset.
[Fixes bug #446805]
2008-11-10 Jonathan Pobst <[email protected]>
* TextControl.cs: Add some order of operation to our math so
we don't end up with a negative height for our invalidate rect.
[Fixes bug #381889]
2008-11-10 Jonathan Pobst <[email protected]>
* Control.cs: When our enabled changes, notify our implicit children
controls as well as our regular controls.
[Fixes bug #441523]
2008-11-08 Andreia Gaita <[email protected]>
* HtmlElement.cs: Small code cleanup
2008-11-06 Carlos Alberto Cortez <[email protected]>
* BindingNavigator.cs: MoveFirstItem should be enabled only if
position is larger than 0, not only different than 0. Also Position
and Count items should be enabled if the BindingSource is non null and
non empty.
Fixes #439961.
2008-11-05 Jonathan Pobst <[email protected]>
* TabControl.cs: Don't raise SelectedIndexChanged until we have
actually modified the tab collection, so TabCount will be correct.
[Fixes bug #441896]
2008-11-05 Sandy Armstrong <[email protected]>
* ListViewItem.cs: Mark ListViewSubItem.UIATextChanged event as
NonSerialized to fix serialization of ListViewItem.
2008-11-04 Mike Gorse <[email protected]>
* ListView.cs: Call OnUIAFocusedItemChanged after completing the
focus change, and always call in SetFocusedItem.
* ListBox.cs: Add UIAFocusedItemChanged as in ListView.
2008-11-04 Jonathan Pobst <[email protected]>
* ComboBox.cs: Only call OnDrawItem when we are using an OwnerDraw
mode. Based on a patch by John Mortlock.
[Fixes bug #436790]
2008-11-04 Carlos Alberto Cortez <[email protected]>
* ListView.cs: Use the UsingGroups property where needed, instead of
duplicating the check in other places.
2008-11-04 Carlos Alberto Cortez <[email protected]>
* ListView.cs: When calculating layout, refresh the count of items
belonging to the default item, insteas of doing it only one time. This
was already working fine for icon views, not not for details.
Fixes #438948.
2008-11-03 Carlos Alberto Cortez <[email protected]>
* ListView.cs:
* ListViewItem.cs:
* ThemeWin32Classic.cs: Don't render Tile view if there wasn't a call
to Applicatin.EnableVisualStyles, and use LargeIcon view, as .net
does.
Fixes #437933.
2008-11-03 Sandy Armstrong <[email protected]>
* ListView.cs: Wrap call to OnUIAFocusedItemChanged with #if NET_2_0.
2008-11-03 Sandy Armstrong <[email protected]>
* ListView.cs: Add internal UIAFocusedItemChanged event. Fixes bug
#441280, patch by Mike Gorse <[email protected]>.
2008-11-03 Jonathan Pobst <[email protected]>
* TreeView.cs: When doing ExpandAll, don't scroll to the bottom
if there is no scrollbar.
[Fixes bug #440885]
2008-11-03 Jonathan Pobst <[email protected]>
* ProgressBar.cs, ThemeWin32Classic.cs, ThemeVisualStyles.cs: Commit
patch from Andy Hume that fixes many issues with ProgressBar.
[See bug #440220]
2008-11-03 Jonathan Pobst <[email protected]>
* Form.cs: Don't allow MinimumSize and MaximumSize to conflict.
[Fixes bug #438866]
2008-11-03 Sandy Armstrong <[email protected]>
* UpDownBase.cs:
* DomainUpDown.cs:
* NumericUpDown.cs: Internal events added to UpDownBase:
UIAUpButtonClick and UIADownButtonClick. Patch by Neville Gao
<[email protected]>.
2008-11-03 Sandy Armstrong <[email protected]>
* ToolStripLabel.cs: Internal event added: UIAIsLinkChanged.
2008-11-02 Carlos Alberto Cortez <[email protected]>
* ListView.cs:
* ThemeWin32Classic.cs: Don't use groups nor insertion mark in
Application.EnableVisualStyles hasn't been called.
Fixes part of #437933.
2008-10-31 Andreia Gaita <[email protected]>
* Form.cs (SetVisibleCore): since set_ActiveControl no longer calls focus
if the container is not focused already, we need to specifically set
focus to the first available control, or to the form itself if there
are no controls.
2008-10-31 Andreia Gaita <[email protected]>
activate message fix: a call to .Show now waits until both WM_SHOWWINDOW and
WM_ACTIVATE have been processed before returning, so it is guaranteed that
once it returns and the form is visible, it is actually on the screen on X11
* ContainerControl.cs: Only send focus to the control if the top container
is already focused. This is so that, when a form is first shown, all
the enter/leave events are done first before any focus stuff comes in.
If a control has no top container, there's an extra check on Control.Focus
to make sure it gets focused in this particular case.
* Control.cs: Force focus if the control is active but did not receive
focus after being set as active.
* MdiClient.cs: Dispose the form when closing
* XplatUIX11.cs: When mapping and unmapping windows, make sure the call
doesn't return until both WM_SHOWWINDOW and WM_ACTIVATE have come in
if the window is a top Form.
Reset all hwnd properties when the window has been destroyed so that
we don't land in any codepaths that might try to do something with it.
Added a bunch of debugging messages. If TRACE is defined, all X calls
are logged through DebugHelper. Set a few missing EntryPoint attributes.
2008-10-29 Mario Carrion <[email protected]>
* ListViewItem.cs: Control enabled to support Accessibility:
- Internal events: UIATextChanged, UIASubItemTextChanged.
- Internal event UIATextChanged in ListViewSubItem that triggers
UIASubItemTextChanged.
* ListView.cs: Control enabled to support Accessibility:
- Internal events: UIACheckBoxesChanged, UIAMultiSelectChanged,
UIAShowGroupsChanged, UIAViewChanged and UIALabelEditChanged.
- Internal event UIACollectionChanged in ColumnHeaderCollection.
- Internal event UIACollectionChanged in ListViewItemCollection.
- Internal properties: UIAHeaderControl, UIAColumns, UIARows,
UIADefaultListViewGroup, UIAHScrollBar and UIAVScrollBar.
- Internal methods: UIAGetHeaderBounds.
2008-10-25 Carlos Alberto Cortez <[email protected]>
* ScrollableControl.cs: Actually fire the 2.0 Scroll event when we get
the event from the respective scrollbars.
Fixes #436709.
2008-10-24 Carlos Alberto Cortez <[email protected]>
* ComboBox.cs: Use the new CanNavigateAutoCompleteList property of the
textbox to know whether any navigation key will be handled or not. If
not, don't pass the message to the textbox, and use it here instead.
* TextBox.cs: Define a new CanNavigateAutoCompleteList property -which
is more precise- than the previous AutoCompleteMatches one.
This should the keyboard navigation in ComboBox when using auto
complete modes.
2008-10-24 Jonathan Pobst <[email protected]>
* ComboBox.cs: Fix item height calculation based off Font to match .Net.
[Fixes bug #436730]
2008-10-24 Jonathan Pobst <[email protected]>
* ToolStripDropDownItem.cs: Call OnClick instead of base.OnClick so
overridden methods will get called.
* ToolStripItem.cs: Raise Click before MouseUp.
* ToolStripSplitButton.cs: Fix up some bounding rectangles to take
the item's location into account.
[Fixes bug #437683]
2008-10-24 Neville Gao <[email protected]>
* NumericUpDown.cs: Control enabled to support accessibility.
[Fiexes bug #438135]
2008-10-23 Carlos Alberto Cortez <[email protected]>
* TextBox.cs: Check that we actually have items no navigate, select
text when pressing enter, as well as handle direction keys only if
mode is different to Suggest or the suggest listbox is visible.
2008-10-23 Andreia Gaita <[email protected]>
* WebBrowser.cs: Use the new ContentStream property to retrieve
a stream encoded from the document content
2008-10-23 Andreia Gaita <[email protected]>
* HtmlDocument.cs,
HtmlElement.cs,
HtmlWindow.cs: Fix GetHashcode for null objects
2008-10-22 Andreia Gaita <[email protected]>
* HtmlDocument.cs,
HtmlElement.cs,
HtmlWindow.cs: Fix equality operators (fixes #428173)
2008-10-21 Jonathan Pobst <[email protected]>
* XplatUIWin32.cs: Apply patch from John Mortlock that ensures
mouse_state gets set during WM_MOUSEMOVE and WM_NCMOUSEMOVE.
[Fixes bug #436772]
2008-10-21 Jonathan Pobst <[email protected]>
* ComboBox.cs: Fire SelectedIndexChanged when the user selects the
same item with the mouse as was already selected.
[Fixes bug #436789]
2008-10-21 Brad Taylor <[email protected]>
* TextControl.cs: Break out code to get the visible range into
GetVisibleLineIndexes to be used in UIA code.
* Line.cs:
* TextControl.cs:
* TextBoxBase.cs: Add comments indicating that the method or property
is used via reflection from UIA code.
2008-10-20 Carlos Alberto Cortez <[email protected]>
* ListViewItem.cs: Match .net serialization.
Fixes remaining part of #417520.
2008-10-20 Jonathan Pobst <[email protected]>
* ToolStripProfessionalRenderer.cs: Don't paint over a set BackgroundImage.
2008-10-20 Mario Carrion <[email protected]>
* ErrorProvider.cs, ToolTip.cs, HelpProvider.cs: UIA internal property
added: UIAToolTipRectangle.
2008-10-19 Carlos Alberto Cortez <[email protected]>
* ListViewItem.cs: When deserializing enumerate over the data, instead
@@ -509,7 +509,7 @@ namespace System.Windows.Forms
if (value)
DropDownListBox ();
else
listbox_ctrl.HideWindow ();
listbox_ctrl.Hide ();
}
}
@@ -1051,22 +1051,16 @@ namespace System.Windows.Forms
protected virtual void OnDrawItem (DrawItemEventArgs e)
{
DrawItemEventHandler eh = (DrawItemEventHandler)(Events [DrawItemEvent]);
if (eh != null)
eh (this, e);
}
internal void HandleDrawItem (DrawItemEventArgs e)
{
// Only raise OnDrawItem if we are in an OwnerDraw mode
switch (DrawMode) {
case DrawMode.OwnerDrawFixed:
case DrawMode.OwnerDrawVariable:
OnDrawItem (e);
break;
default:
ThemeEngine.Current.DrawComboBoxItem (this, e);
break;
case DrawMode.OwnerDrawFixed:
case DrawMode.OwnerDrawVariable:
DrawItemEventHandler eh = (DrawItemEventHandler)(Events [DrawItemEvent]);
if (eh != null)
eh (this, e);
break;
default:
ThemeEngine.Current.DrawComboBoxItem (this, e);
break;
}
}
@@ -1100,8 +1094,10 @@ namespace System.Windows.Forms
if (textbox_ctrl != null)
textbox_ctrl.Font = Font;
if (!item_height_specified)
item_height = Font.Height + 2;
if (!item_height_specified) {
SizeF sz = TextRenderer.MeasureString ("The quick brown Fox", Font);
item_height = (int) sz.Height;
}
if (IntegralHeight)
UpdateComboBoxBounds ();
@@ -1396,7 +1392,7 @@ namespace System.Windows.Forms
Keys keys = (Keys) m.WParam.ToInt32 ();
#if NET_2_0
// Don't pass the message to base if auto complete is being used and available.
if (textbox_ctrl != null && textbox_ctrl.CanNavigateAutoCompleteList) {
if (textbox_ctrl != null && textbox_ctrl.AutoCompleteMatchesCount > 0) {
XplatUI.SendMessage (textbox_ctrl.Handle, (Msg) m.Msg, m.WParam, m.LParam);
return;
}
@@ -1522,7 +1518,7 @@ namespace System.Windows.Forms
}
state |= DrawItemState.ComboBoxEdit;
HandleDrawItem (new DrawItemEventArgs (dc, Font, item_rect, SelectedIndex, state, ForeColor, BackColor));
OnDrawItem (new DrawItemEventArgs (dc, Font, item_rect, SelectedIndex, state, ForeColor, BackColor));
}
if (show_dropdown_button) {
@@ -2528,8 +2524,8 @@ namespace System.Windows.Forms
state |= DrawItemState.Focus;
}
}
owner.HandleDrawItem (new DrawItemEventArgs (dc, owner.Font, item_rect,
owner.OnDrawItem (new DrawItemEventArgs (dc, owner.Font, item_rect,
i, state, owner.ForeColor, owner.BackColor));
}
}
@@ -2680,18 +2676,8 @@ namespace System.Windows.Forms
return;
}
bool is_change = owner.SelectedIndex != index;
owner.SelectedIndex = index;
owner.OnSelectionChangeCommitted (new EventArgs ());
// If the user selected the already selected item, SelectedIndex
// won't fire these events, but .Net does, so we do it here
if (!is_change) {
owner.OnSelectedValueChanged (EventArgs.Empty);
owner.OnSelectedIndexChanged (EventArgs.Empty);
}
HideWindow ();
}
@@ -179,20 +179,9 @@ namespace System.Windows.Forms {
// Scroll control into view
ScrollControlIntoView(active_control);
walk = this;
ctl = this;
while (walk != null) {
if (walk.Parent is ContainerControl) {
ctl = walk.Parent;
}
walk = walk.Parent;
}
// Let the control know it's selected
if (ctl.InternalContainsFocus)
SendControlFocus (active_control);
SendControlFocus (active_control);
}
}
@@ -1451,8 +1451,6 @@ namespace System.Windows.Forms
container = GetContainerControl();
if (container != null && (Control)container != control) {
container.ActiveControl = control;
if (container.ActiveControl == control && !control.has_focus && control.IsHandleCreated)
XplatUI.SetFocus(control.window.Handle);
}
else if (control.IsHandleCreated) {
XplatUI.SetFocus(control.window.Handle);
@@ -6158,8 +6156,9 @@ namespace System.Windows.Forms
if (eh != null)
eh (this, e);
foreach (Control c in Controls.GetAllControls ())
c.OnParentEnabledChanged (e);
for (int i=0; i<child_controls.Count; i++) {
child_controls[i].OnParentEnabledChanged(e);
}
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
@@ -523,11 +523,6 @@ namespace System.Windows.Forms
}
SelectedIndex = new_index;
#if NET_2_0
// UIA Framework Event: DownButton Click
OnUIADownButtonClick (EventArgs.Empty);
#endif
}
public override string ToString() {
@@ -549,11 +544,6 @@ namespace System.Windows.Forms
}
SelectedIndex = new_index;
#if NET_2_0
// UIA Framework Event: UpButton Click
OnUIAUpButtonClick (EventArgs.Empty);
#endif
}
#endregion // Public Instance Methods
@@ -613,10 +613,6 @@ namespace System.Windows.Forms {
set { uia_control = value; }
}
internal Rectangle UIAToolTipRectangle {
get { return tooltip.Bounds; }
}
internal static event ControlEventHandler UIAControlHookUp;
internal static event ControlEventHandler UIAControlUnhookUp;
internal static event ControlEventHandler UIAErrorProviderHookUp;
@@ -889,15 +889,6 @@ namespace System.Windows.Forms {
set {
if (maximum_size != value) {
maximum_size = value;
// If this is smaller than the min, adjust the min
if (!minimum_size.IsEmpty) {
if (maximum_size.Width <= minimum_size.Width)
minimum_size.Width = maximum_size.Width;
if (maximum_size.Height <= minimum_size.Height)
minimum_size.Height = maximum_size.Height;
}
OnMaximumSizeChanged(EventArgs.Empty);
if (IsHandleCreated) {
XplatUI.SetWindowMinMax(Handle, maximized_bounds, minimum_size, maximum_size);
@@ -1078,14 +1069,6 @@ namespace System.Windows.Forms {
if (minimum_size != value) {
minimum_size = value;
// If this is bigger than the max, adjust the max
if (!maximum_size.IsEmpty) {
if (minimum_size.Width >= maximum_size.Width)
maximum_size.Width = minimum_size.Width;
if (minimum_size.Height >= maximum_size.Height)
maximum_size.Height = minimum_size.Height;
}
if ((Size.Width < value.Width) || (Size.Height < value.Height)) {
Size = new Size(Math.Max(Size.Width, value.Width), Math.Max(Size.Height, value.Height));
}
@@ -2467,15 +2450,6 @@ namespace System.Windows.Forms {
#endif
shown_raised = true;
}
if (value && !IsMdiChild) {
if (ActiveControl == null)
SelectNextControl (null, true, true, true, false);
if (ActiveControl != null)
SendControlFocus (ActiveControl);
else
this.Focus ();
}
}
protected override void UpdateDefaultButton() {
@@ -99,7 +99,7 @@ namespace System.Windows.Forms
// part of the bounds as height, they use it as the bottom, so the boxes are drawn in completely different
// places. Rather than emulate this bug, we do it correctly. After googling for a while, I don't think
// anyone has ever actually used this class for anything, so it should be fine. :)
Rectangle new_bounds = new Rectangle (bounds.Left, bounds.Top + (int)(font_size.Height / 2), bounds.Width, bounds.Height - (int)(font_size.Height / 2));
Rectangle new_bounds = new Rectangle (bounds.Left, bounds.Top + (int)(font_size.Height / 2) - 1, bounds.Width, bounds.Height - (int)(font_size.Height / 2) + 1);
// Don't paint over the background where we are going to put the text
Region old_clip = g.Clip;
@@ -109,11 +109,8 @@ namespace System.Windows.Forms
g.Clip = old_clip;
if (groupBoxText != String.Empty) {
if (textColor == Color.Empty)
textColor = SystemColors.ControlText;
if (groupBoxText != String.Empty)
TextRenderer.DrawText (g, groupBoxText, font, new Point (bounds.Left + 8, bounds.Top), textColor, flags);
}
}
}
@@ -319,10 +319,6 @@ namespace System.Windows.Forms {
internal static event ControlEventHandler UIAHelpRequested;
internal static event ControlEventHandler UIAHelpUnRequested;
internal Rectangle UIAToolTipRectangle {
get { return tooltip.Bounds; }
}
internal static void OnUIAHelpRequested (HelpProvider provider, ControlEventArgs args)
{
if (UIAHelpRequested != null)
@@ -120,9 +120,7 @@ namespace System.Windows.Forms
}
public override int GetHashCode ()
{
if (document == null)
return 0;
{
return document.GetHashCode ();
}
@@ -149,7 +147,7 @@ namespace System.Windows.Forms
return false;
}
return left.document.Equals (right.document);
return left.Equals (right);
}
public static bool operator !=(HtmlDocument left, HtmlDocument right) {
@@ -150,9 +150,7 @@ namespace System.Windows.Forms
}
public HtmlElement FirstChild {
get {
return new HtmlElement (owner, webHost, (IElement)element.FirstChild);
}
get { return new HtmlElement (owner, webHost, (IElement)element.FirstChild); }
}
public HtmlElement NextSibling {
@@ -231,8 +229,6 @@ namespace System.Windows.Forms
public override int GetHashCode ()
{
if (element == null)
return 0;
return element.GetHashCode ();
}
@@ -303,7 +299,7 @@ namespace System.Windows.Forms
return true;
if ((object)left == null || (object)right == null)
return false;
return left.element.Equals (right.element);
return left.Equals (right);
}
public static bool operator != (HtmlElement left, HtmlElement right)
@@ -402,11 +402,9 @@ namespace System.Windows.Forms
#region Standard stuff
public override int GetHashCode ()
{
if (window == null)
return 0;
return window.GetHashCode ();
}
public override bool Equals (object obj)
{
return this == (HtmlWindow) obj;
@@ -420,7 +418,7 @@ namespace System.Windows.Forms
if ((object)left == null || (object)right == null)
return false;
return left.window.Equals (right.window);
return left.Equals (right);
}
public static bool operator != (HtmlWindow left, HtmlWindow right)
@@ -143,7 +143,6 @@ namespace System.Windows.Forms
}
}
// UIA: Method used via reflection in TextRangeProvider
internal int Height {
get { return height; }
set { height = value; }
@@ -170,7 +169,6 @@ namespace System.Windows.Forms
}
}
// UIA: Method used via reflection in TextRangeProvider
internal int Width {
get {
int res = (int) widths [text.Length];
@@ -185,7 +183,6 @@ namespace System.Windows.Forms
}
}
// UIA: Method used via reflection in TextRangeProvider
internal int X {
get {
if (document.multiline)
@@ -194,7 +191,6 @@ namespace System.Windows.Forms
}
}
// UIA: Method used via reflection in TextRangeProvider
internal int Y {
get {
if (!document.multiline)
@@ -247,20 +247,6 @@ namespace System.Windows.Forms
eh (this, EventArgs.Empty);
}
static object UIAFocusedItemChangedEvent = new object ();
internal event EventHandler UIAFocusedItemChanged {
add { Events.AddHandler (UIAFocusedItemChangedEvent, value); }
remove { Events.RemoveHandler (UIAFocusedItemChangedEvent, value); }
}
internal void OnUIAFocusedItemChangedEvent ()
{
EventHandler eh = (EventHandler) Events [UIAFocusedItemChangedEvent];
if (eh != null)
eh (this, EventArgs.Empty);
}
#endif
#endregion UIA Framework Events
@@ -2075,11 +2061,6 @@ namespace System.Windows.Forms
if (value != -1)
InvalidateItem (value);
#if NET_2_0
// UIA Framework: Generates FocusedItemChanged event.
OnUIAFocusedItemChangedEvent ();
#endif
}
}
@@ -388,15 +388,6 @@ namespace System.Windows.Forms
}
}
#if NET_2_0
internal bool UsingGroups {
get {
return show_groups && groups.Count > 0 && view != View.List &&
Application.VisualStylesEnabled;
}
}
#endif
internal override bool ScaleChildrenInternal {
get { return false; }
}
@@ -562,11 +553,6 @@ namespace System.Windows.Forms
check_boxes = value;
this.Redraw (true);
#if NET_2_0
//UIA Framework: Event used by ListView to set/unset Toggle Pattern
OnUIACheckBoxesChanged ();
#endif
}
}
}
@@ -733,17 +719,7 @@ namespace System.Windows.Forms
[DefaultValue (false)]
public bool LabelEdit {
get { return label_edit; }
set {
if (value != label_edit) {
label_edit = value;
#if NET_2_0
// UIA Framework: Event used by Value Pattern in ListView.ListItem provider
OnUIALabelEditChanged ();
#endif
}
}
set { label_edit = value; }
}
[DefaultValue (true)]
@@ -786,16 +762,7 @@ namespace System.Windows.Forms
[DefaultValue (true)]
public bool MultiSelect {
get { return multiselect; }
set {
if (value != multiselect) {
multiselect = value;
#if NET_2_0
// UIA Framework: Event used by Selection Pattern in ListView.ListItem provider
OnUIAMultiSelectChanged ();
#endif
}
}
set { multiselect = value; }
}
@@ -866,9 +833,6 @@ namespace System.Windows.Forms
if (show_groups != value) {
show_groups = value;
Redraw(true);
// UIA Framework: Used to update a11y Tree
OnUIAShowGroupsChanged ();
}
}
}
@@ -1082,11 +1046,6 @@ namespace System.Windows.Forms
h_scroll.Value = v_scroll.Value = 0;
view = value;
Redraw (true);
#if NET_2_0
// UIA Framework: Event used to update UIA Tree.
OnUIAViewChanged ();
#endif
}
}
}
@@ -1730,7 +1689,7 @@ namespace System.Windows.Forms
if (UseCustomColumnWidth)
CalculateCustomColumnWidth ();
#if NET_2_0
if (UsingGroups) {
if (show_groups && groups.Count > 0 && view != View.List) {
// When groups are used the alignment is always top-aligned
rows = 0;
cols = 0;
@@ -1810,7 +1769,7 @@ namespace System.Windows.Forms
Size sz = item_size;
#if NET_2_0
bool using_groups = UsingGroups;
bool using_groups = show_groups && groups.Count > 0 && view != View.List;
#endif
CalculateRowsAndCols (sz, left_aligned, x_spacing, y_spacing);
@@ -1922,7 +1881,6 @@ namespace System.Windows.Forms
{
int items = 0;
groups.DefaultGroup.ItemCount = GetDefaultGroupItems ();
for (int i = 0; i < groups.InternalCount; i++) {
ListViewGroup group = groups.GetInternalGroup (i);
int items_in_group = group.GetActualItemCount ();
@@ -1983,7 +1941,7 @@ namespace System.Windows.Forms
ItemSize = new Size (0, item_height); // We only cache Height for details view
int y = header_control.Height;
#if NET_2_0
bool using_groups = UsingGroups;
bool using_groups = show_groups && groups.Count > 0 && view != View.List;
if (using_groups) {
CalculateDetailsGroupItemsCount ();
CalculateGroupsLayout (ItemSize, 2, y);
@@ -2077,9 +2035,6 @@ namespace System.Windows.Forms
break;
#if NET_2_0
case View.Tile:
if (!Application.VisualStylesEnabled)
goto case View.LargeIcon;
LayoutIcons (TileItemSize, alignment == ListViewAlignment.Left,
ThemeEngine.Current.ListViewHorizontalSpacing,
ThemeEngine.Current.ListViewVerticalSpacing);
@@ -3295,9 +3250,6 @@ namespace System.Windows.Forms
break;
#if NET_2_0
case View.Tile:
if (!Application.VisualStylesEnabled)
goto case View.LargeIcon;
Scroll (v_scroll, -(ItemSize.Height + ThemeEngine.Current.ListViewVerticalSpacing) * 2 * lines);
break;
#endif
@@ -3315,10 +3267,8 @@ namespace System.Windows.Forms
GetItemAtDisplayIndex (display_index).Focused = true;
else if (focused_item_index != -1 && focused_item_index < items.Count) // Previous focused item
GetItemAtDisplayIndex (focused_item_index).Focused = false;
focused_item_index = display_index;
#if NET_2_0
OnUIAFocusedItemChanged ();
#endif
}
private void HorizontalScroller (object sender, EventArgs e)
@@ -4614,40 +4564,6 @@ namespace System.Windows.Forms
internal ArrayList list;
private ListView owner;
#region UIA Framework Events
#if NET_2_0
//NOTE:
// We are using Reflection to add/remove internal events.
// Class ListViewProvider uses the events when View is Details.
//
//Event used to generate UIA StructureChangedEvent
static object UIACollectionChangedEvent = new object ();
internal event CollectionChangeEventHandler UIACollectionChanged {
add {
if (owner != null)
owner.Events.AddHandler (UIACollectionChangedEvent, value);
}
remove {
if (owner != null)
owner.Events.RemoveHandler (UIACollectionChangedEvent, value);
}
}
internal void OnUIACollectionChangedEvent (CollectionChangeEventArgs args)
{
if (owner == null)
return;
CollectionChangeEventHandler eh
= (CollectionChangeEventHandler) owner.Events [UIACollectionChangedEvent];
if (eh != null)
eh (owner, args);
}
#endif
#endregion UIA Framework Events
#region Public Constructor
public ColumnHeaderCollection (ListView owner)
{
@@ -4709,12 +4625,6 @@ namespace System.Windows.Forms
{
int idx = list.Add (value);
owner.AddColumn (value, idx, true);
#if NET_2_0
//UIA Framework event: Item Added
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Add, value));
#endif
return idx;
}
@@ -4789,12 +4699,6 @@ namespace System.Windows.Forms
col.SetListView (null);
list.Clear ();
owner.ReorderColumns (new int [0], true);
#if NET_2_0
//UIA Framework event: Items cleared
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Refresh, null));
#endif
}
public bool Contains (ColumnHeader value)
@@ -4894,11 +4798,6 @@ namespace System.Windows.Forms
list.Insert (index, value);
owner.AddColumn (value, index, true);
#if NET_2_0
//UIA Framework event: Item added
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Add, value));
#endif
}
#if NET_2_0
@@ -4975,11 +4874,6 @@ namespace System.Windows.Forms
column.InternalDisplayIndex = -1;
owner.ReorderColumns (display_indices, true);
#if NET_2_0
//UIA Framework event: Item Removed
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Remove, column));
#endif
}
#if NET_2_0
@@ -5015,40 +4909,6 @@ namespace System.Windows.Forms
private ListViewGroup group;
#endif
#region UIA Framework Events
#if NET_2_0
//NOTE:
// We are using Reflection to add/remove internal events.
// Class ListViewProvider uses the events.
//
//Event used to generate UIA StructureChangedEvent
static object UIACollectionChangedEvent = new object ();
internal event CollectionChangeEventHandler UIACollectionChanged {
add {
if (owner != null)
owner.Events.AddHandler (UIACollectionChangedEvent, value);
}
remove {
if (owner != null)
owner.Events.RemoveHandler (UIACollectionChangedEvent, value);
}
}
internal void OnUIACollectionChangedEvent (CollectionChangeEventArgs args)
{
if (owner == null)
return;
CollectionChangeEventHandler eh
= (CollectionChangeEventHandler) owner.Events [UIACollectionChangedEvent];
if (eh != null)
eh (owner, args);
}
#endif
#endregion UIA Framework Events
// The collection can belong to a ListView (main) or to a ListViewGroup (sub-collection)
// In the later case ListViewItem.ListView never gets modified
private bool is_main_collection = true;
@@ -5136,20 +4996,8 @@ namespace System.Windows.Forms
}
#endif
#if NET_2_0
//UIA Framework event: Item Replaced
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Remove, list [index]));
#endif
list [index] = value;
CollectionChanged (true);
#if NET_2_0
//UIA Framework event: Item Replaced
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Add, value));
#endif
}
}
@@ -5180,21 +5028,11 @@ namespace System.Windows.Forms
object IList.this [int index] {
get { return this [index]; }
set {
#if NET_2_0
//UIA Framework event: Item Replaced
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Remove, this [index]));
#endif
if (value is ListViewItem)
this [index] = (ListViewItem) value;
else
this [index] = new ListViewItem (value.ToString ());
OnChange ();
#if NET_2_0
//UIA Framework event: Item Replaced
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Add, value));
#endif
}
}
#endregion // Public Properties
@@ -5213,11 +5051,6 @@ namespace System.Windows.Forms
if (is_main_collection || value.ListView != null)
CollectionChanged (true);
#if NET_2_0
//UIA Framework event: Item Added
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Add, value));
#endif
return value;
}
@@ -5272,15 +5105,9 @@ namespace System.Windows.Forms
owner.BeginUpdate ();
foreach (ListViewItem item in items) {
foreach (ListViewItem item in items)
AddItem (item);
#if NET_2_0
//UIA Framework event: Item Added
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Add, item));
#endif
}
owner.EndUpdate ();
CollectionChanged (true);
@@ -5322,12 +5149,6 @@ namespace System.Windows.Forms
list.Clear ();
CollectionChanged (false);
#if NET_2_0
//UIA Framework event: Items Removed
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Refresh, null));
#endif
}
public bool Contains (ListViewItem item)
@@ -5407,11 +5228,6 @@ namespace System.Windows.Forms
result = list.Add (li);
CollectionChanged (true);
#if NET_2_0
//UIA Framework event: Item Added
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Add, li));
#endif
return result;
}
@@ -5431,11 +5247,6 @@ namespace System.Windows.Forms
this.Insert (index, (ListViewItem) item);
else
this.Insert (index, item.ToString ());
#if NET_2_0
//UIA Framework event: Item Added
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Add, this [index]));
#endif
}
void IList.Remove (object item)
@@ -5506,11 +5317,6 @@ namespace System.Windows.Forms
if (is_main_collection || item.ListView != null)
CollectionChanged (true);
#if NET_2_0
//UIA Framework event: Item Added
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Add, item));
#endif
return item;
}
@@ -5597,12 +5403,6 @@ namespace System.Windows.Forms
CollectionChanged (false);
if (selection_changed && owner != null)
owner.OnSelectedIndexChanged (EventArgs.Empty);
#if NET_2_0
//UIA Framework event: Item Removed
OnUIACollectionChangedEvent (new CollectionChangeEventArgs (CollectionChangeAction.Remove, item));
#endif
}
#if NET_2_0
@@ -5655,7 +5455,6 @@ namespace System.Windows.Forms
#endif
list.Add (value);
}
void CollectionChanged (bool sort)
@@ -6239,123 +6038,6 @@ namespace System.Windows.Forms
void RaiseColumnWidthChanged (int resize_column)
{
}
#endif
#if NET_2_0
#region UIA Framework: Methods, Properties and Events
static object UIALabelEditChangedEvent = new object ();
static object UIAShowGroupsChangedEvent = new object ();
static object UIAMultiSelectChangedEvent = new object ();
static object UIAViewChangedEvent = new object ();
static object UIACheckBoxesChangedEvent = new object ();
static object UIAFocusedItemChangedEvent = new object ();
internal Rectangle UIAHeaderControl {
get { return header_control.Bounds; }
}
internal int UIAColumns {
get { return cols; }
}
internal int UIARows {
get { return rows; }
}
internal ListViewGroup UIADefaultListViewGroup
{
get { return groups.DefaultGroup; }
}
internal ScrollBar UIAHScrollBar {
get { return h_scroll; }
}
internal ScrollBar UIAVScrollBar {
get { return v_scroll; }
}
internal event EventHandler UIAShowGroupsChanged {
add { Events.AddHandler (UIAShowGroupsChangedEvent, value); }
remove { Events.RemoveHandler (UIAShowGroupsChangedEvent, value); }
}
internal event EventHandler UIACheckBoxesChanged {
add { Events.AddHandler (UIACheckBoxesChangedEvent, value); }
remove { Events.RemoveHandler (UIACheckBoxesChangedEvent, value); }
}
internal event EventHandler UIAMultiSelectChanged {
add { Events.AddHandler (UIAMultiSelectChangedEvent, value); }
remove { Events.RemoveHandler (UIAMultiSelectChangedEvent, value); }
}
internal event EventHandler UIALabelEditChanged {
add { Events.AddHandler (UIALabelEditChangedEvent, value); }
remove { Events.RemoveHandler (UIALabelEditChangedEvent, value); }
}
internal event EventHandler UIAViewChanged {
add { Events.AddHandler (UIAViewChangedEvent, value); }
remove { Events.RemoveHandler (UIAViewChangedEvent, value); }
}
internal event EventHandler UIAFocusedItemChanged {
add { Events.AddHandler (UIAFocusedItemChangedEvent, value); }
remove { Events.RemoveHandler (UIAFocusedItemChangedEvent, value); }
}
internal Rectangle UIAGetHeaderBounds (ListViewGroup group)
{
return group.HeaderBounds;
}
private void OnUIACheckBoxesChanged ()
{
EventHandler eh = (EventHandler) Events [UIACheckBoxesChangedEvent];
if (eh != null)
eh (this, EventArgs.Empty);
}
private void OnUIAShowGroupsChanged ()
{
EventHandler eh = (EventHandler) Events [UIAShowGroupsChangedEvent];
if (eh != null)
eh (this, EventArgs.Empty);
}
private void OnUIAMultiSelectChanged ()
{
EventHandler eh = (EventHandler) Events [UIAMultiSelectChangedEvent];
if (eh != null)
eh (this, EventArgs.Empty);
}
private void OnUIALabelEditChanged ()
{
EventHandler eh = (EventHandler) Events [UIALabelEditChangedEvent];
if (eh != null)
eh (this, EventArgs.Empty);
}
private void OnUIAViewChanged ()
{
EventHandler eh = (EventHandler) Events [UIAViewChangedEvent];
if (eh != null)
eh (this, EventArgs.Empty);
}
private void OnUIAFocusedItemChanged ()
{
EventHandler eh = (EventHandler) Events [UIAFocusedItemChangedEvent];
if (eh != null)
eh (this, EventArgs.Empty);
}
#endregion // UIA Framework: Methods, Properties and Events
#endif
}
}
@@ -69,35 +69,6 @@ namespace System.Windows.Forms
internal int row;
internal int col;
#if NET_2_0
#region UIA Framework: Methods, Properties and Events
internal event EventHandler UIATextChanged;
internal event LabelEditEventHandler UIASubItemTextChanged;
internal void OnUIATextChanged ()
{
if (UIATextChanged != null)
UIATextChanged (this, EventArgs.Empty);
}
internal void OnUIASubItemTextChanged (LabelEditEventArgs args)
{
//If our index is 0 we also generate TextChanged for the ListViewItem
//because ListViewItem.Text is the same as ListViewItem.SubItems [0].Text
if (args.Item == 0)
OnUIATextChanged ();
if (UIASubItemTextChanged != null)
UIASubItemTextChanged (this, args);
}
#endregion // UIA Framework: Methods, Properties and Events
#endif
#endregion Instance Variables
#region Public Constructors
@@ -625,12 +596,6 @@ namespace System.Windows.Forms
if (owner != null)
Layout ();
Invalidate ();
#if NET_2_0
//UIA Framework: Generates Text changed
OnUIATextChanged ();
#endif
}
}
@@ -808,36 +773,41 @@ namespace System.Windows.Forms
protected virtual void Deserialize (SerializationInfo info, StreamingContext context)
{
sub_items = new ListViewSubItemCollection (this, null);
int sub_items_count = 0;
Type lvsubitem_type = typeof (ListViewSubItem);
foreach (SerializationEntry entry in info) {
switch (entry.Name) {
case "Text":
sub_items.Add ((string)entry.Value);
case "subitems_count":
int count = (int)entry.Value;
if (count > 0) {
sub_items.Clear ();
ListViewSubItem [] si = new ListViewSubItem [count];
for (int i = 0; i < count; i++)
si [i] = (ListViewSubItem) info.GetValue ("subitem" + i, lvsubitem_type);
sub_items.AddRange (si);
}
break;
case "Font":
case "font":
font = (Font)entry.Value;
break;
case "Checked":
case "is_checked":
is_checked = (bool)entry.Value;
break;
case "ImageIndex":
case "image_index":
image_index = (int)entry.Value;
break;
case "StateImageIndex":
case "state_image_index":
state_image_index = (int)entry.Value;
break;
case "UseItemStyleForSubItems":
case "use_item_style":
use_item_style = (bool)entry.Value;
break;
case "SubItemCount":
sub_items_count = (int)entry.Value;
break;
#if NET_2_0
case "Group":
case "group":
group = (ListViewGroup)entry.Value;
break;
case "ImageKey":
case "image_key":
if (image_index == -1)
image_key = (string)entry.Value;
break;
@@ -845,39 +815,24 @@ namespace System.Windows.Forms
}
}
Type subitem_type = typeof (ListViewSubItem);
if (sub_items_count > 0) {
sub_items.Clear (); // .net fixup
Text = info.GetString ("Text");
for (int i = 0; i < sub_items_count - 1; i++)
sub_items.Add ((ListViewSubItem)info.GetValue ("SubItem" + (i + 1), subitem_type));
}
// After any sub item has been added.
ForeColor = (Color)info.GetValue ("ForeColor", typeof (Color));
BackColor = (Color)info.GetValue ("BackColor", typeof (Color));
}
protected virtual void Serialize (SerializationInfo info, StreamingContext context)
{
info.AddValue ("Text", Text);
info.AddValue ("Font", Font);
info.AddValue ("ImageIndex", image_index);
info.AddValue ("Checked", is_checked);
info.AddValue ("StateImageIndex", state_image_index);
info.AddValue ("UseItemStyleForSubItems", use_item_style);
info.AddValue ("BackColor", BackColor);
info.AddValue ("ForeColor", ForeColor);
info.AddValue ("subitems_count", sub_items.Count);
for (int i = 0; i < sub_items.Count; i++)
info.AddValue ("subitem" + i, sub_items [i]);
info.AddValue ("font", Font);
info.AddValue ("image_index", image_index);
info.AddValue ("is_checked", is_checked);
info.AddValue ("state_image_index", state_image_index);
info.AddValue ("use_item_style", use_item_style);
#if NET_2_0
info.AddValue ("ImageKey", image_key);
info.AddValue ("Group", group);
info.AddValue ("image_key", image_key);
info.AddValue ("group", group);
#endif
if (sub_items.Count > 1) {
info.AddValue ("SubItemCount", sub_items.Count);
for (int i = 1; i < sub_items.Count; i++) {
info.AddValue ("SubItem" + i, sub_items [i]);
}
}
}
#endregion // Protected Methods
@@ -1117,9 +1072,6 @@ namespace System.Windows.Forms
break;
#if NET_2_0
case View.Tile:
if (!Application.VisualStylesEnabled)
goto case View.LargeIcon;
label_rect = icon_rect = Rectangle.Empty;
if (owner.LargeImageList != null) {
@@ -1203,23 +1155,6 @@ namespace System.Windows.Forms
private SubItemStyle style;
[NonSerialized]
internal Rectangle bounds;
#if NET_2_0
#region UIA Framework: Methods, Properties and Events
[field:NonSerialized]
internal event EventHandler UIATextChanged;
private void OnUIATextChanged ()
{
if (UIATextChanged != null)
UIATextChanged (this, EventArgs.Empty);
}
#endregion // UIA Framework: Methods, Properties and Events
#endif
#region Public Constructors
public ListViewSubItem ()
@@ -1347,11 +1282,6 @@ namespace System.Windows.Forms
text = value;
Invalidate ();
#if NET_2_0
// UIA Framework: Generates SubItem TextChanged
OnUIATextChanged ();
#endif
}
}
#endregion // Public Instance Properties
@@ -1570,11 +1500,6 @@ namespace System.Windows.Forms
{
subItem.owner = owner;
list.Add (subItem);
#if NET_2_0
//UIA Framework
subItem.UIATextChanged += OnUIASubItemTextChanged;
#endif
}
public void Clear ()
@@ -1612,10 +1537,6 @@ namespace System.Windows.Forms
ListViewSubItem sub_item = (ListViewSubItem) item;
sub_item.owner = this.owner;
#if NET_2_0
//UIA Framework
sub_item.UIATextChanged += OnUIASubItemTextChanged;
#endif
return list.Add (sub_item);
}
@@ -1682,11 +1603,6 @@ namespace System.Windows.Forms
list.Insert (index, item);
owner.Layout ();
owner.Invalidate ();
#if NET_2_0
//UIA Framework
item.UIATextChanged += OnUIASubItemTextChanged;
#endif
}
public void Remove (ListViewSubItem item)
@@ -1694,11 +1610,6 @@ namespace System.Windows.Forms
list.Remove (item);
owner.Layout ();
owner.Invalidate ();
#if NET_2_0
//UIA Framework
item.UIATextChanged -= OnUIASubItemTextChanged;
#endif
}
#if NET_2_0
@@ -1712,28 +1623,9 @@ namespace System.Windows.Forms
public void RemoveAt (int index)
{
#if NET_2_0
//UIA Framework
if (index >= 0 && index < list.Count)
((ListViewSubItem) list [index]).UIATextChanged -= OnUIASubItemTextChanged;
#endif
list.RemoveAt (index);
}
#endregion // Public Methods
#if NET_2_0
#region UIA Event Handler
private void OnUIASubItemTextChanged (object sender, EventArgs args)
{
owner.OnUIASubItemTextChanged (new LabelEditEventArgs (list.IndexOf (sender)));
}
#endregion
#endif
}
#endregion // Subclasses
}
@@ -657,7 +657,6 @@ namespace System.Windows.Forms {
}
SizeScrollBars ();
SetParentText (false);
form.Dispose();
}
internal void ActivateNextChild ()
@@ -62,52 +62,6 @@ namespace System.Windows.Forms {
#endif
#endregion // Local Variables
#region UIA FrameWork Events
#if NET_2_0
static object UIAMinimumChangedEvent = new object ();
internal event EventHandler UIAMinimumChanged {
add { Events.AddHandler (UIAMinimumChangedEvent, value); }
remove { Events.RemoveHandler (UIAMinimumChangedEvent, value); }
}
internal void OnUIAMinimumChanged (EventArgs e)
{
EventHandler eh = (EventHandler) Events [UIAMinimumChangedEvent];
if (eh != null)
eh (this, e);
}
static object UIAMaximumChangedEvent = new object ();
internal event EventHandler UIAMaximumChanged {
add { Events.AddHandler (UIAMaximumChangedEvent, value); }
remove { Events.RemoveHandler (UIAMaximumChangedEvent, value); }
}
internal void OnUIAMaximumChanged (EventArgs e)
{
EventHandler eh = (EventHandler) Events [UIAMaximumChangedEvent];
if (eh != null)
eh (this, e);
}
static object UIASmallChangeChangedEvent = new object ();
internal event EventHandler UIASmallChangeChanged {
add { Events.AddHandler (UIASmallChangeChangedEvent, value); }
remove { Events.RemoveHandler (UIASmallChangeChangedEvent, value); }
}
internal void OnUIASmallChangeChanged (EventArgs e)
{
EventHandler eh = (EventHandler) Events [UIASmallChangeChangedEvent];
if (eh != null)
eh (this, e);
}
#endif
#endregion
#region Public Constructors
public NumericUpDown() {
suppress_validation = false;
@@ -250,11 +204,6 @@ namespace System.Windows.Forms {
}
increment = value;
#if NET_2_0
// UIA Framework Event: SmallChange Changed
OnUIASmallChangeChanged (EventArgs.Empty);
#endif
}
}
@@ -272,11 +221,6 @@ namespace System.Windows.Forms {
if (dvalue > maximum)
Value = maximum;
#if NET_2_0
// UIA Framework Event: Maximum Changed
OnUIAMaximumChanged (EventArgs.Empty);
#endif
}
}
@@ -294,11 +238,6 @@ namespace System.Windows.Forms {
if (dvalue < minimum)
Value = minimum;
#if NET_2_0
// UIA Framework Event: Minimum Changed
OnUIAMinimumChanged (EventArgs.Empty);
#endif
}
}
@@ -386,11 +325,6 @@ namespace System.Windows.Forms {
}
Value = Math.Max (minimum, unchecked (dvalue - increment));
#if NET_2_0
// UIA Framework Event: DownButton Click
OnUIADownButtonClick (EventArgs.Empty);
#endif
}
public override void UpButton() {
@@ -399,11 +333,6 @@ namespace System.Windows.Forms {
}
Value = Math.Min (maximum, unchecked (dvalue + increment));
#if NET_2_0
// UIA Framework Event: UpButton Click
OnUIAUpButtonClick (EventArgs.Empty);
#endif
}
#endregion // Public Instance Methods
@@ -357,16 +357,10 @@ namespace System.Windows.Forms
}
set {
if (value < 0)
#if NET_2_0
throw new ArgumentOutOfRangeException ("Maximum",
#else
throw new ArgumentException(
#endif
string.Format("Value '{0}' must be greater than or equal to 0.", value ));
maximum = value;
minimum = Math.Min (minimum, maximum);
val = Math.Min (val, maximum);
Refresh ();
}
}
@@ -379,16 +373,10 @@ namespace System.Windows.Forms
}
set {
if (value < 0)
#if NET_2_0
throw new ArgumentOutOfRangeException ("Minimum",
#else
throw new ArgumentException(
#endif
string.Format("Value '{0}' must be greater than or equal to 0.", value ));
minimum = value;
maximum = Math.Max (maximum, minimum);
val = Math.Max (val, minimum);
Refresh ();
}
}
@@ -446,24 +434,18 @@ namespace System.Windows.Forms
}
set {
if (value != ProgressBarStyle.Blocks && value != ProgressBarStyle.Continuous
&& value != ProgressBarStyle.Marquee)
throw new InvalidEnumArgumentException ("value", unchecked((int)value), typeof (ProgressBarStyle));
if (style != value) {
style = value;
if (style == ProgressBarStyle.Marquee) {
if (marquee_timer == null) {
marquee_timer = new Timer ();
marquee_timer.Interval = 10;
marquee_timer.Tick += new EventHandler (marquee_timer_Tick);
}
marquee_timer.Start ();
} else {
if (marquee_timer != null) {
marquee_timer.Stop ();
}
Refresh ();
style = value;
if (style == ProgressBarStyle.Marquee) {
if (marquee_timer == null) {
marquee_timer = new Timer ();
marquee_timer.Interval = 10;
marquee_timer.Tick += new EventHandler (marquee_timer_Tick);
}
marquee_timer.Start ();
} else {
if (marquee_timer != null) {
marquee_timer.Stop ();
}
}
}
@@ -535,10 +517,6 @@ namespace System.Windows.Forms
public void Increment (int value)
{
#if NET_2_0
if (Style == ProgressBarStyle.Marquee)
throw new InvalidOperationException ("Increment should not be called if the style is Marquee.");
#endif
int newValue = Value + value;
if (newValue < Minimum)
@@ -585,11 +563,11 @@ namespace System.Windows.Forms
public void PerformStep ()
{
#if NET_2_0
if (Style == ProgressBarStyle.Marquee)
throw new InvalidOperationException ("PerformStep should not be called if the style is Marquee.");
#endif
Increment (Step);
if (Value >= Maximum)
return;
Value = Maximum < Value + Step ? Maximum : Value + Step;
Refresh (); // FIXME - calculate delta and only expose that
}
#if NET_2_0
@@ -1069,13 +1069,6 @@ namespace System.Windows.Forms {
}
}
#if NET_2_0
private void HandleScrollEvent (object sender, ScrollEventArgs args)
{
OnScroll (args);
}
#endif
private void AddScrollbars (object o, EventArgs e)
{
Controls.AddRangeImplicit (new Control[] {hscrollbar, vscrollbar, sizegrip});
@@ -1088,17 +1081,11 @@ namespace System.Windows.Forms {
hscrollbar.Visible = false;
hscrollbar.ValueChanged += new EventHandler (HandleScrollBar);
hscrollbar.Height = SystemInformation.HorizontalScrollBarHeight;
#if NET_2_0
hscrollbar.Scroll += new ScrollEventHandler (HandleScrollEvent);
#endif
vscrollbar = new ImplicitVScrollBar ();
vscrollbar.Visible = false;
vscrollbar.ValueChanged += new EventHandler (HandleScrollBar);
vscrollbar.Width = SystemInformation.VerticalScrollBarWidth;
#if NET_2_0
vscrollbar.Scroll += new ScrollEventHandler (HandleScrollEvent);
#endif
sizegrip = new SizeGrip (this);
sizegrip.Visible = false;
@@ -1137,7 +1124,7 @@ namespace System.Windows.Forms {
protected virtual void OnScroll (ScrollEventArgs se)
{
ScrollEventHandler eh = (ScrollEventHandler) (Events [OnScrollEvent]);
EventHandler eh = (EventHandler) (Events [OnScrollEvent]);
if (eh != null)
eh (this, se);
}
@@ -1611,27 +1611,13 @@ namespace System.Windows.Forms {
public override void Remove (Control value)
{
bool change_index = false;
TabPage page = value as TabPage;
if (page != null && owner.Controls.Contains (page)) {
int index = owner.IndexForTabPage (page);
if (index < owner.SelectedIndex || owner.SelectedIndex == Count - 1)
change_index = true;
owner.SelectedIndex--;
}
base.Remove (value);
// We don't want to raise SelectedIndexChanged until after we
// have removed from the collection, so TabCount will be
// correct for the user.
if (change_index && Count > 0)
owner.SelectedIndex--;
else if (change_index) {
owner.selected_index = -1;
owner.OnSelectedIndexChanged (EventArgs.Empty);
} else
owner.Redraw ();
}
}
#endregion // Class TabControl.ControlCollection
@@ -218,30 +218,19 @@ namespace System.Windows.Forms {
}
}
internal bool CanNavigateAutoCompleteList {
internal int AutoCompleteMatchesCount {
get {
if (auto_complete_mode == AutoCompleteMode.None)
return false;
if (auto_complete_matches == null || auto_complete_matches.Count == 0)
return false;
return -1;
if (auto_complete_matches == null)
return -1;
bool suggest_window_visible = auto_complete_listbox != null && auto_complete_listbox.Visible;
if (auto_complete_mode == AutoCompleteMode.Suggest && !suggest_window_visible)
return false;
return true;
return auto_complete_matches.Count;
}
}
bool NavigateAutoCompleteList (Keys key)
void NavigateAutoCompleteList (Keys key)
{
if (auto_complete_matches == null || auto_complete_matches.Count == 0)
return false;
bool suggest_window_visible = auto_complete_listbox != null && auto_complete_listbox.Visible;
if (!suggest_window_visible && auto_complete_mode == AutoCompleteMode.Suggest)
return false;
int index = auto_complete_selected_index;
switch (key) {
@@ -256,9 +245,6 @@ namespace System.Windows.Forms {
index = -1;
break;
case Keys.PageUp:
if (auto_complete_mode == AutoCompleteMode.Append || !suggest_window_visible)
goto case Keys.Up;
if (index == -1)
index = auto_complete_matches.Count - 1;
else if (index == 0)
@@ -270,9 +256,6 @@ namespace System.Windows.Forms {
}
break;
case Keys.PageDown:
if (auto_complete_mode == AutoCompleteMode.Append || !suggest_window_visible)
goto case Keys.Down;
if (index == -1)
index = 0;
else if (index == auto_complete_matches.Count - 1)
@@ -287,19 +270,16 @@ namespace System.Windows.Forms {
break;
}
// In SuggestAppend mode the navigation mode depends on the visibility of the suggest lb.
bool suggest = auto_complete_mode == AutoCompleteMode.Suggest || auto_complete_mode == AutoCompleteMode.SuggestAppend;
if (suggest && suggest_window_visible) {
if (suggest) {
Text = index == -1 ? auto_complete_original_text : auto_complete_matches [index];
auto_complete_listbox.HighlightedIndex = index;
} else
// Append only, not suggest at all
// Append mode-only, not suggest at all
AppendAutoCompleteMatch (index < 0 ? 0 : index);
auto_complete_selected_index = index;
document.MoveCaret (CaretDirection.End);
return true;
}
void AppendAutoCompleteMatch (int index)
@@ -650,16 +630,10 @@ namespace System.Windows.Forms {
case Keys.Up:
case Keys.PageDown:
case Keys.PageUp:
if (NavigateAutoCompleteList (key_data)) {
m.Result = IntPtr.Zero;
return;
}
break;
NavigateAutoCompleteList (key_data);
m.Result = IntPtr.Zero;
return;
case Keys.Enter:
if (auto_complete_listbox != null && auto_complete_listbox.Visible)
auto_complete_listbox.HideListBox (false);
SelectAll ();
break;
case Keys.Escape:
if (auto_complete_listbox != null && auto_complete_listbox.Visible)
auto_complete_listbox.HideListBox (false);
@@ -962,8 +936,10 @@ namespace System.Windows.Forms {
public void HideListBox (bool set_text)
{
if (set_text)
if (set_text) {
owner.Text = owner.auto_complete_matches [HighlightedIndex];
owner.SelectAll ();
}
Capture = false;
Hide ();
@@ -1770,18 +1770,6 @@ namespace System.Windows.Forms
}
}
#region UIA Framework Properties
internal ScrollBar UIAHScrollBar {
get { return hscroll; }
}
internal ScrollBar UIAVScrollBar {
get { return vscroll; }
}
#endregion UIA Framework Properties
internal Graphics CreateGraphicsInternal ()
{
if (IsHandleCreated)
@@ -312,7 +312,6 @@ namespace System.Windows.Forms {
}
}
// UIA: Method used via reflection in TextRangeProvider
internal int Lines {
get {
return lines;
@@ -944,7 +943,7 @@ namespace System.Windows.Forms {
offset_x,
line.Y - viewport_y + offset_y,
viewport_width,
owner.Height - (line.Y - viewport_y)));
owner.Height - line.Y - viewport_y));
} else {
// The tag was above the visible area, draw everything
owner.Invalidate();
@@ -1680,18 +1679,6 @@ namespace System.Windows.Forms {
Console.WriteLine ("</doc>");
}
// UIA: Used via reflection by TextProviderBehavior
internal void GetVisibleLineIndexes (Rectangle clip, out int start, out int end)
{
if (multiline) {
start = GetLineByPixel(clip.Top + viewport_y - offset_y, false).line_no;
end = GetLineByPixel(clip.Bottom + viewport_y - offset_y, false).line_no;
} else {
start = GetLineByPixel(clip.Left + viewport_x - offset_x, false).line_no;
end = GetLineByPixel(clip.Right + viewport_x - offset_x, false).line_no;
}
}
internal void Draw (Graphics g, Rectangle clip)
{
Line line; // Current line being drawn
@@ -1704,7 +1691,14 @@ namespace System.Windows.Forms {
Color current_color;
// First, figure out from what line to what line we need to draw
GetVisibleLineIndexes (clip, out start, out end);
if (multiline) {
start = GetLineByPixel(clip.Top + viewport_y - offset_y, false).line_no;
end = GetLineByPixel(clip.Bottom + viewport_y - offset_y, false).line_no;
} else {
start = GetLineByPixel(clip.Left + viewport_x - offset_x, false).line_no;
end = GetLineByPixel(clip.Right + viewport_x - offset_x, false).line_no;
}
// remove links in the list (used for mouse down events) that are within the clip area.
InvalidateLinks (clip);
@@ -3365,8 +3359,6 @@ namespace System.Windows.Forms {
}
// UIA: Method used via reflection in TextRangeProvider
/// <summary>Give it a Line number and it returns the Line object at with that line number</summary>
internal Line GetLine(int LineNo) {
Line line = document;
@@ -3491,8 +3483,6 @@ namespace System.Windows.Forms {
return last;
}
// UIA: Method used via reflection in TextProviderBehavior
// Give it x/y pixel coordinates and it returns the Tag at that position
internal LineTag FindCursor (int x, int y, out int index)
{
@@ -1160,7 +1160,6 @@ namespace System.Windows.Forms
#endif
default: // Blocks
int block_width = renderer.GetInteger (IntegerProperty.ProgressChunkSize);
block_width = Math.Max (block_width, 0); // block_width is used to break out the loop below, it must be >= 0!
int first_pixel_outside_filled_area = (int)(((double)(ctrl.Value - ctrl.Minimum) * client_area.Width) / (Math.Max (ctrl.Maximum - ctrl.Minimum, 1))) + client_area.X;
int block_count = 0;
int increment = block_width + renderer.GetInteger (IntegerProperty.ProgressSpaceSize);
@@ -51,6 +51,7 @@ namespace System.Windows.Forms
/* Hardcoded colour values not exposed in the API constants in all configurations */
protected static readonly Color arrow_color = Color.Black;
protected static readonly Color pen_ticks_color = Color.Black;
protected static readonly Color progressbarblock_color = Color.FromArgb (255, 0, 0, 128);
protected static StringFormat string_format_menu_text;
protected static StringFormat string_format_menu_shortcut;
protected static StringFormat string_format_menu_menubar_text;
@@ -2660,7 +2661,7 @@ namespace System.Windows.Forms
}
#if NET_2_0
if (control.UsingGroups) {
if (control.ShowGroups && control.View != View.List && control.Groups.Count > 0) {
// Use InternalCount instead of Count to take into account Default Group as needed
for (int i = 0; i < control.Groups.InternalCount; i++) {
ListViewGroup group = control.Groups.GetInternalGroup (i);
@@ -2671,7 +2672,7 @@ namespace System.Windows.Forms
ListViewInsertionMark insertion_mark = control.InsertionMark;
int insertion_mark_index = insertion_mark.Index;
if (Application.VisualStylesEnabled && insertion_mark.Bounds != Rectangle.Empty &&
if (insertion_mark.Bounds != Rectangle.Empty &&
(control.View != View.Details && control.View != View.List) &&
insertion_mark_index > -1 && insertion_mark_index < control.Items.Count) {
@@ -3014,7 +3015,7 @@ namespace System.Windows.Forms
#if NET_2_0
// Tile view renders its Text in a different fashion
if (control.View == View.Tile && Application.VisualStylesEnabled) {
if (control.View == View.Tile) {
// Item.Text is drawn using its first subitem's bounds
dc.DrawString (item.Text, item.Font, textBrush, item.SubItems [0].Bounds, format);
@@ -3052,12 +3053,10 @@ namespace System.Windows.Forms
width += col.Width;
focus_rect = new Rectangle (0, full_rect.Y, width, full_rect.Height);
}
if (control.ShowFocusCues) {
if (item.Selected)
CPDrawFocusRectangle (dc, focus_rect, ColorHighlightText, ColorHighlight);
else
CPDrawFocusRectangle (dc, focus_rect, control.ForeColor, control.BackColor);
}
if (item.Selected)
CPDrawFocusRectangle (dc, focus_rect, ColorHighlightText, ColorHighlight);
else
CPDrawFocusRectangle (dc, focus_rect, control.ForeColor, control.BackColor);
}
format.Dispose ();
@@ -4252,7 +4251,7 @@ namespace System.Windows.Forms
case 1: { // Continuous
int pixels_to_draw;
pixels_to_draw = (int)(client_area.Width * ((double)(ctrl.Value - ctrl.Minimum) / (double)(Math.Max(ctrl.Maximum - ctrl.Minimum, 1))));
dc.FillRectangle (ResPool.GetSolidBrush (ctrl.ForeColor), new Rectangle (client_area.X, client_area.Y, pixels_to_draw, client_area.Height));
dc.FillRectangle (ResPool.GetSolidBrush (progressbarblock_color), new Rectangle (client_area.X, client_area.Y, pixels_to_draw, client_area.Height));
break;
}
case 2: // Marquee
@@ -4275,7 +4274,6 @@ namespace System.Windows.Forms
int block_count = 0;
block_width = ProgressBarGetChunkSize (client_area.Height);
block_width = Math.Max (block_width, 0); // block_width is used to break out the loop below, it must be >= 0!
barpos_pixels = (int)(((double)(ctrl.Value - ctrl.Minimum) * client_area.Width) / (Math.Max (ctrl.Maximum - ctrl.Minimum, 1)));
increment = block_width + space_betweenblocks;
@@ -4292,7 +4290,7 @@ namespace System.Windows.Forms
}
if (clip_rect.IntersectsWith (block_rect) == true) {
dc.FillRectangle (ResPool.GetSolidBrush (ctrl.ForeColor), block_rect);
dc.FillRectangle (ResPool.GetSolidBrush (progressbarblock_color), block_rect);
}
block_rect.X += increment;
@@ -4312,8 +4310,7 @@ namespace System.Windows.Forms
static int ProgressBarGetChunkSize (int progressBarClientAreaHeight)
{
int size = (progressBarClientAreaHeight * 2) / 3;
return size;
return (progressBarClientAreaHeight * 2) / 3;
}
const int ProgressBarDefaultHeight = 23;
@@ -317,7 +317,7 @@ namespace System.Windows.Forms
internal override void HandleClick (EventArgs e)
{
OnClick (e);
base.OnClick (e);
}
internal void HideDropDown (ToolStripDropDownCloseReason reason)
@@ -1755,8 +1755,8 @@ namespace System.Windows.Forms
switch (met) {
case ToolStripItemEventType.MouseUp:
this.HandleClick (e);
this.OnMouseUp ((MouseEventArgs)e);
this.HandleClick (e);
break;
case ToolStripItemEventType.MouseDown:
this.OnMouseDown ((MouseEventArgs)e);
@@ -43,24 +43,6 @@ namespace System.Windows.Forms
private bool link_visited;
private Color visited_link_color;
#region UIA FrameWork Events
#if NET_2_0
static object UIAIsLinkChangedEvent = new object ();
internal event EventHandler UIAIsLinkChanged {
add { Events.AddHandler (UIAIsLinkChangedEvent, value); }
remove { Events.RemoveHandler (UIAIsLinkChangedEvent, value); }
}
internal void OnUIAIsLinkChanged (EventArgs e)
{
EventHandler eh = (EventHandler) Events [UIAIsLinkChangedEvent];
if (eh != null)
eh (this, e);
}
#endif
#endregion
#region Public Constructors
public ToolStripLabel ()
: this (null, null, false, null, String.Empty)
@@ -121,10 +103,6 @@ namespace System.Windows.Forms
set {
this.is_link = value;
this.Invalidate ();
#if NET_2_0
// UIA Framework Event: IsLink Changed
OnUIAIsLinkChanged (EventArgs.Empty);
#endif
}
}
@@ -362,14 +362,6 @@ namespace System.Windows.Forms
protected override void OnRenderToolStripBackground (ToolStripRenderEventArgs e)
{
// Don't clear and fill the background if we already painted an image there
if (e.ToolStrip.BackgroundImage != null) {
if (e.ToolStrip is StatusStrip)
e.Graphics.DrawLine (Pens.White, e.AffectedBounds.Left, e.AffectedBounds.Top, e.AffectedBounds.Right, e.AffectedBounds.Top);
return;
}
if (e.ToolStrip is ToolStripDropDown) {
e.Graphics.Clear (this.ColorTable.ToolStripDropDownBackground);
return;
@@ -91,7 +91,7 @@ namespace System.Windows.Forms
[Browsable (false)]
public Rectangle ButtonBounds {
get { return new Rectangle (Bounds.Left, Bounds.Top, this.Bounds.Width - this.drop_down_button_width - 1, this.Height); }
get { return new Rectangle (0, 0, this.Bounds.Width - this.drop_down_button_width - 1, this.Height); }
}
[Browsable (false)]
@@ -118,7 +118,7 @@ namespace System.Windows.Forms
[Browsable (false)]
public Rectangle DropDownButtonBounds {
get { return new Rectangle (this.Bounds.Right - this.drop_down_button_width, 0, this.drop_down_button_width, this.Bounds.Height); }
get { return new Rectangle (this.Bounds.Width - this.drop_down_button_width, 0, this.drop_down_button_width, this.Bounds.Height); }
}
[Browsable (false)]
@@ -360,10 +360,6 @@ namespace System.Windows.Forms {
internal static event ControlEventHandler UIAToolTipHookUp;
internal static event ControlEventHandler UIAToolTipUnhookUp;
internal Rectangle UIAToolTipRectangle {
get { return tooltip_window.Bounds; }
}
internal static void OnUIAUnPopup (object sender, PopupEventArgs args)
{
if (UIAUnPopup != null)
@@ -771,12 +771,8 @@ namespace System.Windows.Forms {
} else {
RecalculateVisibleOrder (root_node);
UpdateScrollBars (true);
// Only move the top node if we now have a scrollbar
if (vbar.VisibleInternal) {
SetTop (Nodes [Nodes.Count - 1]);
SelectedNode = Nodes [Nodes.Count - 1];
}
SetTop (Nodes [Nodes.Count - 1]);
SelectedNode = Nodes [Nodes.Count - 1];
}
}
@@ -397,38 +397,6 @@ namespace System.Windows.Forms
}
#endregion
#region UIA Framework Events
#if NET_2_0
static object UIAUpButtonClickEvent = new object ();
internal event EventHandler UIAUpButtonClick {
add { Events.AddHandler (UIAUpButtonClickEvent, value); }
remove { Events.RemoveHandler (UIAUpButtonClickEvent, value); }
}
internal void OnUIAUpButtonClick (EventArgs e)
{
EventHandler eh = (EventHandler) Events [UIAUpButtonClickEvent];
if (eh != null)
eh (this, e);
}
static object UIADownButtonClickEvent = new object ();
internal event EventHandler UIADownButtonClick {
add { Events.AddHandler (UIADownButtonClickEvent, value); }
remove { Events.RemoveHandler (UIADownButtonClickEvent, value); }
}
internal void OnUIADownButtonClick (EventArgs e)
{
EventHandler eh = (EventHandler) Events [UIADownButtonClickEvent];
if (eh != null)
eh (this, e);
}
#endif
#endregion
#region Private Methods
private void TabIndexChangedHandler (object sender, EventArgs e)
{
@@ -96,11 +96,10 @@ namespace System.Windows.Forms
[BrowsableAttribute(false)]
[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
public Stream DocumentStream {
get {
return WebHost.Document.DocumentElement.ContentStream;
// string text = this.DocumentText;
// StreamReader s = new StreamReader (text);
// return s.BaseStream;
get {
string text = this.DocumentText;
StreamReader s = new StreamReader (text);
return s.BaseStream;
}
set {
if (this.allowNavigation && this.navigated)
@@ -116,7 +115,7 @@ namespace System.Windows.Forms
[BrowsableAttribute(false)]
[DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
public string DocumentText {
get {
get {
if (!this.navigated)
return String.Empty;
return WebHost.Document.DocumentElement.OuterHTML;
@@ -120,7 +120,7 @@ namespace System.Windows.Forms {
public static bool RunningOnUnix {
get {
#if NET_2_0
return (Environment.OSVersion.Platform == PlatformID.Unix || Environment.OSVersion.Platform == PlatformID.MacOSX);
return (Environment.OSVersion.Platform == PlatformID.Unix);
#else
int platform = (int) Environment.OSVersion.Platform;
return (platform == 128);
@@ -2059,8 +2059,6 @@ namespace System.Windows.Forms {
if (msg.hwnd != prev_mouse_hwnd) {
TRACKMOUSEEVENT tme;
mouse_state = Control.FromParamToMouseButtons ((int)msg.lParam.ToInt32());
// The current message will be sent out next time around
StoreMessage(ref msg);
@@ -2082,9 +2080,7 @@ namespace System.Windows.Forms {
case Msg.WM_NCMOUSEMOVE: {
if (wm_nc_registered == null || !wm_nc_registered.Contains (msg.hwnd))
break;
mouse_state = Control.FromParamToMouseButtons ((int)msg.lParam.ToInt32 ());
TRACKMOUSEEVENT tme;
tme = new TRACKMOUSEEVENT ();
File diff suppressed because it is too large. Load diff
@@ -1,11 +1,3 @@
2008-10-31 Andreia Gaita <[email protected]>
* CompatTest.cs, CultureTest.cs, ResXDataNodeTest.cs,
ResXFileRefTest.cs, ResXResourceReaderTest.cs, WriterTest.cs:
All tests now inherit from TestHelper so that the setup and
teardown routines are always called (barring one or two that already
inherit from swf classes that needs to be fixed)
2008-08-24 Gert Driesen <[email protected]>
* ResXFileRefTest.cs: Fixed/added attributes on SetUp and TearDown
@@ -15,7 +15,7 @@ using NUnit.Framework;
namespace MonoTests.System.Resources
{
[TestFixture]
public class CompatTest : MonoTests.System.Windows.Forms.TestHelper
public class CompatTest
{
class Helper
{
@@ -18,22 +18,20 @@ using NUnit.Framework;
namespace MonoTests.System.Resources
{
[TestFixture]
public class CultureTest : MonoTests.System.Windows.Forms.TestHelper
public class CultureTest
{
string fileName = null;
[SetUp]
protected override void SetUp ()
public void SetUp ()
{
fileName = Path.GetTempFileName ();
base.SetUp ();
}
[TearDown]
protected override void TearDown ()
public void TearDown ()
{
File.Delete (fileName);
base.TearDown ();
}
[Test]
Loaded 100 of 1503 files, more files were not shown because too many files have changed in this diff. Show more