Commit Graph
116 Commits
Author SHA1 Message Date
Marek Habersack e44ec112e6 Make a method private for 1.x
svn path=/trunk/mcs/; revision=68245
2006-11-21 10:38:37 +00:00
Marek Habersack 87220504f3 Implemented a few missing properties
svn path=/trunk/mcs/; revision=68219
2006-11-20 21:06:44 +00:00
Vladimir Krasnov d76d6662e8 * Control.cs: implemented AppRelativeTemplateSourceDirectory for aspx parser 2.0
* TemplateControl.jvm.cs: fixed AppRelativeVirtualPath 
fixed TemplateSourceDirectory, should not work on master pages. 

svn path=/trunk/mcs/; revision=64186
2006-08-22 12:18:22 +00:00
Robert Jordan 75ae118853 2006-08-09 Robert Jordan <[email protected]>
* Control.cs: add the 2.0 ResolveClientUrl method.
	Expose ResolveClientUrl as internal for the 1.1 profile.
	Fixes bug #77539.


svn path=/trunk/mcs/; revision=63535
2006-08-09 13:01:40 +00:00
Vladimir Krasnov 3084af0bbf * Control.cs: fixed EnableTheming proprty, fixes bug when child control has EnableTheming=false and parent has true.
svn path=/trunk/mcs/; revision=63407
2006-08-06 12:35:14 +00:00
Vladimir Krasnov b5164e5773 * Control.cs: fixed EnableTheming proprty, fixes the bug when skins are applied even if EnableTheming property was set to false.
svn path=/trunk/mcs/; revision=63169
2006-07-31 08:12:07 +00:00
Konstantin Triger cf9bc5dad9 bug fixes found by Test/System.Web.UI.WebControls/BoundFieldTest
svn path=/trunk/mcs/; revision=62314
2006-07-06 13:39:11 +00:00
Andrew Skiba 07624f6bb1 move 2.0 stuff into ifdef NET_2_0
svn path=/trunk/mcs/; revision=61106
2006-05-25 11:41:52 +00:00
Andrew Skiba 6a2f9295dd Fix the order of OnInit invocation of controls created via master page content (see http://lists.ximian.com/pipermail/mono-devel-list/2006-May/018585.html ).
svn path=/trunk/mcs/; revision=61098
2006-05-25 07:39:34 +00:00
Konstantin Triger 5438195147 implementation for IsViewStateEnabled
svn path=/trunk/mcs/; revision=59836
2006-04-25 07:42:57 +00:00
Andrew Skiba 1f0528ada1 test and fix for null pointer exception
svn path=/trunk/mcs/; revision=59834
2006-04-25 06:41:15 +00:00
Chris Toshok 21a79cd2e6 2006-04-02 Chris Toshok <[email protected]>
* Control.cs (DesignMode): always return false for now.  Fixes
	#77991.


svn path=/trunk/mcs/; revision=58917
2006-04-02 16:19:50 +00:00
Chris Toshok ca85ad3c1f In System.Web.UI:
2006-03-07  Chris Toshok  <[email protected]>

	* Page.cs (InitializeStyleSheet): load the style sheet theme using
	ThemeDirectoryCompiler.
	(InitializeTheme): load the page's theme using
	ThemeDirectoryCompiler.
	(InternalProcessRequest): call InitializeTheme after OnPreInit.
	(FrameworkInitialize): call InitializeStyleSheet.
	(PageTheme,StyleSheetPageTheme): new properties to get the
	respective themes.

	* Control.cs (ApplyStyleSheetSkin): new method.  Calls ApplySkin
	on the ControlSkin (if there is one) for this control in the
	page's StyleSheetSkin.
	(ApplyThemeRecursively): applies the page's theme recursively to
	the control hierarchy.  Must be done this way because the control
	tree is already present when we apply the theme (it has to be,
	since theme's override settings).

	* PageTheme.cs (GetControlSkin): add internal call to do the
	lookup for us.

	* PageThemeFileParser.cs: the parser object that represents each
	individual skin file.

	* PageThemeParser.cs: the parser object that represents the entire
	theme directory.

	* PageThemeBuilder.cs: this class generates the right exception on
	the right event, but it's not hooked up yet.

In System.Web.UI.WebControls:
2006-03-07  Chris Toshok  <[email protected]>

	* WebControl.cs (EnableTheming): leave the MonoTODO, but implement
	by chaining up to base.EnableTheming.


svn path=/trunk/mcs/; revision=57676
2006-03-07 22:39:43 +00:00
Chris Toshok 9cd26e2c03 In System.Web.UI:
2006-03-02  Chris Toshok  <[email protected]>

	* Control.cs (ApplyStyleSheetTheme): remove the exception, and add
	a MonoTODO.

	* Page.cs (Theme): implement setter/getter.
	(StyleSheetTheme): same.
	
	* PageParser.cs (ProcessMainAttributes): parse the Theme and
	StyleSheetTheme attributes.

In System.Web.UI.WebControls:
2006-03-02  Chris Toshok  <[email protected]>

	* WebControl.cs (SkinID): implement setter/getter, and have them
	just chain up to base.SkinID.

In System.Web.Compilation:
2006-03-02  Chris Toshok  <[email protected]>

	* TemplateControlCompiler.cs (InitMethod): emit an assignment for
	SkinID just after the creation of our object, and right after that
	call "_ctrl.ApplyStyleSheetSkin (page)".
	(CreateAssignStatementsFromAttributes): split out the majority of
	this code to CreateAssignStatementFromAttribute, and change this
	method to simply a loop over the attribute keys.  In the 2.0 case,
	skip the SkinID property, since that's handled explicitly in
	InitMethod.

	* PageCompiler.cs (AddStatementsToInitMethod): emit assignments
	for Theme and StyleSheetTheme.


svn path=/trunk/mcs/; revision=57516
2006-03-02 19:30:08 +00:00
Chris Toshok 20ca96da5a 2006-02-07 Chris Toshok <[email protected]>
* MasterPage.cs: rework this file, adding some static methods
	gleaned from MS stack traces, and clear up the propogation of
	content templates between nested master pages.

	* Control.cs (TemplateControl): implement.

	* TemplateControl.cs: re-indent some of the code.
	(ReadStringRecource): according to msdn2, these throw
	NotSupportedException.

	* MasterPageParser.cs (HandleOption): implement.  assign our
	master page's MasterPageFile from the UserControl property.

	* UserControl.cs (InitializeAsUserControlInternal): new method
	that allows initialization without a page.

	* UserControlParser.cs (ProcessMainAttributes): for 2.0 handle
	MasterPageFile attributes, so we can have nested master pages.
	(MasterPageFile): add a 2.0 specific property.
	
	* TemplateControlParser.cs: in .net 2.0, our base class is
	BaseTemplateParser.
	(HandleOptions): be consistent and call base.HandleOptions.

	* BaseTemplateParser.cs: new (stubbed) class.

	* MasterPageControlBuilder.cs: new file, not filled in (and really
	not used either.)

	* Page.cs (InternalProcessRequest): call ApplyMasterPage.
	(SaveExistingContentTemplates): nuke.
	(ReapplyExistingContentTemplate): nuke.
	(ApplyMasterPage): if we have a master page, call
	MasterPage.ApplyMasterPageRecursive with it and add it to our
	controls.
	(set_MasterPageFile): remove call to SaveExistingContentTemplates.
	(get_Master): call MasterPage.CreateMasterPage.
	(AddContentTemplate): keep track of the page's content templates
	in a local Hashtable - they aren't our master page's content
	templates.


svn path=/trunk/mcs/; revision=56620
2006-02-07 16:49:01 +00:00
Gonzalo Paniagua Javier fe283242da 2005-12-08 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: use _controls instead of the property wherever possible.


svn path=/trunk/mcs/; revision=54099
2005-12-08 08:17:29 +00:00
Gonzalo Paniagua Javier 1e872ff7f4 2005-12-05 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: use the _controls field instead of the Controls property.
	Fixes bug #76919.


svn path=/trunk/mcs/; revision=53954
2005-12-05 22:37:45 +00:00
Gonzalo Paniagua Javier dfdec159d7 2005-09-29 Gonzalo Paniagua Javier <[email protected]>
* System.Web.UI/DesignerDataBoundLiteralControl.cs: changed autoid api.
	* System.Web.UI/DataBoundLiteralControl.cs: changed autoid api.

	* System.Web.UI/Control.cs: fixlet for UniqueID and weird test case.
	Removed PreventAutoID and only use the property to set that value.

	* System.Web.UI/LiteralControl.cs: changed autoid api.

	* System.Web.UI.WebControls/Button.cs: implemented 2.0
	RaisePostBackEvent in terms of the existing code in 1.1 (or viceversa).
	RenderContents() does nothing.

	* System.Web.UI.WebControls/DataGrid.cs: changed autoid api.

	* System.Web.UI.WebControls/EditCommandColumn.cs: only 'Update' causes
	validation.

	* System.Web.UI.WebControls/TableCell.cs: changed autoid api.
	RenderContents checks the number of controls to decide what to do, not
	the value of Text in the viewstate.

	* System.Web.UI.WebControls/TableRow.cs: changed autoid api.

	* System.Web.UI.WebControls/BoundColumn.cs: SelectedItem was missing
	when attaching a DataBind event. When we get an EditItem, we need a
	TextBox to be created and this one will be the one that gets the event.
	Changed ItemDataBinding to deal with a TextBox too.

	All tests pass now in the default profile (2 not run).


svn path=/trunk/mcs/; revision=51019
2005-09-30 02:22:33 +00:00
Gonzalo Paniagua Javier d445bca651 2005-09-28 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: fix HasChildViewStates.


svn path=/trunk/mcs/; revision=50924
2005-09-28 05:45:04 +00:00
Sebastien Pouliot 2a989e4587 2005-09-21 Sebastien Pouliot <[email protected]>
* Control.cs: Added null checks for Trace as it can be null when 
	rendering (like it was for 39 unit tests).


svn path=/trunk/mcs/; revision=50368
2005-09-21 12:01:37 +00:00
Gonzalo Paniagua Javier ed6bbe092b 2005-09-21 Gonzalo Paniagua Javier <[email protected]>
* System.Web/TraceContext.cs: add new method to store size of controls.
	* System.Web/TraceData.cs: render control size.
	* System.Web/HttpResponse.cs: new internal method to get the number
	of bytes of buffered output.
	* System.Web/HttpResponseStream.cs: added Length property to the Buckets
	and new GetTotalLength.
	* System.Web.UI/Page.cs: reverted hacks used with the wrong method of
	getting a control rendered size.
	* System.Web.UI/Control.cs: if the trace is enabled, save control 
	rendered size.


svn path=/trunk/mcs/; revision=50355
2005-09-21 05:09:29 +00:00
Sebastien Pouliot 08b22e140d oops, forgot to make ResolveClientUrl public
svn path=/trunk/mcs/; revision=50045
2005-09-14 17:39:26 +00:00
Sebastien Pouliot c1cc7616df 2005-09-14 Sebastien Pouliot <[email protected]>
* AttributeCollection.cs: Added LinkDemand for AspNetHostingPermission
	with Minimal level.
	* BaseParser.cs: Added LinkDemand and InheritanceDemand for 
	AspNetHostingPermission with Minimal level.
	* BasePartialCachingControl.cs: Added LinkDemand and InheritanceDemand
	for AspNetHostingPermission with Minimal level.
	* CompiledTemplateBuilder.cs: Added LinkDemand for 
	AspNetHostingPermission with Minimal level.
	* ConstructorNeedsTagAttribute.cs: Added LinkDemand for 
	AspNetHostingPermission with Minimal level.
	* ControlBuilderAttribute.cs: Added LinkDemand for 
	AspNetHostingPermission with Minimal level. Simplified Equals and 
	IsDefaultAttribute.
	* ControlBuilder.cs: Added LinkDemand and InheritanceDemand for 
	AspNetHostingPermission with Minimal level.
	* ControlCachePolicy.cs: Hided ctor and removed SupportsCaching setter
	* ControlCollection.cs: Added LinkDemand and InheritanceDemand for 
	AspNetHostingPermission with Minimal level. Fixed possible stack 
	overflow in Add* methods. Fixed CopyTo as we're not allocating the 
	array based on the number of items.
	* Control.cs: Added LinkDemand and InheritanceDemand for 
	AspNetHostingPermission with Minimal level. Fixed 2.0 signatures.
	* CssStyleCollection.cs: Added LinkDemand for AspNetHostingPermission 
	with Minimal level.
	* IStyleSheet.cs: Fixed parameter orders (2.0).


svn path=/trunk/mcs/; revision=50041
2005-09-14 17:25:07 +00:00
Chris Toshok 8c74efe01f add missing (and empty) WebSysDescription
svn path=/trunk/mcs/; revision=49289
2005-09-01 19:14:02 +00:00
Miguel de Icaza 54079f764a Commit of changes to core files, on behalf of the team
svn path=/trunk/mcs/; revision=48944
2005-08-26 22:58:48 +00:00
Gonzalo Paniagua Javier eae43f6694 oops
svn path=/trunk/mcs/; revision=47490
2005-07-21 04:57:51 +00:00
Gonzalo Paniagua Javier f444094916 more trace stuff
svn path=/trunk/mcs/; revision=47489
2005-07-21 04:46:35 +00:00
Gonzalo Paniagua Javier c06c348cce 2005-06-25 Gonzalo Paniagua Javier <[email protected]>
* Page.cs:
	* Control.cs: avoid the creation of the EventHandlerList and accessing 
	to it whenever possible. Fix ENABLE_THEMING constant.


svn path=/trunk/mcs/; revision=46489
2005-06-25 08:45:10 +00:00
Gonzalo Paniagua Javier a74626e554 2005-06-08 Gonzalo Paniagua Javier <[email protected]>
* UserControl.cs:
	* Page.cs:
	* Control.cs: updates for 1.1 SP1


svn path=/trunk/mcs/; revision=45623
2005-06-08 08:28:36 +00:00
Lluis Sanchez 57030512c9 2005-06-06 Lluis Sanchez Gual <[email protected]>
* Control.cs: Added new DataBind() overload for 2.0. The old
	method calls this new overload.


svn path=/trunk/mcs/; revision=45480
2005-06-06 11:29:34 +00:00
Lluis Sanchez 8b572eb97f 2005-05-26 Lluis Sanchez Gual <[email protected]>
* DataSourceView.cs: Fix api.
	* NonVisualControlAttribute.cs: Implemented.
	* IDataItemContainer.cs: Added missing properties.
	* Control.cs: Added new EnableTheming and SkinID properties.
	* HierarchicalDataSourceControl.cs: Implemented missing methods.


svn path=/trunk/mcs/; revision=45061
2005-05-26 16:16:29 +00:00
Lluis Sanchez 02ca166355 2005-03-23 Lluis Sanchez Gual <[email protected]>
* Control.cs: Added a new internal property: HasRenderMethodDelegate.
	* HtmlTextWriterAttribute.cs: Replaced wrong enum value.
	* HtmlTextWriter.cs: Register new ASP.NET 2.0 attributes


svn path=/trunk/mcs/; revision=42155
2005-03-23 17:21:26 +00:00
Lluis Sanchez c1d190d884 2005-03-11 Lluis Sanchez Gual <[email protected]>
* Utils.cs, Control.cs: Don't use Page.GetPostBackClientEvent
	since it is deprecated in 2.0.
	* Page.cs: Deprecated GetPostBackClientEvent and similar methods
	in 2.0. Moved callback management methods to ClientScriptManager.
	* ClientScriptManager.cs: Moved here deprecated methods from Page.
	In GetPostBackEventReference (PostBackOptions), don't use the
	WebForm_DoPostback script if the post can be done with a simple
	__doPostBack call.
	* PostBackOptions.cs: Fixed default values for some properties.


svn path=/trunk/mcs/; revision=41696
2005-03-11 13:24:44 +00:00
Gonzalo Paniagua Javier c0938d5ccd oops
svn path=/trunk/mcs/; revision=41624
2005-03-09 23:27:05 +00:00
Gonzalo Paniagua Javier 39eb2bb963 2005-03-09 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: in FindControl, throw if there's more than one control
	with the same ID. Fixes bug #73479.


svn path=/trunk/mcs/; revision=41622
2005-03-09 23:19:52 +00:00
Lluis Sanchez a340635511 2005-02-25 Lluis Sanchez Gual <[email protected]>
* DataSourceView.cs: Fixed incorrect implementation of
	RaiseUnsupportedCapabilityError.
	* IDataItemContainer.cs: Added new properties.
	* Page.cs: Implemented Form property.
	* Control.cs: Fixed formatting.
	* StateManagedCollection.cs: Track view state of items loaded
	in LoadViewState.


svn path=/trunk/mcs/; revision=41193
2005-02-25 12:09:11 +00:00
Lluis Sanchez dfc8a95fa8 2005-01-28 Lluis Sanchez Gual <[email protected]>
* ParseChildrenAttribute.cs: Added 2.0 property.
	* Pair.cs, Triplet.cs: Make classes serializable and sealed in 2.0.
	* Page.cs: Added support for control state.
	* TemplateBuilder.cs: ContainerType should be internal.
	* Control.cs: Added some new 2.0 methods.


svn path=/trunk/mcs/; revision=39730
2005-01-29 00:03:46 +00:00
Gonzalo Paniagua Javier 2a45f23af0 2004-11-30 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: when saving "Visible" into the ViewState, save the value
	for this precise control, as using the Visible property might give us
	Control's parent visibility. Fixes bug #69200.


svn path=/trunk/mcs/; revision=36875
2004-12-01 00:36:16 +00:00
Gonzalo Paniagua Javier 6b02b28598 2004-11-30 Gonzalo Paniagua Javier <[email protected]>
* System.Web.SessionState/SessionStateModule.cs: set the path modifier
	when using cookie-less sessions.

	* System.Web/HttpResponse.cs: fixed ApplyAppPathModifier to insert the
	session ID.
	* System.Web.UI/Control.cs: fixed ResolveUrl for relative URLs when
	using cookie-less sessions.

	* System.Web.Util/UrlUtils.cs: made (Insert|Get|Remove)SessionId use
	the appRoot + SessionID + vpath format.

	Fixes the 3 issues reported in bug #66623.


svn path=/trunk/mcs/; revision=36818
2004-11-30 06:33:56 +00:00
Gonzalo Paniagua Javier bda13fb6ef 2004-11-09 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: unified a few bool fields into an int one.

	* ControlCollection.cs: use an array internally instead of always
	allocating an arraylist. Also added our own enumerator.

	* EmptyControlCollection.cs: there's no 'special' ctor now in the base
	class.

svn path=/trunk/mcs/; revision=35900
2004-11-09 17:03:26 +00:00
Gonzalo Paniagua Javier c1e8d7d744 2004-10-01 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: even if the control has no children the naming container
	may contain the control we're looking for. Fixes bug #67304.

svn path=/trunk/mcs/; revision=34593
2004-10-01 13:10:44 +00:00
Gonzalo Paniagua Javier eaa21f98ab s/Behaviour/Behavior/g Fixes bug 67261
svn path=/trunk/mcs/; revision=34581
2004-10-01 03:04:50 +00:00
Sanja Gupta a740af0593 ChangeLog: Updated ChangeLog.
Control.cs: Added new attributes and a method.
FilterableAttribute.cs: New attribute, initial implementation.
ThemeableAttribute.cs: New attribute, initial implemenataion.

svn path=/trunk/mcs/; revision=33842
2004-09-14 03:53:36 +00:00
Sanja Gupta bfafef1092 ChangeLog: Updated ChangeLog.
Control.cs: Implemented methods of interface IExpressionAccessor.

svn path=/trunk/mcs/; revision=33643
2004-09-09 11:19:05 +00:00
Gonzalo Paniagua Javier 32e674ae9f * Control.cs: don't create the EventHandlerList until requested.
svn path=/trunk/mcs/; revision=33380
2004-09-05 19:33:51 +00:00
Sanja Gupta 1367f74547 ChangeLog: Updated ChangeLog.
Control.cs: Added new interfaces implemented in .Net 2.0.
ExpressionBinding.cs: Added new class.
ExpressionBindingCollection.cs: Added new class.

svn path=/trunk/mcs/; revision=33276
2004-09-03 13:26:02 +00:00
Gonzalo Paniagua Javier 34b3941698 2004-07-27 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: style. Reverted previous patch modification of
	TemplateSourceDirectory (failed when the control is reparented). Use
	HasControls() and Controls all over instead of _controls, as Controls
	property and HasControls() might be overriden.

svn path=/trunk/mcs/; revision=31520
2004-07-27 14:51:56 +00:00
Alon Gazit a54490991c Changed the implementation of TemplateSourceDirectory and GetDefaultName().
replaced foreach statements with for statements, in order to improve
performence.

svn path=/trunk/mcs/; revision=31497
2004-07-27 06:56:25 +00:00
Duncan Mak d1c09fcc67 Add licensing info
svn path=/trunk/mcs/; revision=30345
2004-06-24 20:59:43 +00:00
Gonzalo Paniagua Javier 23fa50da3b 2004-06-14 Gonzalo Paniagua Javier <[email protected]>
* Control.cs: Modified file.

svn path=/trunk/mcs/; revision=29472
2004-06-14 03:36:28 +00:00