[Monodevelop-patches-list] r2256 - trunk/MonoDevelop/Unused/Gdl
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Fri Feb 18 17:08:46 EST 2005
Author: jluke
Date: 2005-02-18 17:08:46 -0500 (Fri, 18 Feb 2005)
New Revision: 2256
Added:
trunk/MonoDevelop/Unused/Gdl/ChangeLog
trunk/MonoDevelop/Unused/Gdl/Makefile
Removed:
trunk/MonoDevelop/Unused/Gdl/DockTest.cmbx
trunk/MonoDevelop/Unused/Gdl/Gdl.cmbx
trunk/MonoDevelop/Unused/Gdl/Gdl.mdsx
trunk/MonoDevelop/Unused/Gdl/Makefile.Gdl
trunk/MonoDevelop/Unused/Gdl/Makefile.solution.Gdl
trunk/MonoDevelop/Unused/Gdl/make.sh
Modified:
trunk/MonoDevelop/Unused/Gdl/DockBar.cs
trunk/MonoDevelop/Unused/Gdl/DockItem.cs
trunk/MonoDevelop/Unused/Gdl/DockItemGrip.cs
trunk/MonoDevelop/Unused/Gdl/DockPlaceholder.cs
Log:
fix some things here
Added: trunk/MonoDevelop/Unused/Gdl/ChangeLog
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/ChangeLog 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/ChangeLog 2005-02-18 22:08:46 UTC (rev 2256)
@@ -0,0 +1,16 @@
+2005-02-18 John Luke <john.luke at gmail.com>
+
+ * Gdl.mdsx
+ * Gdl.cmbx
+ * Makefile.Gdl
+ * Makefile.solution.Gdl
+ * make.sh
+ * DockTest.cmbx: these were broken
+ just kill it unless someone puts back a working project
+
+ * DockItemGrip.cs
+ * DockPlaceholder.cs
+ * DockItem.cs
+ * DockBar.cs: use WidgetFlags
+
+ * Makefile: use this to build for now
Modified: trunk/MonoDevelop/Unused/Gdl/DockBar.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockBar.cs 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/DockBar.cs 2005-02-18 22:08:46 UTC (rev 2256)
@@ -76,10 +76,10 @@
DockObject controller = item.Master.Controller;
item.DockBar = null;
// remove Iconified flag
- item.Flags |= (int) DockObjectFlags.Iconified;
+ item.WidgetFlags &= ~DockObjectFlags.Iconified;
item.Show ();
this.RemoveItem (item);
controller.QueueResize ();
}
}
-}
\ No newline at end of file
+}
Modified: trunk/MonoDevelop/Unused/Gdl/DockItem.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockItem.cs 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/DockItem.cs 2005-02-18 22:08:46 UTC (rev 2256)
@@ -45,7 +45,7 @@
protected DockItem ()
{
- Flags |= (int)WidgetFlags.NoWindow;
+ WidgetFlags |= WidgetFlags.NoWindow;
if (HasGrip) {
grip = new DockItemGrip (this);
@@ -411,7 +411,7 @@
protected override void OnRealized ()
{
- Flags |= (int)WidgetFlags.Realized;
+ WidgetFlags |= WidgetFlags.Realized;
Gdk.WindowAttr attributes = new Gdk.WindowAttr ();
attributes.X = Allocation.X;
Modified: trunk/MonoDevelop/Unused/Gdl/DockItemGrip.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockItemGrip.cs 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/DockItemGrip.cs 2005-02-18 22:08:46 UTC (rev 2256)
@@ -20,13 +20,13 @@
protected DockItemGrip ()
{
- Flags |= (int)WidgetFlags.NoWindow;
+ WidgetFlags |= WidgetFlags.NoWindow;
Widget.PushCompositeChild ();
closeButton = new Button ();
Widget.PopCompositeChild ();
- closeButton.Flags &= ~(int)WidgetFlags.CanFocus;
+ closeButton.WidgetFlags &= ~WidgetFlags.CanFocus;
closeButton.Parent = this;
closeButton.Relief = ReliefStyle.None;
closeButton.Show ();
@@ -41,7 +41,7 @@
iconifyButton = new Button ();
Widget.PopCompositeChild ();
- iconifyButton.Flags &= ~(int)(WidgetFlags.CanFocus);
+ iconifyButton.WidgetFlags &= ~WidgetFlags.CanFocus;
iconifyButton.Parent = this;
iconifyButton.Relief = ReliefStyle.None;
iconifyButton.Show ();
Modified: trunk/MonoDevelop/Unused/Gdl/DockPlaceholder.cs
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockPlaceholder.cs 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/DockPlaceholder.cs 2005-02-18 22:08:46 UTC (rev 2256)
@@ -19,8 +19,8 @@
public DockPlaceholder (string name, DockObject obj,
DockPlacement position, bool sticky)
{
- Flags |= (int)WidgetFlags.NoWindow;
- Flags &= ~((int)WidgetFlags.CanFocus);
+ WidgetFlags |= WidgetFlags.NoWindow;
+ WidgetFlags &= ~WidgetFlags.CanFocus;
Sticky = sticky;
Name = name;
Deleted: trunk/MonoDevelop/Unused/Gdl/DockTest.cmbx
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/DockTest.cmbx 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/DockTest.cmbx 2005-02-18 22:08:46 UTC (rev 2256)
@@ -1,16 +0,0 @@
-<Combine fileversion="1.0" name="DockTest" description="">
- <StartMode startupentry="DockTest" single="True">
- <Execute entry="DockTest" type="None" />
- </StartMode>
- <Entries>
- <Entry filename="./DockTest.prjx" />
- </Entries>
- <Configurations active="Debug">
- <Configuration name="Release">
- <Entry name="DockTest" configurationname="Debug" build="False" />
- </Configuration>
- <Configuration name="Debug">
- <Entry name="DockTest" configurationname="Debug" build="False" />
- </Configuration>
- </Configurations>
-</Combine>
\ No newline at end of file
Deleted: trunk/MonoDevelop/Unused/Gdl/Gdl.cmbx
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/Gdl.cmbx 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/Gdl.cmbx 2005-02-18 22:08:46 UTC (rev 2256)
@@ -1,20 +0,0 @@
-<Combine fileversion="1.0" name="Gdl" description="">
- <StartMode startupentry="DockTest" single="True">
- <Execute entry="Gdl" type="None" />
- <Execute entry="DockTest" type="None" />
- </StartMode>
- <Entries>
- <Entry filename="./Gdl.prjx" />
- <Entry filename="./DockTest.prjx" />
- </Entries>
- <Configurations active="Debug">
- <Configuration name="Release">
- <Entry name="Gdl" configurationname="Debug" build="False" />
- <Entry name="DockTest" configurationname="Debug" build="False" />
- </Configuration>
- <Configuration name="Debug">
- <Entry name="Gdl" configurationname="Debug" build="False" />
- <Entry name="DockTest" configurationname="Debug" build="False" />
- </Configuration>
- </Configurations>
-</Combine>
\ No newline at end of file
Deleted: trunk/MonoDevelop/Unused/Gdl/Gdl.mdsx
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/Gdl.mdsx 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/Gdl.mdsx 2005-02-18 22:08:46 UTC (rev 2256)
@@ -1,3 +0,0 @@
-<MonoDevelopSolution fileversion="1.0">
- <RelativeOutputPath>./build/bin</RelativeOutputPath>
-</MonoDevelopSolution>
\ No newline at end of file
Added: trunk/MonoDevelop/Unused/Gdl/Makefile
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/Makefile 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/Makefile 2005-02-18 22:08:46 UTC (rev 2256)
@@ -0,0 +1,39 @@
+CSC = mcs
+GDL = MonoDevelop.Dock.dll
+TEST = dock-test.exe
+
+FILES = AssemblyInfo.cs \
+ DockedHandler.cs \
+ DockMaster.cs \
+ Stock.cs \
+ DockObjectFlags.cs \
+ DockNotebook.cs \
+ DockRequest.cs \
+ DockBar.cs \
+ DockLayout.cs \
+ DockPlacement.cs \
+ DetachedHandler.cs \
+ DockItemGrip.cs \
+ DockItem.cs \
+ DockPlaceholder.cs \
+ DockObject.cs \
+ DockParamFlags.cs \
+ Dock.cs \
+ DockPaned.cs \
+ DockItemBehavior.cs
+
+all: $(GDL)
+
+clean:
+ rm -f $(GDL) $(GDL).mdb
+ rm -f $(TEST) $(TEST).mdb
+
+$(GDL): $(FILES)
+ $(CSC) -out:$@ -target:library $(FILES) -pkg:gtk-sharp-2.0
+
+$(TEST) : GdlDockTest.cs $(GDL)
+ $(CSC) -out:$@ -r:$(GDL) -pkg:gtk-sharp-2.0 GdlDockTest.cs
+
+run-test: $(TEST)
+ mono $(TEST)
+
Deleted: trunk/MonoDevelop/Unused/Gdl/Makefile.Gdl
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/Makefile.Gdl 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/Makefile.Gdl 2005-02-18 22:08:46 UTC (rev 2256)
@@ -1,55 +0,0 @@
-# This makefile is autogenerated by MonoDevelop
-# Do not modify this file
-
-SOURCES = \
-./DockObject.cs \
-./AssemblyInfo.cs \
-./DockItemBehavior.cs \
-./DockObjectFlags.cs \
-./DockParamFlags.cs \
-./Stock.cs \
-./DockPlacement.cs \
-./DockRequest.cs \
-./DockMaster.cs \
-./Dock.cs \
-./DockItem.cs \
-./DockItemGrip.cs \
-./DockPlaceholder.cs \
-./DockPaned.cs \
-./DockNotebook.cs \
-./DetachedHandler.cs \
-./DockedHandler.cs \
-./DockLayout.cs \
-./DockBar.cs
-
-PKG_REFERENCES = \
-gtk-sharp-2.0
-
-PKG_REFERENCES_BUILD = $(addprefix -pkg:, $(PKG_REFERENCES))
-
-PKG_REFERENCES_CHECK = $(addsuffix .pkgcheck, $(PKG_REFERENCES))
-
-MCS_OPTIONS =
-
-all: Gdl.dll
-
-Gdl.dll: $(SOURCES)
- mcs $(MCS_OPTIONS) -target:library -out:"Gdl.dll" $(PKG_REFERENCES_BUILD) $(SOURCES) \
- && cp "Gdl.dll" ../../build/bin/.
-
-clean:
- rm -f Gdl.dll
-
-depcheck: PKG_depcheck
-
-PKG_depcheck: $(PKG_REFERENCES_CHECK)
-
-%.pkgcheck:
- @echo -n Checking for package $(subst .pkgcheck,,$@)...
- @if pkg-config --libs $(subst .pkgcheck,,$@) &> /dev/null; then \
- echo yes; \
- else \
- echo no; \
- exit 1; \
- fi
-
Deleted: trunk/MonoDevelop/Unused/Gdl/Makefile.solution.Gdl
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/Makefile.solution.Gdl 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/Makefile.solution.Gdl 2005-02-18 22:08:46 UTC (rev 2256)
@@ -1,23 +0,0 @@
-# This file is autogenerated by MonoDevelop
-# Do not edit it.
-
-OUTPUTDIR := ./build/bin
-
-all: depcheck __init Makefile.Gdl.all Makefile.DockTest.all
-
-__init:
- mkdir -p $(OUTPUTDIR)
-
-clean: Makefile.Gdl.clean Makefile.DockTest.clean
-
-depcheck: Makefile.Gdl.depcheck Makefile.DockTest.depcheck
-
-run: all
- cd $(OUTPUTDIR) && mono DockTest.exe
-
-Makefile.Gdl.%:
- @cd ./ && $(MAKE) -f $(subst .$*,,$@) $*
-
-Makefile.DockTest.%:
- @cd ./ && $(MAKE) -f $(subst .$*,,$@) $*
-
Deleted: trunk/MonoDevelop/Unused/Gdl/make.sh
===================================================================
--- trunk/MonoDevelop/Unused/Gdl/make.sh 2005-02-18 21:11:26 UTC (rev 2255)
+++ trunk/MonoDevelop/Unused/Gdl/make.sh 2005-02-18 22:08:46 UTC (rev 2256)
@@ -1,5 +0,0 @@
-#!/bin/sh
-# This file is autogenerated by MonoDevelop
-# Do not edit it.
-
-make -f Makefile.solution.Gdl "$@"
More information about the Monodevelop-patches-list
mailing list