Browse Source

Removed Visual Styles workaround that is not needed on .NET 2.0 anymore. This fixes the background color of radio buttons in group boxes when WinXP is used but Visual Styles are disabled.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1007 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
e8ca795929
  1. 7
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/RenameCategoryDialog.cs
  2. 1
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/SelectXmlSchemaForm.cs
  3. 1
      src/AddIns/Misc/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesForm.cs
  4. 7
      src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/GroupForm.cs
  5. 7
      src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs
  6. 3
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  7. 1
      src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopForm.cs
  8. 1
      src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopUserControl.cs
  9. 124
      src/Main/Base/Project/Src/Gui/XmlForms/SharpDevelopObjectCreator.cs

7
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/RenameCategoryDialog.cs

@ -42,13 +42,6 @@ namespace ICSharpCode.FormsDesigner.Gui @@ -42,13 +42,6 @@ namespace ICSharpCode.FormsDesigner.Gui
ControlDictionary["okButton"].Click += new EventHandler(okButtonClick);
}
protected override void SetupXmlLoader()
{
xmlLoader.StringValueFilter = new SharpDevelopStringValueFilter();
xmlLoader.PropertyValueCreator = new SharpDevelopPropertyValueCreator();
xmlLoader.ObjectCreator = new SharpDevelopObjectCreator();
}
void ShowDuplicateErrorMessage()
{

1
src/AddIns/DisplayBindings/XmlEditor/Project/Src/SelectXmlSchemaForm.cs

@ -59,7 +59,6 @@ namespace ICSharpCode.XmlEditor @@ -59,7 +59,6 @@ namespace ICSharpCode.XmlEditor
{
xmlLoader.StringValueFilter = new SharpDevelopStringValueFilter();
xmlLoader.PropertyValueCreator = new SharpDevelopPropertyValueCreator();
xmlLoader.ObjectCreator = new SharpDevelopObjectCreator();
}
void Initialize()

1
src/AddIns/Misc/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesForm.cs

@ -81,7 +81,6 @@ namespace ICSharpCode.PInvokeAddIn @@ -81,7 +81,6 @@ namespace ICSharpCode.PInvokeAddIn
{
xmlLoader.StringValueFilter = new SharpDevelopStringValueFilter();
xmlLoader.PropertyValueCreator = new SharpDevelopPropertyValueCreator();
xmlLoader.ObjectCreator = new SharpDevelopObjectCreator();
}
/// <summary>

7
src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/GroupForm.cs

@ -31,13 +31,6 @@ namespace Plugins.RegExpTk { @@ -31,13 +31,6 @@ namespace Plugins.RegExpTk {
}
}
protected override void SetupXmlLoader()
{
xmlLoader.StringValueFilter = new SharpDevelopStringValueFilter();
xmlLoader.PropertyValueCreator = new SharpDevelopPropertyValueCreator();
xmlLoader.ObjectCreator = new SharpDevelopObjectCreator();
}
void CloseButton_Click(object sender, EventArgs e)
{
Close();

7
src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs

@ -140,13 +140,6 @@ namespace Plugins.RegExpTk { @@ -140,13 +140,6 @@ namespace Plugins.RegExpTk {
}
}
protected override void SetupXmlLoader()
{
xmlLoader.StringValueFilter = new SharpDevelopStringValueFilter();
xmlLoader.PropertyValueCreator = new SharpDevelopPropertyValueCreator();
xmlLoader.ObjectCreator = new SharpDevelopObjectCreator();
}
private void quickInsert(object sender, EventArgs e)
{
//// Alex: changed to text box

3
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -277,9 +277,6 @@ @@ -277,9 +277,6 @@
<Compile Include="Src\Gui\Workbench\Layouts\SdiWorkspaceWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\XmlForms\SharpDevelopObjectCreator.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Src\Gui\XmlForms\SharpDevelopPropertyValueCreator.cs" />
<Compile Include="Src\Gui\XmlForms\SharpDevelopStringValueFilter.cs" />
<Compile Include="Src\Services\IconService.cs" />

1
src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopForm.cs

@ -27,7 +27,6 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms @@ -27,7 +27,6 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms
{
xmlLoader.StringValueFilter = new SharpDevelopStringValueFilter();
xmlLoader.PropertyValueCreator = new SharpDevelopPropertyValueCreator();
xmlLoader.ObjectCreator = new SharpDevelopObjectCreator();
}
public void SetEnabledStatus(bool enabled, params string[] controlNames)

1
src/Main/Base/Project/Src/Gui/XmlForms/BaseSharpDevelopUserControl.cs

@ -25,7 +25,6 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms @@ -25,7 +25,6 @@ namespace ICSharpCode.SharpDevelop.Gui.XmlForms
{
xmlLoader.StringValueFilter = new SharpDevelopStringValueFilter();
xmlLoader.PropertyValueCreator = new SharpDevelopPropertyValueCreator();
xmlLoader.ObjectCreator = new SharpDevelopObjectCreator();
}
public void SetEnabledStatus(bool enabled, params string[] controlNames)

124
src/Main/Base/Project/Src/Gui/XmlForms/SharpDevelopObjectCreator.cs

@ -1,124 +0,0 @@ @@ -1,124 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Mike Krüger" email="mike@icsharpcode.net"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Xml;
using System.Collections;
using System.Drawing;
using System.Drawing.Text;
using System.Reflection;
using System.Windows.Forms;
using ICSharpCode.Core;
using System.ComponentModel;
using System.Data;
using System.Runtime.InteropServices;
using System.Drawing.Drawing2D;
namespace ICSharpCode.SharpDevelop.Gui.XmlForms
{
public class MyGroupBox : GroupBox
{
public override Color BackColor {
get {
return base.BackColor;
}
set {
//overrided to allow set Transparent to BackColor when FlatStyle ==System
if (value == Color.Transparent && FlatStyle == FlatStyle.System) {
this.SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true);
}
base.BackColor = value;
}
}
public MyGroupBox()
{
BackColor = Color.Transparent;
}
protected override void WndProc(ref Message m)
{
//Handle the PaintBackGround by ourself.
//tricky using the SetStyle, but I'm afraid it maybe broken in the next version.
if (m.Msg == 20 && FlatStyle == FlatStyle.System) {
this.SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true);
Graphics g = Graphics.FromHdcInternal(m.WParam);
this.OnPaintBackground(new PaintEventArgs(g,this.ClientRectangle));
g.Dispose();
this.SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, false);
return;
}
base.WndProc(ref m);
}
}
public class MyCheckBox : CheckBox
{
public override Color BackColor {
get {
return base.BackColor;
}
set {
//overrided to allow set Transparent to BackColor when FlatStyle ==System
if (value == Color.Transparent && FlatStyle == FlatStyle.System) {
this.SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true);
}
base.BackColor = value;
}
}
public MyCheckBox()
{
BackColor = Color.Transparent;
}
protected override void WndProc(ref Message m)
{
//Handle the PaintBackGround by ourself.
//tricky using the SetStyle, but I'm afraid it maybe broken in the next version.
if (m.Msg == 20 && FlatStyle == FlatStyle.System) {
this.SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true);
Graphics g = Graphics.FromHdcInternal(m.WParam);
this.OnPaintBackground(new PaintEventArgs(g,this.ClientRectangle));
g.Dispose();
this.SetStyle(ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, false);
return;
}
base.WndProc(ref m);
}
}
public class SharpDevelopObjectCreator : DefaultObjectCreator
{
public override object CreateObject(string name, XmlElement el)
{
object o = null;
if (name == "System.Windows.Forms.GroupBox") {
return new MyGroupBox();
} else if (name == "System.Windows.Forms.CheckBox") {
return new MyCheckBox();
} else {
o = base.CreateObject(name, el);
}
if (o != null) {
try {
PropertyInfo propertyInfo = o.GetType().GetProperty("FlatStyle");
if (propertyInfo != null) {
if (o is Label) {
propertyInfo.SetValue(o, FlatStyle.Standard, null);
} else {
propertyInfo.SetValue(o, FlatStyle.System, null);
}
}
} catch (Exception) {}
}
return o;
}
}
}
Loading…
Cancel
Save