This commit was manufactured by cvs2svn to create tag 'PRE_REWRITE'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/PRE_REWRITE@658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

user/wxLayout/.cvsignore

@@ -0,0 +1,2 @@
+Linux
+linux-gnu

user/wxLayout/Makefile

@@ -0,0 +1 @@
+include ../../setup/general/makeapp

user/wxLayout/Makefile.in

@@ -0,0 +1,26 @@
+# WXXT base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+# compile a library only
+RULE=bin
+
+# define library name
+BIN_TARGET=wxLayout
+# define library sources
+BIN_SRC=\
+wxLayout.cpp kbList.cpp wxlist.cpp wxlwindow.cpp wxlparser.cpp
+
+#define library objects
+BIN_OBJ=\
+wxLayout.o kbList.o wxllist.o wxlwindow.o wxlparser.o
+
+# additional things needed to link
+BIN_LINK=
+
+# additional things needed to compile
+ADD_COMPILE=
+
+# include the definitions now
+include ../../../template.mak

user/wxLayout/Micon.xpm

@@ -0,0 +1,309 @@
+/* XPM */
+static char *Micon_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"    64    48      254            2",
+/* colors */
+".. c #040207",
+".# c #6482b4",
+".a c #2a4471",
+".b c #9cc2d4",
+".c c #4c627f",
+".d c #94918e",
+".e c #0c243e",
+".f c #4c4a4a",
+".g c #3c63a8",
+".h c #7ca2ac",
+".i c #24447e",
+".j c #2c2c2c",
+".k c #5482cc",
+".l c #d4d0d0",
+".m c #99aab7",
+".n c #5c74b1",
+".o c #2c5287",
+".p c #1a2a4d",
+".q c #acdefc",
+".r c #646362",
+".s c #7491d0",
+".t c #bcc4bf",
+".u c #5273aa",
+".v c #b4b1aa",
+".w c #3d5583",
+".x c #828482",
+".y c #8c9490",
+".z c #6f7369",
+".A c #1c365c",
+".B c #041220",
+".C c #2c325c",
+".D c #94b6e4",
+".E c #3e4242",
+".F c #648edc",
+".G c #d4f2fc",
+".H c #cbd3d1",
+".I c #3c54a1",
+".J c #243244",
+".K c #4c69aa",
+".L c #7c8ba2",
+".M c #4c5d84",
+".N c #34497f",
+".O c #1c2228",
+".P c #6484c5",
+".Q c #6a7788",
+".R c #9ba09b",
+".S c #2c3634",
+".T c #acb6b4",
+".U c #141517",
+".V c #a0c4e8",
+".W c #515753",
+".X c #5c76cc",
+".Y c #1b2f51",
+".Z c #4472c4",
+".0 c #7c8a88",
+".1 c #5a6262",
+".2 c #a4aba6",
+".3 c #bcc8d5",
+".4 c #7494df",
+".5 c #84b2d4",
+".6 c #6784d9",
+".7 c #acd3e4",
+".8 c #304b72",
+".9 c #2c4c81",
+"#. c #3c5b93",
+"## c #5468bc",
+"#a c #b5bbb0",
+"#b c #1c3765",
+"#c c #444e44",
+"#d c #ecece8",
+"#e c #7ca3dc",
+"#f c #d4deda",
+"#g c #345495",
+"#h c #1c2641",
+"#i c #94a6cc",
+"#j c #243252",
+"#k c #a7acb5",
+"#l c #5c7ab3",
+"#m c #0a152d",
+"#n c #c4def0",
+"#o c #686e84",
+"#p c #a4a19e",
+"#q c #3e3c3a",
+"#r c #84aaee",
+"#s c #040a09",
+"#t c #3c6294",
+"#u c #7c929c",
+"#v c #3c5c9d",
+"#w c #4e6ead",
+"#x c #344458",
+"#y c #446bae",
+"#z c #696b6a",
+"#A c #547cbc",
+"#B c #789ae3",
+"#C c #112a44",
+"#D c #4f504b",
+"#E c #2c3140",
+"#F c #8c8688",
+"#G c #5e5c5c",
+"#H c #8c8c80",
+"#I c #cccccc",
+"#J c #4c6398",
+"#K c #c7cbc4",
+"#L c #5174b8",
+"#M c #3d558e",
+"#N c #2c3c5f",
+"#O c #acbad4",
+"#P c #3f495a",
+"#Q c #354e82",
+"#R c #6a8ac7",
+"#S c #767c84",
+"#T c #30374b",
+"#U c #b1c9e7",
+"#V c #1b315d",
+"#W c #537bcb",
+"#X c #c4bec0",
+"#Y c #243e6a",
+"#Z c #969892",
+"#0 c #7e858e",
+"#1 c #94b3f1",
+"#2 c #c2d4e8",
+"#3 c #141e35",
+"#4 c #acb2ac",
+"#5 c #c4ced0",
+"#6 c #2b4d8e",
+"#7 c #445ca2",
+"#8 c #2c3e6f",
+"#9 c #14243e",
+"a. c #f1fdfa",
+"a# c #8c9abc",
+"aa c #d7f9f9",
+"ab c #5a697e",
+"ac c #c7ebf7",
+"ad c #bceefc",
+"ae c #b4c2b4",
+"af c #889cf0",
+"ag c #d8d6c8",
+"ah c #748598",
+"ai c #b4d2fc",
+"aj c #4c5eb0",
+"ak c #3f4f64",
+"al c #8492bc",
+"am c #161d1e",
+"an c #5d7dcf",
+"ao c #5c86d6",
+"ap c #9cacc8",
+"aq c #6c92e6",
+"ar c #e4ecec",
+"as c #89b7ef",
+"at c #a6d0f8",
+"au c #e4e2e0",
+"av c #8c98a4",
+"aw c #ccdaec",
+"ax c #94bee4",
+"ay c #232b2b",
+"az c #1c2b43",
+"aA c #0c1c33",
+"aB c #99bcf7",
+"aC c #6c72bc",
+"aD c #7c766c",
+"aE c #a4a2b4",
+"aF c #6c7eac",
+"aG c #e4d6dc",
+"aH c #e4fefc",
+"aI c #84aeb4",
+"aJ c #b4b6bf",
+"aK c #345b9b",
+"aL c #bce2ef",
+"aM c #ccc6bc",
+"aN c #82a3ef",
+"aO c #7c7b77",
+"aP c #040c1e",
+"aQ c #6c7e94",
+"aR c #9ca69c",
+"aS c #acbebc",
+"aT c #a2cafa",
+"aU c #545e5f",
+"aV c #5c6a74",
+"aW c #cae6ee",
+"aX c #5c6e7c",
+"aY c #5474c6",
+"aZ c #fcfaf4",
+"a0 c #344672",
+"a1 c #446ec4",
+"a2 c #b4c4d4",
+"a3 c #313231",
+"a4 c #9cb2b4",
+"a5 c #345a8c",
+"a6 c #7496d4",
+"a7 c #0c1a24",
+"a8 c #444a47",
+"a9 c #343e3c",
+"b. c #dce6e4",
+"b# c #a9b2bc",
+"ba c #a6a6a3",
+"bb c #446a9c",
+"bc c #c4f2f8",
+"bd c #445667",
+"be c #727475",
+"bf c #6a7896",
+"bg c #9aa0a7",
+"bh c #9ec4fa",
+"bi c #545a61",
+"bj c #6474e0",
+"bk c #546674",
+"bl c #b8bcbd",
+"bm c #5d7cbf",
+"bn c #515255",
+"bo c #979a9f",
+"bp c #849cd0",
+"bq c #546a8f",
+"br c #d7d8d5",
+"bs c #688ada",
+"bt c #4f6ebe",
+"bu c #343e4c",
+"bv c #dafefc",
+"bw c #acd6fc",
+"bx c #b4b6b0",
+"by c #8c9a94",
+"bz c #203a44",
+"bA c #a4b6c8",
+"bB c #4c6a98",
+"bC c #040214",
+"bD c #5c74be",
+"bE c #4c5c98",
+"bF c #24325c",
+"bG c #8c8c8f",
+"bH c #4464a7",
+"bI c #2c457e",
+"bJ c #5c83c7",
+"bK c #34538a",
+"bL c #b4dff1",
+"bM c #7c92d4",
+"bN c #c4c4c0",
+"bO c #243759",
+"bP c #0c151e",
+"bQ c #9cb2d4",
+"bR c #6c8fd3",
+"bS c #546aab",
+"bT c #848c9f",
+"bU c #242420",
+"bV c #6c83c0",
+"bW c #343935",
+"bX c #848b89",
+"bY c #acaca6",
+"bZ c #c4cad0",
+"b0 c #445c90",
+"b1 c #243865",
+"b2 c #dce0dc",
+"b3 c #747b76",
+"b4 c #8cacee",
+"b5 c #0c0c08",
+"b6 c #446299",
+"b7 c #8493a4",
+/* pixels */
+"................................................................................................................................",
+"..................................bC....bC....bC..bC....bC..bCbCbCbC..bCbC..bC..bC..bC..bCbC..bC..bC....bC....bC................",
+"..#9#C#h#C.p.Y.Y.Y#j.Y.Y.Y#V#V#Vb1bFb1b1#8#Y.a.a#Q#Q.a.N#Q.abI.i.9bI#Q#MbK#M.wb0#M.9.N.N.N.9.abI.a#Y#Yb1b1#b#bb1b1b1#V#V#V#Vaz..",
+"..#h#C.p.p#9.Y.Y#j.AbObO.A.AbO.Ab1#Y#Y#8.a.aa0.N.8.w.w#QbK.w.ibI.9#6#Q#.#Mb0b0#J#MbK#M.NbK.N.9.NbI.N#YbIb1#Y#8#8bOb1bO#j#V#Caz..",
+"..#9.e#h#C.p.p.Y.YbO.A#b#N.a#8#Y#bb1#8#Y.Na0.9.8#Q.w.Mb0#Q#MbK.9bK#g#6.Kb6#J#J#wb0#M#MbKbK#Q#M.9bI.N.N.a.N.a.a.ab1b1#V.Y#V.Y.Y..",
+"..#9#C.p#h.p.p.p.Y#VbO#b.a.ia0.9#Q.N#YbI.a.N.N.N.w#Q.wb6b6b0b6#.#g#v#M.K#w#L.n.n#vbH#.bH.Ib6aK#MbK.9#Q#Q#Q#Q.a#Yb1.AbF#VbO.Y#j..",
+"..#h#h.p.p.p.Y.p#bbF#bb1#Y.a.8.N#Q#M#M#Q.N.9#QbK#M#Mb0b0.ubB.K.K#..K#v#w.nbmbV.nbHbS#w#7#w#vb0#.#M#Mb0#M#Q.9#Y#Yb1#Yb1b1.Y.Y.Y..",
+"..#h#9.p.p.p#V#V#b#b#Y#Y.a.ibI.N.w#Mb0b6#7#M#Q#QbK#.b6b6bq#l.n#LbHbH#y#L#R.s.4#AaY#w#w#L.K.KbH.g.KbH#v#M.9bI.i.8.a#Yb1.A.A.A#j..",
+"..#h#C.p.p.Y#V#V#bb1.abIbI#6.o.o#g.oaK#tbH.K.KbH#M.Iaj.K#w.n#R.P#Rbt#W#W.4bpb4aoanbsaobm#La1#L#A#L.ga5bK#g#g#Q.8#Y#bb1b1bOb1bO..",
+"...p.p.Y#V.Y#V.Ab1#YbI.9#Q#Q#M#M#7#7#M#v.M#J.K.K.nbS#MbH.nbm.#b4.s#Baq#Wb4aB#1aqaq#R.P.##l#RbmbD.K#7#J#J#.#Q.9.i.N.a#Y#Yb1.Aaz..",
+"..az#C#V#j#V.A#N#8.N.N.ibObz#T.J#E.J#T#Tbu.Y.8#..K.nbVbD#wbm.4a6aTb4aoaNaTaiasaNa6.n.m.3bZ#2bN.3aR#2#2.3#J#Q#MbK.8.a#8#b.AbO#j..",
+"..#h.p.p.Y.Yb1bO.ibI#g#Mbd#hambU.jbW.Sa3aybP.Y.9bHbH.ubm#BbM.P#rbhbc.qasbL.G.VbhaBbpbZaJbobxbl#I#a#abXbP#V.9#6.NbI#8#8#bbF#V#j..",
+"..az#C.Y.Y.Y#bb1.abI#Q.oaj#Pa3a3aya3a3bW.Eayb0.K.g#y.K#LanbRbhaTaxbLbvbLbvbvaLadaTai.mbobYba#Xbl.H#I#P#m#.#M#QbIbI#Y#Yb1#b#V#j..",
+"..az.p.p#VbObO#Y.a.N#g#g.I#xbW.j.ja3.E.Ebnbib0bmananbm#wanbs.4asacbLbvaHa.aHbvbc.7aIbY#p#pblbl#Kbe#F#k#9#..I#g#6.i#8#8b1b1.A#j..",
+"..#h#C.p.YbO#bb1a0bIbKbK#7#xaya3.jaya3#q.Wbn.J.wbD#Lbm.X#Bb4bhat.b#na.a.a.aZaHaHaW#k#a.vagbNaObl#I.vb3#3#w.K#7#v#M#QbIa0#Y#N#N..",
+"..#haz.p#V.YbO#Y#Y.N.9#g#7#P.EbUa8#q#D.f.f.fbi#hbB#LaY.n.P#R#e.5.7aLa.a.aZaZa.a.aS#5#p.d#p.t.l.HbYaObo.Y#w.Kb6#.#M.Na0.a#8#NbO..",
+"..#h#C.YbO#V#N#Y.8#Q#g#t##ak.j.W.f.Wbn#Gbe#zbnaU.M#Ra6#eaNb4bh.7bLaWa.aZaZaZa.br.H.2ba.H.T#fau.H.H#p.x#3#w.K#tb0#Q#Q.a#8#Nb1bO..",
+"..az#j#j.Ab1#N.a.8#Q#.bb##ak.Ebnbn.1.Ua8.zaO#z.xbubqbsbR.saqaN#1bw.7aaaHa.b.a.a4bZ#k#dbgbP.H#IbG#4bY#o#9#w.K#7b0#Q.8.a#8#NbObO..",
+"..az#j.Y.YbO#8.a.8#Q#7#t##bd.r#D#D.rbPaV#G#z.x.y#z.p.u#W.6#B#r#eaTaTaLaWaaaI#5#aau#XbraU#8.HbN.T.RbY#0#9#w.Kb6#M#Q#Qa0#Y#Y#N#N..",
+"..#h#j.YbOb1bO#Ya0.NbKa5aj.c.f#G#z.1#3.Mbe#zaO.x#pbT#.bmbsbs.F#1#easat.Gbc.hb.b2aragbgbPaC.3#k.v#4babe#9.KbH#7b0#Qak.a.i#N#Y#T..",
+"..az.Y#j.Y.Ab1#Y.8.N#gbK.IaX.r.raDaV.Bb0bfbeb3bab3#HazbBaYbsaqbRaf#1.DaB#na2#K#4b3.ybC.Yaf#k#Z.y.d#p#S#3#v#7#M#g.N.N.a#N#Y#NbO..",
+"..#h.p#C#jbFbO#8.a.NbK#.#7bk.z.zb3#H#9aKbm#J.y#Hbablb#.e.PaqbmbsaNaN#1aB#2bZ.x.2aub3.AbSbjapbobobo.rbn#9#v#gbK.9bI.a.a#Yb1bObO..",
+"..#haz.YbF#VbO#Y.abI#QaK.I.Q.z.WaO#za7b0an.ub#.R.y.R#XbXbEbtbJbR#Bbsb4.D.3.v#p#za3#s.ubJbj#u.WbWb3.Rbe#9#v#v#g.9bI#Yb1b1#b.A#j..",
+"..#h#C.p#C.Y#bbO#YbI.9.o.Iab#Zb3.x.da7bK#WbmalbTae.t#F#Gaz.nbsaqbJ.6#R#U#aaMbx#KbPbz#laoanb#ba.2.RbG#G#9#v#v#g.9bI.ab1#bbF#Vaz..",
+"..#haz.p.p#V#Vb1#Y.a#6bK#7bk.1#z#Z.y#m#.a1a1bq.LbX#HblbN.3#N.PaobJafbQ.3.tblbx.TazbB.X.kaYb7bG.d.x#ZaV#3bH#v#Q.NbI#8b1b1.A.Y.Y..",
+"..az#h#C.p#VbO#b#YbIbK#g#7aQ.d.y.RbX#mbK#y#ybt.#bZ#IaM.l.2bdbmanaobMap.t.2bY.2.ObO.s.X#W.6bX#F.yaOaD#G#9b6#7.I#Q.a.ab1#bbF.Y.Y..",
+"..#9#h.p.p#V#Vb1.a.NbK#..IaQ.xbob3aO#m.9#L.ZaY#w#iaJagaGbr#5.8aF.4a#blbN#Z#Z.WaP#l#l.6#WaY#0aO.y.xb3#PaA#7b6bK#QbI#8b1bO.A#V.Y..",
+"..#h.p#C#V.YbO#Y.abI.9aK.Ibf#D.1bYbY#mbK#ybt#ybHbSbT#aba.tbx#S.M#B.y#kbxbYbYaP.YbR#A.6bmbt.Lb3#z.W#Dbn#3bK#.#M#Q.N#Yb1b1#V.Yaz..",
+"..#h#C.p#V.p#b.A.a#Y#Q#..Ib7#kbe#4#pa7bK#ybH.g.gbHbfbZbN#4bNbgakah#Zbg#F.x.1#9bK.P#A.X.#btbTaO.W.r.ra8.e#Q.o#Q#Q.a.ab1bO.A.Yaz..",
+"..#h.p#h#C#VbOb1#YbI.9.o.I.L#H#Z.2.vaA#QbHaK.g.g#y#7#nbr#a.H.vaE.zaU#4blbebCbIaK#Lbm#LbJbtaXaO.z#z#G.EaA#g#Q.9bI.a.a#Nb1#jbO.Y..",
+"..#h#C#h#V.p#V.A.a#8.9.9.Iah#4bY#4bGbP#QaKaKaKaK#7#wbEbg.z.zay.E#a#K.2#ZbCbO#v#gbH.Xbb.ubDbk#z.r#c.f.E#9#Q#6bI.i#8b1#YbO.AbO.J..",
+"..#h.p#9.p.p#b.A#8#Y.9.9.I.0.R.2bN#XbP.NaK.IaK#v.IbS.KaQaR.Wbl#K.RbY.R.y#9#M#gaKbH.Kbb#yaCbk.r#Ga8#D#TaAbK#6.i.a#Y#bbObO.Y#jaz..",
+"..#9#9.p.p.Y#V.Ab1#YbI.9#7a#bn.Hb2#FaP.a.I#g#g#g#v#7bHb0.L.HbY.y.0#ZaObC.8b0#g#6aKbH#wbb#LaX#D#q.Ea3.UaAbK#QbI#Y#Y#bbO.AbO.Y.Y..",
+"..#9#h#h#C.p.Y#V#Y#Y#6.obEbk.H.2bUbe#m.a#g#g#Q#M#M#vaK#6bq#k.d.x.y#Z..az#M#v.o#6.o#v#L#tbSbda8bU.Ub5.O#3#6#6bI.ib1#bbF.Y#C.Yaz..",
+"..#9#9.p.p.p#Vb1#Y.N#6.o#Q#O.R.xaM.HaPa0bK#Q#Q#M#M#MbK#gb0akb3aO.xbX#9#x#v#g.N#6.9.wbH#yb0bn#D.f#q.j.U#3.N#6#8.i#b#b.Y.p.Y.paz..",
+"..#9#h#9.p.p#V#bb1#8bI#g.NbAb.br.t#H#m#Y#Q#g#Q.9.9.N#6.o#gb0avbG#Z...Y.w#g#6bIbIbIbK#v.K#Ma7#s#s....#haA#Q.NbI#Yb1#V#V#V.p.paz..",
+"..#9#9#9.p.p#VbO#Y#8#6.i#M.Q#z.H#f#K.B#Y#6.9.N.9bIbI.9.9#M#M#JbybP.B.Nb0.NbIbI#Y.ibI#vbH.wbubW.E.Sa3a7#m.o#Q#Y#Yb1#V#V#C.p.p.e..",
+"..#3#9#9#9.Y#V#VbF#Y#8#6ak#O#db2br.HaP#N.N#QbIbI.a#Y.i.8#M#Qa0.L.B.p#Q#Q.i.i.i#Y.ibI#Q#..c.E.ja3a3bWambP.N.9#Y#Y#b#b#V.p.p.p#9..",
+"..#3.e#9.p.p.Y.Yb1b1#Y#.#Ubgbl.T#S..aw#obI.a.a#8#Y#Y.a#YbI.Na0.8bO#8a0#Qa0#8b1#Y#Y#8#Q.ibO#Ta9a9bWa3ay#Eb1.a.ab1#V#V.Y.p.p.e#9..",
+"..#3#9.p#h#C.p.Y#Vb1#b#V.a.Y.Y.Y#CazbO.eb1#8#Y#b#bb1b1#8bI#Y.8.abIb1#Y.Nb1#Y#Y#Y#b#Y.9.8.8.C.JbO#j.Yaz#C.p.Y#bb1#V.p.p.p#C.e#9..",
+"..#9#9#9.p#9.p.Y.Y#V#b#bb1#8.i#8.a.a#Y#Y#Y#Yb1b1#b#bb1#N#Y#8b1#Y#Yb1#8#Yb1#b#b#b#bb1#Y.N.w.8.N.8#Q.8.i.a#b#Y#bbO#V.Y.p#C.p.p#9..",
+"..#3#9.e#9.p.p#9#C.Y#V#b#b#b#Y#Y#Y#Y#Y#Yb1b1bO#V.Y#j#Vb1b1bObObObO.Ab1#N.A.AbF#V#V#V#b#8.aa0.a.ibI.8#Y#Yb1#V#V#V#V.p.p#9.p.e#9..",
+"..#3#3#9.e.e.p.p.p.p#V.Y#b#b#Vb1#b#Yb1.A#V.Y.Y.Y.Y.Y.A#j.YbO#VbO.Y#jbO#b#j#j#V.Y#V#V#bb1#Y.a#Yb1.a#8b1b1#b.A#V#C.p.p.p.p.e.e#9..",
+"..#3aAaA#3#9.e.e#9#C#C.Y.p.Y#V#VbF#VbO.Y#j.p.p.Y#C#j.Y#j.Y#j.Y#j.Y.YbO.Y#j.Y.p.p.p.p.Y#VbOb1#NbObOb1b1.A#V.p.p.p#C.p#9#9#9.e#9..",
+"..#3#9.e#3aA#9.e#9.p.p.e.p.p.p#V#j.Y.Y.Y#9.p.p#9.Yaz.Yaz.paz.Y.paz.Y.Y#j#C.p#C.p#C#C.p#V#VbO#VbF#V#j#V#j.p.p.p#C.p#9#C#C#9.e#9..",
+"..#3aA#9aA#9aA.e#9.e#9#9.p.p.p.p#Caz.Y#C.p.p#9.p#C#Caz.p#Caz.Y#C.p#9#j.p#h.p#C#C#C.e.p#9.Y#j.Y.Y.p.p.p#C.p.p#9#9#9#9#9.e#9.e#3..",
+"..#3.e#3.e#3.e#9#9aA#9.e.e.e.p#C.p#h#Caz#9.p.p.p#h.Y#9.p.p#C.paz.p#h.Yaz#9.p#C.e.e.e.p.p#9.p.paz#C.paz.Y#9.p.e#9.e#9#9#9#9aA#9..",
+"......bC..bC..bCbCbCbCbCbCbC..bC....bC..bCbCbCbCbC..bC....bC......bC..bCbCbCbCbCbCbCbCbCbCbC....bC......bCbC..bC..bC..bC........"
+};

user/wxLayout/README

@@ -0,0 +1,49 @@
+
+README for wxLayout classes
+---------------------------
+
+All the source in this directory is copyrighted under the
+LGPL (GNU LIBRARY PUBLIC LICENSE), by Karsten Ballueder <ballueder@usa.net>.
+
+
+This is still work in progress, so if you want to make any significant
+changes, please get in touch with me before.
+
+There are three building blocks for rich text editing:
+
+wxllist :
+
+The wxLayoutList layout engine. It is a linked list of wxLayoutObjects
+which can arrange and display them on any wxDC. I am trying to keep
+this class as simple as possible, to be just the core layout
+engine. All "convenience" functions should be defined in classes built 
+on top of this.
+The wxLayoutList is derived from kbList, a double-linked list with an
+interface modelled after the STL list. As wxLayoutList depends on the
+way kbList treats iterators (i.e. the iterator value after an insert() 
+or erase() operation), I don't feel like rewriting it for wxList.
+
+wxlwindow :
+
+Contains a class wxLayoutWindow, derived from wxScrolledWindow which
+can directly be used as a rich-text display or editing window. The
+function responsible for keyboard handling is virtual and can be
+overloaded for different keybindings. wxLayoutWindow can sent fake
+menu-events to the application to react to the user clicking on
+objects.
+
+wxlparser:
+
+Contains several high level functions operating on
+wxLayoutList. Currently implemented is inserting of text (including
+linebreaks) and export of objects, text or html.
+Planned for the future is an html parser for importing html.
+
+
+wxLayout.cpp is a simple test program. It will export Text and HTML to
+stdout and demonstrate some of the features and bugs of wxLayoutList.
+
+There are still things to do and I'm working on them. :-)
+
+Karsten Ballueder <Ballueder@usa.ne>          29 June 1998
+

user/wxLayout/kbList.cpp

@@ -0,0 +1,325 @@
+/*-*- c++ -*-********************************************************
+ * kbList.cc : a double linked list                                 *
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$          *
+ *                                                                  *
+ * $Log$
+ * Revision 1.2  1998/08/12 08:33:23  KB
+ * Cursor and insert/delete work much better now, code streamlined, still
+ * a minor problem left.
+ *
+ * Revision 1.6  1998/07/08 11:56:56  KB
+ * M compiles and runs on Solaris 2.5/gcc 2.8/c-client gso
+ *
+ * Revision 1.5  1998/06/27 20:07:18  KB
+ * several bug fixes for kbList
+ * started adding my layout stuff
+ *
+ * Revision 1.1.1.1  1998/06/13 21:51:12  karsten
+ * initial code
+ *
+ * Revision 1.4  1998/05/24 14:48:00  KB
+ * lots of progress on Python, but cannot call functions yet
+ * kbList fixes again?
+ *
+ * Revision 1.3  1998/05/18 17:48:34  KB
+ * more list<>->kbList changes, fixes for wxXt, improved makefiles
+ *
+ * Revision 1.2  1998/05/14 16:39:31  VZ
+ *
+ * fixed SIGSEGV in ~kbList if the list is empty
+ *
+ * Revision 1.1  1998/05/13 19:02:11  KB
+ * added kbList, adapted MimeTypes for it, more python, new icons
+ *
+ *******************************************************************/
+
+#ifdef __GNUG__
+#   pragma implementation "kbList.h"
+#endif
+
+#ifdef   M_BASEDIR
+#   include   "Mconfig.h"
+#endif
+
+#include   "kbList.h"
+
+kbListNode::kbListNode( void *ielement,
+                        kbListNode *iprev,
+                        kbListNode *inext)
+{
+   next = inext;
+   prev = iprev;
+   if(prev)
+      prev->next = this;
+   if(next)
+      next->prev = this;
+   element = ielement;
+}
+
+kbListNode::~kbListNode()
+{
+   if(prev)
+      prev->next = next;
+   if(next)
+      next->prev = prev;
+}
+
+
+kbList::iterator::iterator(kbListNode *n)
+{
+   node = n;
+}
+
+void *
+kbList::iterator::operator*() 
+{
+   return node->element;
+}
+
+kbList::iterator &
+kbList::iterator::operator++()
+{
+   node  = node ? node->next : NULL;
+   return *this;
+}
+
+kbList::iterator &
+kbList::iterator::operator--()
+{
+   node = node ? node->prev : NULL; 
+   return *this;
+}
+kbList::iterator &
+kbList::iterator::operator++(int foo)
+{
+   return operator++();
+}
+
+kbList::iterator &
+kbList::iterator::operator--(int bar)
+{
+   return operator--();
+}
+
+
+bool
+kbList::iterator::operator !=(kbList::iterator const & i) const
+{
+   return node != i.node;
+}
+
+bool
+kbList::iterator::operator ==(kbList::iterator const & i) const
+{
+   return node == i.node;
+}
+
+kbList::kbList(bool ownsEntriesFlag)
+{
+   first = NULL;
+   last = NULL;
+   ownsEntries = ownsEntriesFlag;
+}
+
+void
+kbList::push_back(void *element)
+{
+   if(! first) // special case of empty list
+   {
+      first = new kbListNode(element);
+      last = first;
+      return;
+   }
+   else
+      last = new kbListNode(element, last);
+}
+
+void
+kbList::push_front(void *element)
+{
+   if(! first) // special case of empty list
+   {
+      push_back(element);
+      return;
+   }
+   else
+      first = new kbListNode(element, NULL, first);
+}
+
+void *
+kbList::pop_back(void)
+{
+   iterator i;
+   void *data;
+   bool ownsFlagBak = ownsEntries;
+   i = tail();
+   data = *i;
+   ownsEntries = false;
+   erase(i);
+   ownsEntries = ownsFlagBak;
+   return data;
+}
+
+void *
+kbList::pop_front(void)
+{
+   iterator i;
+   void *data;
+   bool ownsFlagBak = ownsEntries;
+   
+   i = begin();
+   data = *i;
+   ownsEntries = false;
+   erase(i);
+   ownsEntries = ownsFlagBak;
+   return data;
+   
+}
+
+void
+kbList::insert(kbList::iterator & i, void *element)
+{   
+   if(! i.Node())
+      return;
+   else if(i.Node() == first)
+   {
+      push_front(element);
+      i = first;
+      return;
+   }
+   i = kbList::iterator(new kbListNode(element, i.Node()->prev, i.Node()));
+}
+
+void
+kbList::erase(kbList::iterator & i)
+{
+   kbListNode
+      *node = i.Node(),
+      *prev, *next;
+   
+   if(! node) // illegal iterator
+      return;
+
+   prev = node->prev;
+   next = node->next;
+   
+   // correct first/last:
+   if(node == first)
+      first = node->next;
+   if(node == last)  // don't put else here!
+      last = node->prev;
+
+   // build new links:
+   if(prev)
+      prev->next = next;
+   if(next)
+      next->prev = prev;
+
+   // delete this node and contents:
+   if(ownsEntries)
+      delete *i;
+   delete i.Node();
+
+   // change the iterator to next element:
+   i = kbList::iterator(next);
+}
+
+kbList::~kbList()
+{
+   kbListNode *next;
+
+   while ( first != NULL )
+   {
+      next = first->next;
+      if(ownsEntries)
+         delete first->element;
+      delete first;
+      first = next;
+   }
+}
+
+kbList::iterator
+kbList::begin(void) const
+{
+   return kbList::iterator(first);
+}
+
+kbList::iterator
+kbList::tail(void) const
+{
+   return kbList::iterator(last);
+}
+
+kbList::iterator
+kbList::end(void) const
+{
+   return kbList::iterator(NULL); // the one after the last
+}
+
+unsigned
+kbList::size(void) const // inefficient
+{
+   unsigned count = 0;
+   kbList::iterator i;
+   for(i = begin(); i != end(); i++, count++)
+      ;
+   return count;
+}
+
+
+
+
+
+
+
+#ifdef   KBLIST_TEST
+
+#include   <iostream.h>
+
+KBLIST_DEFINE(kbListInt,int);
+   
+int main(void)
+{
+   int
+      n, *ptr;
+   kbListInt
+      l;
+   kbListInt::iterator
+      i;
+   
+   for(n = 0; n < 10; n++)
+   {
+      ptr = new int;
+      *ptr = n*n;
+      l.push_back(ptr);
+   }
+
+   i = l.begin(); // first element
+   i++; // 2nd
+   i++; // 3rd
+   i++; // 4th, insert here:
+   ptr = new int;
+   *ptr = 4444;
+   l.insert(i,ptr);
+
+   // this cannot work, because l.end() returns NULL:
+   i = l.end(); // behind last
+   i--;  // still behind last
+   l.erase(i);  // doesn't do anything
+
+   // this works:
+   i = l.tail(); // last element
+   i--;
+   --i;
+   l.erase(i); // erase 3rd last element (49)
+   
+   for(i = l.begin(); i != l.end(); i++)
+      cout << *i << '\t' << *((int *)*i) << endl;
+
+   
+   return 0;
+}
+#endif

user/wxLayout/kbList.h

@@ -0,0 +1,298 @@
+/*-*- c++ -*-********************************************************
+ * kbList.h : a double linked list                                  *
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *
+ *******************************************************************/
+
+#ifndef   KBLIST_H
+#   define   KBLIST_H
+
+#ifdef __GNUG__
+#   pragma interface "kbList.h"
+#endif
+
+#ifndef   NULL
+#   define   NULL   0
+#endif
+
+/**@name Double linked list implementation. */
+//@{
+
+/** kbListNode is a class used by kbList. It represents a single
+    element in the list. It is not intended for general use outside
+    kbList functions.
+*/
+struct kbListNode
+{
+   /// pointer to next node or NULL
+   struct kbListNode *next;
+   /// pointer to previous node or NULL
+   struct kbListNode *prev;
+   /// pointer to the actual data 
+   void *element;
+   /** Constructor - it automatically links the node into the list, if
+       the iprev, inext parameters are given.
+       @param ielement pointer to the data for this node (i.e. the data itself)
+       @param iprev if not NULL, use this as previous element in list
+       @param inext if not NULL, use this as next element in list
+   */
+   kbListNode( void *ielement,
+               kbListNode *iprev = (kbListNode *) NULL,
+               kbListNode *inext = (kbListNode *) NULL);
+   /// Destructor.
+   ~kbListNode();
+};
+
+/** The main list class, handling void pointers as data.
+  */
+
+class kbList
+{
+public:
+   /// An iterator class for kbList, just like for the STL classes.
+   class iterator
+   {
+   protected:
+      /// the node to which this iterator points
+      kbListNode *node;
+      friend class kbList;
+         public:
+      /** Constructor.
+          @param n if not NULL, the node to which to point
+      */
+      iterator(kbListNode *n = (kbListNode *) NULL);
+      /** Dereference operator.
+          @return the data pointer of the node belonging to this
+          iterator
+      */
+      void * operator*();
+
+      /** Increment operator - prefix, goes to next node in list.
+          @return itself
+      */
+      iterator & operator++();
+
+      /** Decrement operator - prefix, goes to previous node in list.
+          @return itself
+      */
+      iterator & operator--();
+
+      /** Increment operator - prefix, goes to next node in list.
+          @return itself
+      */
+      iterator & operator++(int); //postfix
+
+      /** Decrement operator - prefix, goes to previous node in list.
+          @return itself
+      */
+      iterator & operator--(int); //postfix
+
+      /** Comparison operator.
+          @return true if not equal.
+      */
+      bool operator !=(iterator const &) const; 
+
+      /* Comparison operator.
+         @return true if equal
+      */
+      bool operator ==(iterator const &) const; 
+
+      /** Returns a pointer to the node associated with this iterator.
+          This function is not for general use and should be
+          protected. However, if protected, it cannot be called from
+          derived classes' iterators. (Is this a bug in gcc/egcs?)
+          @return the node pointer
+      */
+      inline kbListNode * Node(void) const
+         { return node; }
+   };
+
+   /** Constructor.
+       @param ownsEntriesFlag if true, the list owns the entries and
+       will issue a delete on each of them when deleting them. If
+       false, the entries themselves will not get deleted. Do not use
+       this with array types!
+   */
+   kbList(bool ownsEntriesFlag = true);
+
+   /** Destructor.
+       If entries are owned, they will all get deleted from here.
+   */
+   ~kbList();
+
+   /** Tell list whether it owns objects. If owned, they can be
+       deleted by list. See the constructor for more details.
+       @param ownsflag if true, list will own entries
+   */
+   void ownsObjects(bool ownsflag = true)
+      { ownsEntries = ownsflag; }
+
+   /** Query whether list owns entries.
+       @return true if list owns entries
+   */
+   bool ownsObjects(void)
+      { return ownsEntries; }
+   
+   /** Add an entry at the end of the list.
+       @param element pointer to data
+   */
+   void push_back(void *element);
+
+   /** Add an entry at the head of the list.
+       @param element pointer to data
+   */
+   void push_front(void *element);
+
+   /** Get element from end of the list and delete it.
+       NOTE: In this case the element's data will not get deleted by
+       the list. It is the responsibility of the caller to free it.
+       @return the element data
+   */
+   void *pop_back(void);
+
+   /** Get element from head of the list and delete it.
+       NOTE: In this case the element's data will not get deleted by
+       the list. It is the responsibility of the caller to free it.
+       @return the element data
+   */
+   void *pop_front(void);
+
+   /** Insert an element into the list.
+       @param i an iterator pointing to the element, before which the new one should be inserted
+       @param element the element data
+   */
+   void insert(iterator & i, void *element);
+
+   /** Erase an element, move iterator to following element.
+       @param i iterator pointing to the element to be deleted
+   */
+   void erase(iterator & i);
+   
+   /* Get head of list.
+      @return iterator pointing to head of list
+   */
+   iterator begin(void) const;
+
+   /* Get end of list.
+   @return iterator pointing after the end of the list. This is an
+   invalid iterator which cannot be dereferenced or decremented. It is
+   only of use in comparisons. NOTE: this is different from STL!
+   @see tail
+   */
+   iterator end(void) const;
+
+   /* Get last element in list.
+      @return iterator pointing to the last element in the list.
+      @see end
+   */
+   iterator tail(void) const;
+
+   /* Get the number of elements in the list.
+      @return number of elements in the list
+   */
+   unsigned size(void) const;
+
+   /* Query whether list is empty.
+      @return true if list is empty
+   */
+   bool empty(void) const
+      { return first == NULL ; }
+
+protected:
+   /// if true, list owns entries
+   bool        ownsEntries;
+   /// pointer to first element in list
+   kbListNode *first;
+   /// pointer to last element in list
+   kbListNode *last;
+
+private:
+   /// forbid copy construction
+   kbList(kbList const &foo);
+   /// forbid assignments
+   kbList& operator=(const kbList& foo);
+};
+
+/// just for backward compatibility, will be removed soon
+typedef kbList::iterator kbListIterator;
+/// cast an iterator to a pointer, compatibility only to be removed
+#define   kbListICast(type, iterator)   ((type *)*iterator)
+/// cast an iterator to a const pointer, compatibility only to be removed
+#define   kbListIcCast(type, iterator)   ((type const *)*iterator)
+
+/** Macro to define a kbList with a given name, having elements of
+    pointer to the given type. I.e. KBLIST_DEFINE(Int,int) would
+    create a kbListInt type holding int pointers.
+*/
+#define   KBLIST_DEFINE(name,type)   \
+class name : public kbList \
+{ \
+public: \
+   class iterator : public kbList::iterator \
+   { \
+   protected: \
+      inline iterator(kbList::iterator const & i) \
+         { node = i.Node(); } \
+      friend class name; \
+   public: \
+      inline iterator(kbListNode *n = (kbListNode *) NULL) \
+         : kbList::iterator(n) {} \
+      inline type * operator*() \
+         /* the cast is needed for MS VC++ 5.0 */ \
+         { return (type *)((kbList::iterator *)this)->operator*() ; } \
+   }; \
+   inline name(bool ownsEntriesFlag = FALSE) \
+      : kbList(ownsEntriesFlag) {} \
+   \
+   inline void push_back(type *element) \
+      { kbList::push_back((void *)element); } \
+   \
+   inline void push_front(type *element) \
+      { kbList::push_front((void *)element); } \
+   \
+   inline type *pop_back(void) \
+      { return (type *) kbList::pop_back(); } \
+   \
+   inline type *pop_front(void) \
+      { return (type *) kbList::pop_front(); } \
+   \
+   inline void insert(iterator & i, type *element) \
+      { kbList::insert(i, (void *) element); } \
+   \
+   inline void erase(iterator & i) \
+      { kbList::erase(i); } \
+   \
+   inline iterator begin(void) const \
+      { return kbList::begin(); } \
+   \
+   inline iterator end(void) const \
+      { return kbList::end(); } \
+   \
+   inline iterator tail(void) const \
+      { return kbList::tail(); } \
+   ~name() \
+   { \
+      kbListNode *next; \
+      while ( first != (kbListNode *) NULL ) \
+      { \
+         next = first->next; \
+         if(ownsEntries) \
+            delete typecast(first->element); \
+         delete first; \
+         first = next; \
+      } \
+   } \
+   private: \
+   inline type * typecast(void *ptr) \
+      { return (type *) ptr; } \
+   }
+
+#ifdef   MCONFIG_H
+/// define the most commonly used list type once:
+KBLIST_DEFINE(kbStringList, String);
+#endif
+
+#endif // KBLIST_H

user/wxLayout/wxLayout.cpp

@@ -0,0 +1,453 @@
+/*
+ * Program: wxLayout
+ * 
+ * Author: Karsten Ball<6C>der
+ *
+ * Copyright: (C) 1998, Karsten Ball<6C>der <Ballueder@usa.net>
+ *
+ */
+
+#ifdef __GNUG__
+#pragma implementation "wxLayout.h"
+#endif
+
+#include "wxLayout.h"
+#include "wx/textfile.h"
+
+
+#include   "Micon.xpm"
+
+// for testing only:
+#include   <stdio.h>
+
+//-----------------------------------------------------------------------------
+// main program
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_APP(MyApp)
+
+//-----------------------------------------------------------------------------
+// MyFrame
+//-----------------------------------------------------------------------------
+
+   enum ids{ ID_EDIT = 1, ID_ADD_SAMPLE, ID_CLEAR, ID_PRINT,
+             ID_PRINT_SETUP, ID_PAGE_SETUP, ID_PREVIEW, ID_PRINT_PS,
+             ID_PRINT_SETUP_PS, ID_PAGE_SETUP_PS,ID_PREVIEW_PS,
+             ID_DPRINT,
+             ID_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT, ID_TEST };
+
+
+IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
+
+   BEGIN_EVENT_TABLE(MyFrame,wxFrame)
+    EVT_MENU(ID_PRINT, MyFrame::OnPrint)
+    EVT_MENU(ID_PREVIEW, MyFrame::OnPrintPreview)
+    EVT_MENU(ID_PRINT_SETUP, MyFrame::OnPrintSetup)
+    EVT_MENU(ID_PAGE_SETUP, MyFrame::OnPageSetup)
+    EVT_MENU(ID_PRINT_PS, MyFrame::OnPrintPS)
+    EVT_MENU(ID_PREVIEW_PS, MyFrame::OnPrintPreviewPS)
+    EVT_MENU(ID_PRINT_SETUP_PS, MyFrame::OnPrintSetupPS)
+    EVT_MENU(ID_PAGE_SETUP_PS, MyFrame::OnPageSetupPS)
+    EVT_MENU    (-1,       MyFrame::OnCommand)
+    EVT_COMMAND (-1,-1,    MyFrame::OnCommand)
+    EVT_CHAR    (  wxLayoutWindow::OnChar  )
+   END_EVENT_TABLE()
+
+
+
+
+
+
+int orientation = wxPORTRAIT;
+
+
+
+
+
+   
+   MyFrame::MyFrame(void) :
+      wxFrame( (wxFrame *) NULL, -1, (char *) "wxLayout", wxPoint(20,20), wxSize(600,360) )
+{
+   CreateStatusBar( 1 );
+  
+   SetStatusText( "wxLayout by Karsten Ball<6C>der." );
+
+   wxMenu *file_menu = new wxMenu( "Menu 1" );
+   file_menu->Append( ID_CLEAR, "Clear");
+   file_menu->Append( ID_ADD_SAMPLE, "Example");
+   file_menu->Append( ID_EDIT, "Edit");
+   file_menu->Append( ID_WXLAYOUT_DEBUG, "Debug");
+
+  file_menu->Append(ID_PRINT, "&Print...", "Print");
+  file_menu->Append(ID_PRINT_SETUP, "Print &Setup...","Setup printer properties");
+  file_menu->Append(ID_PAGE_SETUP, "Page Set&up...", "Page setup");
+  file_menu->Append(ID_PREVIEW, "Print Pre&view", "Preview");
+#ifdef __WXMSW__
+  file_menu->AppendSeparator();
+  file_menu->Append(ID_PRINT_PS, "Print PostScript...", "Print (PostScript)");
+  file_menu->Append(ID_PRINT_SETUP_PS, "Print Setup PostScript...", "Setup printer properties (PostScript)");
+  file_menu->Append(ID_PAGE_SETUP_PS, "Page Setup PostScript...", "Page setup (PostScript)");
+  file_menu->Append(ID_PREVIEW_PS, "Print Preview PostScript", "Preview (PostScript)");
+#endif
+  file_menu->AppendSeparator();
+
+   file_menu->Append( ID_DPRINT, "Direct Print");
+   file_menu->Append( ID_TEXT, "Export Text");
+   file_menu->Append( ID_HTML, "Export HTML");
+   file_menu->Append( ID_TEST, "Test");
+   file_menu->Append( ID_QUIT, "Exit");
+  
+   wxMenuBar *menu_bar = new wxMenuBar();
+   menu_bar->Append(file_menu, "File" );
+   menu_bar->Show( TRUE );
+  
+   SetMenuBar( menu_bar );
+
+   m_lwin = new wxLayoutWindow(this);
+   m_lwin->SetEventId(ID_CLICK);
+   m_lwin->GetLayoutList().SetEditable(true);
+   m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);
+   m_lwin->SetFocus();
+};
+
+void
+MyFrame::AddSampleText(wxLayoutList &llist)
+{
+   llist.Insert("--");
+   llist.LineBreak();
+
+   llist.Insert("The quick brown fox jumps over the lazy dog.");
+   llist.LineBreak();
+   llist.Insert("Hello ");
+   llist.Insert(new wxLayoutObjectIcon(new wxIcon(Micon_xpm,-1,-1)));
+   llist.LineBreak();
+   llist.SetFontWeight(wxBOLD);
+   llist.Insert("World! ");
+   llist.SetFontWeight(wxNORMAL);
+   llist.Insert("The quick brown fox jumps...");
+   llist.LineBreak();
+
+   llist.Insert("over the lazy dog.");
+   llist.SetFont(-1,-1,-1,-1,true);
+   llist.Insert("underlined");
+   llist.SetFont(-1,-1,-1,-1,false);
+   llist.SetFont(wxROMAN);
+   llist.Insert("This is ");
+   llist.SetFont(-1,-1,-1,wxBOLD);  llist.Insert("BOLD ");  llist.SetFont(-1,-1,-1,wxNORMAL);
+   llist.Insert("and ");
+   llist.SetFont(-1,-1,wxITALIC);
+   llist.Insert("italics ");
+   llist.SetFont(-1,-1,wxNORMAL);
+   llist.LineBreak();
+  
+   llist.Insert("and ");
+   llist.SetFont(-1,-1,wxSLANT);
+   llist.Insert("slanted");
+   llist.SetFont(-1,-1,wxNORMAL);
+   llist.Insert(" text.");
+   llist.LineBreak();
+
+   llist.Insert("and ");
+   llist.SetFont(-1,-1,-1,-1,-1,"blue");
+   llist.Insert("blue");
+   llist.SetFont(-1,-1,-1,-1,-1,"black");
+   llist.Insert(" and ");
+   llist.SetFont(-1,-1,-1,-1,-1,"green","black");
+   llist.Insert("green on black");
+   llist.SetFont(-1,-1,-1,-1,-1,"black","white");
+   llist.Insert(" text.");
+   llist.LineBreak();
+
+   llist.SetFont(-1,-1,wxSLANT);
+   llist.Insert("Slanted");
+   llist.SetFont(-1,-1,wxNORMAL);
+   llist.Insert(" and normal text and ");
+   llist.SetFont(-1,-1,wxSLANT);
+   llist.Insert("slanted");
+   llist.SetFont(-1,-1,wxNORMAL);
+   llist.Insert(" again.");
+   llist.LineBreak();
+
+   // add some more text for testing:
+   llist.Insert("And here the source for the test program:");
+   llist.LineBreak();
+   llist.SetFont(wxTELETYPE,16);
+   char buffer[1024];
+   FILE *in = fopen("wxLayout.cpp","r");
+   if(in)
+   {
+      for(;;)
+      {
+         fgets(buffer,1024,in);
+         if(feof(in))
+            break;
+         llist.Insert(buffer);
+         llist.LineBreak();
+      }
+   }
+   
+   m_lwin->Refresh();
+   m_lwin->UpdateScrollbars();
+   llist.SetEditable();
+   llist.SetCursor(wxPoint(0,0));
+}
+
+void
+MyFrame::Clear(void)
+{
+   m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false);
+   m_lwin->UpdateScrollbars();
+}
+
+/* test the editing */
+void MyFrame::Edit(void)
+{
+   wxLayoutList & llist = m_lwin->GetLayoutList();
+   m_lwin->SetEventId(ID_CLICK);
+  
+   llist.MoveCursor(0);
+   llist.MoveCursor(5);
+   llist.MoveCursor(0,2);
+   llist.Delete(2);
+   llist.MoveCursor(2);
+   llist.Insert("not");
+   llist.LineBreak();
+   m_lwin->Refresh();
+}
+
+void MyFrame::OnCommand( wxCommandEvent &event )
+{
+   cerr << "id:" << event.GetId() << endl;
+   switch (event.GetId())
+   {
+   case ID_QUIT:
+      Close( TRUE );
+      break;
+   case ID_PRINT:
+      m_lwin->Print();
+      break;
+   case ID_DPRINT:
+   {
+      wxLayoutList llist;
+      AddSampleText(llist);
+      wxPostScriptDC   dc("layout.ps",true,this);
+      if (dc.Ok() && dc.StartDoc((char *)_("Printing message...")))
+      {
+         //dc.SetUserScale(1.0, 1.0);
+         llist.Draw(dc); //,false,wxPoint(0,0),true);
+         dc.EndDoc();
+      }
+   }
+   break;
+   case ID_EDIT:
+      Edit();
+      break;
+   case ID_ADD_SAMPLE:
+      AddSampleText(m_lwin->GetLayoutList());
+      break;
+   case ID_CLEAR:
+      Clear();
+      break;
+   case ID_WXLAYOUT_DEBUG:
+      m_lwin->GetLayoutList().Debug();
+      break;
+   case ID_CLICK:
+      cerr << "Received click event." << endl;
+      break;
+   case ID_TEST:
+   {
+      Clear();
+      m_lwin->GetLayoutList().LineBreak();
+      m_lwin->GetLayoutList().Insert("abc");
+      m_lwin->GetLayoutList().LineBreak();
+      m_lwin->GetLayoutList().Insert("def");
+      break;
+   }
+   case ID_HTML:
+   {
+      wxLayoutExportObject *export;
+      wxLayoutList::iterator i = m_lwin->GetLayoutList().begin();
+
+      while((export = wxLayoutExport(m_lwin->GetLayoutList(),
+                                     i,WXLO_EXPORT_AS_HTML)) != NULL)
+      {
+         if(export->type == WXLO_EXPORT_HTML)
+            cout << *(export->content.text);
+         else
+            cout << "<!--UNKNOWN OBJECT>";
+         delete export;
+      }
+   }
+   break;
+   case ID_TEXT:
+   {
+      wxLayoutExportObject *export;
+      wxLayoutList::iterator i = m_lwin->GetLayoutList().begin();
+
+      while((export = wxLayoutExport(m_lwin->GetLayoutList(),
+                                     i,WXLO_EXPORT_AS_TEXT)) != NULL)
+      {
+         if(export->type == WXLO_EXPORT_TEXT)
+            cout << *(export->content.text);
+         else
+            cout << "<!--UNKNOWN OBJECT>";
+         delete export;
+      }
+   }
+   break;
+   }
+};
+
+void MyFrame::OnPrint(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+      wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+      wxPrinter printer;
+      wxLayoutPrintout printout( m_lwin->GetLayoutList(),"My printout");
+      if (!printer.Print(this, &printout, TRUE))
+        wxMessageBox("There was a problem printing.\nPerhaps your current printer is not set correctly?", "Printing", wxOK);
+}
+
+void MyFrame::OnPrintPS(wxCommandEvent& WXUNUSED(event))
+{
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+      wxPostScriptPrinter printer;
+      wxLayoutPrintout printout( m_lwin->GetLayoutList(),"My printout");
+      printer.Print(this, &printout, TRUE);
+}
+
+void MyFrame::OnPrintPreview(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+      wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+      wxPrintData printData;
+      printData.SetOrientation(orientation);
+
+      // Pass two printout objects: for preview, and possible printing.
+      wxPrintPreview *preview = new wxPrintPreview(new wxLayoutPrintout( m_lwin->GetLayoutList()), new wxLayoutPrintout( m_lwin->GetLayoutList()), & printData);
+      if (!preview->Ok())
+      {
+        delete preview;
+        wxMessageBox("There was a problem previewing.\nPerhaps your current printer is not set correctly?", "Previewing", wxOK);
+        return;
+      }
+      
+      wxPreviewFrame *frame = new wxPreviewFrame(preview, this, "Demo Print Preview", wxPoint(100, 100), wxSize(600, 650));
+      frame->Centre(wxBOTH);
+      frame->Initialize();
+      frame->Show(TRUE);
+}
+
+void MyFrame::OnPrintPreviewPS(wxCommandEvent& WXUNUSED(event))
+{
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+      wxPrintData printData;
+      printData.SetOrientation(orientation);
+
+      // Pass two printout objects: for preview, and possible printing.
+      wxPrintPreview *preview = new wxPrintPreview(new wxLayoutPrintout( m_lwin->GetLayoutList()), new wxLayoutPrintout( m_lwin->GetLayoutList()), & printData);
+      wxPreviewFrame *frame = new wxPreviewFrame(preview, this, "Demo Print Preview", wxPoint(100, 100), wxSize(600, 650));
+      frame->Centre(wxBOTH);
+      frame->Initialize();
+      frame->Show(TRUE);
+}
+
+void MyFrame::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+      wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+      wxPrintData data;
+      data.SetOrientation(orientation);
+
+#ifdef __WXMSW__
+      wxPrintDialog printerDialog(this, & data);
+#else
+      wxGenericPrintDialog printerDialog(this, & data);
+#endif
+      printerDialog.GetPrintData().SetSetupDialog(TRUE);
+      printerDialog.ShowModal();
+
+      orientation = printerDialog.GetPrintData().GetOrientation();
+}
+
+void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
+{
+#ifdef __WXMSW__
+      wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
+#else
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+#endif
+      wxPageSetupData data;
+      data.SetOrientation(orientation);
+
+#ifdef __WXMSW__
+      wxPageSetupDialog pageSetupDialog(this, & data);
+#else
+      wxGenericPageSetupDialog pageSetupDialog(this, & data);
+#endif
+      pageSetupDialog.ShowModal();
+
+      data = pageSetupDialog.GetPageSetupData();
+      orientation = data.GetOrientation();
+}
+
+void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
+{
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+      wxPrintData data;
+      data.SetOrientation(orientation);
+
+      wxGenericPrintDialog printerDialog(this, & data);
+      printerDialog.GetPrintData().SetSetupDialog(TRUE);
+      printerDialog.ShowModal();
+
+      orientation = printerDialog.GetPrintData().GetOrientation();
+}
+
+void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
+{
+      wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
+
+      wxPageSetupData data;
+      data.SetOrientation(orientation);
+
+      wxGenericPageSetupDialog pageSetupDialog(this, & data);
+      pageSetupDialog.ShowModal();
+
+      orientation = pageSetupDialog.GetPageSetupData().GetOrientation();
+}
+
+
+//-----------------------------------------------------------------------------
+// MyApp
+//-----------------------------------------------------------------------------
+
+MyApp::MyApp(void) : 
+   wxApp( )
+{
+};
+
+bool MyApp::OnInit(void)
+{
+   wxFrame *frame = new MyFrame();
+   frame->Show( TRUE );
+   wxSetAFMPath("/usr/local/src/wxWindows/misc/afm/");
+   return TRUE;
+};
+
+
+
+
+

user/wxLayout/wxLayout.h

@@ -0,0 +1,67 @@
+/* -*- c++ -*- */
+
+#ifndef __WXLAYOUTH__
+#define __WXLAYOUTH__
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include "wx/wx.h"
+
+#include "wxllist.h"
+#include "wxlwindow.h"
+#include "wxlparser.h"
+
+//-----------------------------------------------------------------------------
+// derived classes
+//-----------------------------------------------------------------------------
+
+class MyFrame;
+class MyApp;
+
+//-----------------------------------------------------------------------------
+// MyFrame
+//-----------------------------------------------------------------------------
+
+class MyFrame: public wxFrame
+{
+  DECLARE_DYNAMIC_CLASS(MyFrame)
+
+  public:
+  
+   MyFrame(void);
+   void Edit(void);
+   void AddSampleText(wxLayoutList &llist);
+   void Clear(void);
+   void OnCommand( wxCommandEvent &event );
+
+    void OnPrint(wxCommandEvent& event);
+    void OnPrintPreview(wxCommandEvent& event);
+    void OnPrintSetup(wxCommandEvent& event);
+    void OnPageSetup(wxCommandEvent& event);
+    void OnPrintPS(wxCommandEvent& event);
+    void OnPrintPreviewPS(wxCommandEvent& event);
+    void OnPrintSetupPS(wxCommandEvent& event);
+    void OnPageSetupPS(wxCommandEvent& event);
+
+   DECLARE_EVENT_TABLE()
+
+private:
+   wxLayoutWindow  *m_lwin;
+   
+};
+
+//-----------------------------------------------------------------------------
+// MyApp
+//-----------------------------------------------------------------------------
+
+class MyApp: public wxApp
+{
+  public:
+  
+    MyApp(void);
+    virtual bool OnInit(void);
+};
+
+#endif // __WXCONVERTH__

user/wxLayout/wxllist.h

@@ -0,0 +1,338 @@
+/*-*- c++ -*-********************************************************
+ * wxLayoutList.h - a formatted text rendering engine for wxWindows *
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *******************************************************************/
+#ifndef WXLLIST_H
+#define WXLLIST_H
+
+#ifdef __GNUG__
+#   pragma interface "wxllist.h"
+#endif
+
+#include   "kbList.h"
+
+#include   "wx/wx.h"
+#include "wx/print.h"
+#include "wx/printdlg.h"
+#include "wx/generic/printps.h"
+#include "wx/generic/prntdlgg.h"
+
+// skip the following defines if embedded in M application
+#ifdef   M_BASEDIR
+#   ifdef   DEBUG
+//#      define   WXLAYOUT_DEBUG
+#   endif
+#else
+    // for testing only:
+#   define WXLAYOUT_DEBUG
+    // The wxLayout classes can be compiled with std::string instead of wxString
+    //#   define USE_STD_STRING
+#endif
+
+#ifdef USE_STD_STRING
+#   include   <string>
+    typedef   std::string String;
+#   define    Str(str)(str.c_str())
+#else
+    typedef   wxString String;
+#   define    Str(str) str
+#endif
+
+/// Types of currently supported layout objects.
+enum wxLayoutObjectType
+{ WXLO_TYPE_INVALID = 0, WXLO_TYPE_TEXT, WXLO_TYPE_CMD, WXLO_TYPE_ICON, WXLO_TYPE_LINEBREAK };
+
+/// Type used for coordinates in drawing.
+typedef long CoordType;
+
+class wxLayoutList;
+class wxLayoutObjectBase;
+
+class wxDC;
+class wxColour;
+class wxFont;
+
+/** The base class defining the interface to each object which can be
+    part of the layout. Each object needs to draw itself and calculate 
+    its size.
+*/
+class wxLayoutObjectBase
+{
+public:
+   /// return the type of this object
+   virtual wxLayoutObjectType GetType(void) const { return WXLO_TYPE_INVALID; } ;
+   /** Draws an object.
+       @param dc the wxDC to draw on
+       @param position where to draw the top left corner
+       @param baseLine the baseline for alignment, from top of box
+       @draw if set to false, do not draw but just calculate sizes
+   */
+   virtual void Draw(wxDC &dc, wxPoint position, CoordType baseLine,
+                     bool draw = true) {};
+
+   /** Calculates and returns the size of the object. May need to be
+       called twice to work.
+       @param baseLine pointer where to store the baseline position of 
+       this object (i.e. the height from the top of the box to the
+       baseline)
+       @return the size of the object's box in pixels
+   */
+   virtual wxPoint GetSize(CoordType *baseLine) const { return
+                                                           wxPoint(0,0); };
+   /// returns the number of cursor positions occupied by this object
+   virtual CoordType CountPositions(void) const { return 1; }
+
+   /// constructor
+   wxLayoutObjectBase() { m_UserData = NULL; }
+   /// note: any user data will be freed at the time the object is deleted
+   virtual ~wxLayoutObjectBase() { if(m_UserData) delete m_UserData; }
+#ifdef WXLAYOUT_DEBUG
+   virtual void Debug(void);
+#endif
+
+   /** Tells the object about some user data. This data is associated
+       with the object and will be deleted at destruction time.
+   */
+   void   SetUserData(void *data) { m_UserData = data; }
+   /** Return the user data. */
+   void * GetUserData(void) const { return m_UserData; }
+private:
+   /// optional data for application's use
+   void * m_UserData;
+};
+
+/// Define a list type of wxLayoutObjectBase pointers.
+KBLIST_DEFINE(wxLayoutObjectList, wxLayoutObjectBase);
+
+
+/// object for text block
+class wxLayoutObjectText : public wxLayoutObjectBase
+{
+public:
+   virtual wxLayoutObjectType GetType(void) const { return WXLO_TYPE_TEXT; }
+   virtual void Draw(wxDC &dc, wxPoint position, CoordType baseLine,
+                     bool draw = true);
+   /** This returns the height and in baseLine the position of the
+       text's baseline within it's box. This is needed to properly
+       align text objects.
+   */
+   virtual wxPoint GetSize(CoordType *baseLine) const;
+#ifdef WXLAYOUT_DEBUG
+   virtual void Debug(void);
+#endif
+
+   wxLayoutObjectText(const String &txt);
+   virtual CoordType CountPositions(void) const { return strlen(m_Text.c_str()); }
+
+   // for editing:
+   String & GetText(void) { return m_Text; }
+   void SetText(String const &text) { m_Text = text; }
+private:
+   String m_Text;
+   /// size of the box containing text
+   long   m_Width, m_Height;
+   /// the position of the baseline counted from the top of the box
+   long   m_BaseLine;
+};
+
+/// icon/pictures:
+class wxLayoutObjectIcon : public wxLayoutObjectBase
+{
+public:
+   virtual wxLayoutObjectType GetType(void) const { return WXLO_TYPE_ICON; }
+   virtual void Draw(wxDC &dc, wxPoint position, CoordType baseLine,
+                     bool draw = true);
+   virtual wxPoint GetSize(CoordType *baseLine) const;
+   wxLayoutObjectIcon(wxIcon *icon);
+
+private:
+   wxIcon *m_Icon;
+};
+
+/// for export to html:
+struct wxLayoutStyleInfo
+{
+   int  size, family, style, weight;
+   bool underline;
+   unsigned fg_red, fg_green, fg_blue;
+   unsigned bg_red, bg_green, bg_blue;
+};
+
+/// pseudo-object executing a formatting command in Draw()
+class wxLayoutObjectCmd : public wxLayoutObjectBase
+{
+public:
+   virtual wxLayoutObjectType GetType(void) const { return WXLO_TYPE_CMD; }
+   virtual void Draw(wxDC &dc, wxPoint position, CoordType baseLine,
+                     bool draw = true);
+   wxLayoutObjectCmd(int size, int family, int style, int weight,
+                bool underline,
+                wxColour const *fg, wxColour const *bg);
+   ~wxLayoutObjectCmd();
+   /// caller must free pointer:
+   wxLayoutStyleInfo *GetStyle(void) const ;
+   /// return the background colour for setting colour of window
+   wxColour const *GetBGColour(void) const { return m_ColourBG; }
+private:
+   /// the font to use
+   wxFont *m_font;
+   /// foreground colour
+   wxColour const *m_ColourFG;
+   /// background colour
+   wxColour const *m_ColourBG;
+};
+
+/// this object doesn't do anything at all
+class wxLayoutObjectLineBreak : public wxLayoutObjectBase
+{
+public:
+   virtual wxLayoutObjectType GetType(void) const { return WXLO_TYPE_LINEBREAK; }
+};
+
+
+class wxLayoutPrintout;
+
+/**
+   This class provides a high level abstraction to the wxFText
+   classes.
+   It handles most of the character events with its own callback
+   functions, providing an editing ability. All events which cannot be
+   handled get passed to the parent window's handlers.
+*/
+class wxLayoutList : public wxLayoutObjectList
+{
+public:
+   wxLayoutList();
+   
+   /// Destructor.
+   ~wxLayoutList();
+
+   /// adds an object:
+   void AddObject(wxLayoutObjectBase *obj);
+   void AddText(String const &txt);
+
+   void LineBreak(void);
+   void SetFont(int family, int size, int style,
+                int weight, int underline,
+                wxColour const *fg,
+                wxColour const *bg);
+   void SetFont(int family=-1, int size = -1, int style=-1,
+                int weight=-1, int underline = -1,
+                char const *fg = (const char *) NULL,
+                char const *bg = (const char *) NULL);
+   inline void SetFontFamily(int family) { SetFont(family); }
+   inline void SetFontSize(int size) { SetFont(-1,size); }
+   inline void SetFontStyle(int style) { SetFont(-1,-1,style); }
+   inline void SetFontWeight(int weight) { SetFont(-1,-1,-1,weight); }
+   inline void SetFontUnderline(bool ul) { SetFont(-1,-1,-1,-1,(int)ul); }
+   inline void SetFontColour(char const *fg, char const *bg = (const char *) NULL) { SetFont(-1,-1,-1,-1,-1,fg,bg); }
+      
+   
+   /** Draw the list on a given DC.
+       @param findObject if true, return the object occupying the
+       position specified by coords
+       @param coords position where to find the object
+       @pageNo if > 0, print only that page of a document (for
+       printing)
+       @reallyDraw set this to false if you don't want to draw but just calculate the coordinates
+       @return if findObject == true, the object or NULL
+   */
+   wxLayoutObjectBase *Draw(wxDC &dc, bool findObject = false,
+                            wxPoint const &coords = wxPoint(0,0),
+                            int pageNo = -1, bool reallyDraw = true);
+
+#ifdef WXLAYOUT_DEBUG
+   void Debug(void);
+   void ShowCurrentObject();
+#endif
+
+   
+   /// for access by wxLayoutWindow:
+   void GetSize(CoordType *max_x, CoordType *max_y,
+                CoordType *lineHeight);
+
+   
+   /**@name Functionality for editing */
+   //@{
+   /// set list editable or read only
+   void SetEditable(bool editable = true) { m_Editable = editable; }
+   /// return true if list is editable
+   bool IsEditable(void) const { return m_Editable; }
+   /// move cursor, returns true if it could move to the desired position
+   bool MoveCursor(int dx = 0, int dy = 0);
+   void SetCursor(wxPoint const &p) { m_CursorPosition = p; }
+   wxPoint GetCursor(void) const { return m_CursorPosition; }
+   /// delete one or more cursor positions
+   void Delete(CoordType count = 1);
+   void Insert(String const &text);
+   void Insert(wxLayoutObjectBase *obj);
+   void Clear(int family = wxROMAN, int size=12, int style=wxNORMAL, int weight=wxNORMAL,
+                    int underline=0, char const *fg="black", char const *bg="white");
+
+   /// return a pointer to the default settings:
+   wxLayoutObjectCmd const *GetDefaults(void) const { return m_DefaultSetting ; }
+
+   wxLayoutObjectList::iterator FindCurrentObject(CoordType *offset = (CoordType *) NULL);
+   // get the length of the line with the object pointed to by i, offs 
+   // only used to decide whether we are before or after linebreak
+   CoordType GetLineLength(wxLayoutObjectList::iterator i,
+                           CoordType offs = 0);
+   wxLayoutPrintout *MakePrintout(wxString const &name);
+
+//@}
+protected:
+   /// font parameters:
+   int m_FontFamily, m_FontStyle, m_FontWeight;
+   int m_FontPtSize;
+   bool m_FontUnderline;
+   /// colours:
+   wxColour const * m_ColourFG;
+   wxColour const * m_ColourBG;
+   /// the default setting:
+   wxLayoutObjectCmd *m_DefaultSetting;
+   
+   /// needs recalculation?
+   bool m_dirty;
+
+   // the currently updated line:
+   /// where do we draw next:
+   wxPoint   m_Position;
+   /// the height of the current line:
+   CoordType m_LineHeight;
+   /// maximum drawn x position so far
+   CoordType m_MaxX;
+   /// maximum drawn y position:
+   CoordType m_MaxY;
+
+   //---- this is needed for editing:
+   /// where is the text cursor:
+   wxPoint   m_CursorPosition;
+   /// which is the last line
+   CoordType m_MaxLine;
+   /// can we edit it?
+   bool      m_Editable;
+   /// find the object to the cursor position and returns the offset
+   /// in there
+   wxLayoutObjectList::iterator FindObjectCursor(wxPoint *cpos, CoordType *offset = (CoordType *) NULL);
+   
+};
+
+class wxLayoutPrintout: public wxPrintout
+{
+ public:
+   wxLayoutPrintout(wxLayoutList &llist, wxString const & title = "My printout"):wxPrintout(title)
+      { m_llist = &llist; m_maxPage = 0; }
+  bool OnPrintPage(int page);
+  bool HasPage(int page);
+  bool OnBeginDocument(int startPage, int endPage);
+   void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int
+                    *selPageTo);
+private:
+   wxLayoutList *m_llist;
+   int           m_maxPage;
+};
+
+#endif // WXLLIST_H

user/wxLayout/wxlparser.cpp

@@ -0,0 +1,186 @@
+/*-*- c++ -*-********************************************************
+ * wxlparser.h : parsers,  import/export for wxLayoutList           *
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *******************************************************************/
+
+#ifdef __GNUG__
+#   pragma implementation "wxlparser.h"
+#endif
+
+#include   "wxllist.h"
+#include   "wxlparser.h"
+
+#define   BASE_SIZE 12
+
+void wxLayoutImportText(wxLayoutList &list, String const &str)
+{
+   char * cptr = (char *)str.c_str(); // string gets changed only temporarily
+   const char * begin = cptr;
+   char  backup;
+   
+   for(;;)
+   {
+      begin = cptr++;
+      while(*cptr && *cptr != '\n')
+         cptr++;
+      backup = *cptr;
+      *cptr = '\0';
+      list.Insert(begin);
+      *cptr = backup;
+      if(backup == '\n')
+         list.LineBreak();
+      else if(backup == '\0') // reached end of string
+         break;
+      cptr++;
+   }
+}
+
+static
+String wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
+                                 wxLayoutStyleInfo **lastStylePtr)
+{
+   static char buffer[20];
+   String html;
+   
+   wxLayoutStyleInfo *si = cmd.GetStyle();
+   wxLayoutStyleInfo *last_si = NULL;
+
+   int size, sizecount;
+   
+   if(lastStylePtr != NULL)
+      last_si = *lastStylePtr;
+   
+   html += "<font ";
+
+   html +="color=";
+   sprintf(buffer,"\"#%02X%02X%02X\"", si->fg_red,si->fg_green,si->fg_blue);
+   html += buffer;
+
+
+   html += " bgcolor=";
+   sprintf(buffer,"\"#%02X%02X%02X\"", si->bg_red,si->bg_green,si->bg_blue);
+   html += buffer;
+
+   switch(si->family)
+   {
+   case wxSWISS:
+   case wxMODERN:
+      html += " face=\"Arial,Helvetica\""; break;
+   case wxROMAN:
+      html += " face=\"Times New Roman, Times\""; break;
+   case wxTELETYPE:
+      html += " face=\"Courier New, Courier\""; break;
+   default:
+      ;
+   }
+
+   size = BASE_SIZE; sizecount = 0;
+   while(size < si->size && sizecount < 5)
+   {
+      sizecount ++;
+      size = (size*12)/10;
+   }
+   while(size > si->size && sizecount > -5)
+   {
+      sizecount --;
+      size = (size*10)/12;
+   }
+   html += "size=";
+   sprintf(buffer,"%+1d", sizecount);
+   html += buffer;
+
+   html +=">";
+
+   if(last_si != NULL)
+      html ="</font>"+html; // terminate any previous font command
+
+   if((si->weight == wxBOLD) && ( (!last_si) || (last_si->weight != wxBOLD)))
+      html += "<b>";
+   else
+      if(si->weight != wxBOLD && ( last_si && (last_si->weight == wxBOLD)))
+         html += "</b>";
+
+   if(si->style == wxSLANT)
+      si->style = wxITALIC; // the same for html
+   
+   if((si->style == wxITALIC) && ( (!last_si) || (last_si->style != wxITALIC)))
+      html += "<i>";
+   else
+      if(si->style != wxITALIC && ( last_si && (last_si->style == wxITALIC)))
+         html += "</i>";
+
+   if(si->underline && ( (!last_si) || ! last_si->underline))
+      html += "<u>";
+   else if(si->underline == false && ( last_si && last_si->underline))
+      html += "</u>";
+   
+   if(last_si)
+      delete last_si;
+   *lastStylePtr = si;
+   return html;
+}
+
+
+
+#define   WXLO_IS_TEXT(type) \
+( (type == WXLO_TYPE_TEXT || type == WXLO_TYPE_LINEBREAK) \
+  || (type == WXLO_TYPE_CMD \
+      && mode == WXLO_EXPORT_AS_HTML))
+
+
+  
+   wxLayoutExportObject *wxLayoutExport(wxLayoutList &list,
+                                        wxLayoutList::iterator &from,
+                                        wxLayoutExportMode mode)
+{
+   if(from == list.end())
+      return NULL;
+   
+   wxLayoutObjectType   type = (*from)->GetType();
+   wxLayoutExportObject     * export = new wxLayoutExportObject();
+
+   static wxLayoutStyleInfo *s_si = NULL;
+   
+   if( mode == WXLO_EXPORT_AS_OBJECTS || ! WXLO_IS_TEXT(type)) // simple case
+   {
+      export->type = WXLO_EXPORT_OBJECT;
+      export->content.object = *from;
+      from++;
+      return export;
+   }
+
+   String *str = new String();
+   
+   // text must be concatenated
+   while(from != list.end() && WXLO_IS_TEXT(type))
+   {
+      switch(type)
+      {
+      case WXLO_TYPE_TEXT:
+         *str += ((wxLayoutObjectText *)*from)->GetText();
+         break;
+      case WXLO_TYPE_LINEBREAK:
+         if(mode == WXLO_EXPORT_AS_HTML)
+            *str += "<br>";
+         *str += '\n';
+         break;
+      case WXLO_TYPE_CMD:
+         //wxASSERT(mode == WXLO_EXPORT_AS_HTML,"reached cmd object in text mode")
+         assert(mode == WXLO_EXPORT_AS_HTML);
+         *str += wxLayoutExportCmdAsHTML(*(wxLayoutObjectCmd const
+                                           *)*from, &s_si);
+         break;
+      default:  // ignore icons
+         ;
+      }
+      from++;
+      if(from != list.end())
+         type = (*from)->GetType();
+   }
+   export->type = (mode == WXLO_EXPORT_AS_HTML) ?  WXLO_EXPORT_HTML : WXLO_EXPORT_TEXT;
+   export->content.text = str;
+   return export;
+}

user/wxLayout/wxlparser.h

@@ -0,0 +1,57 @@
+/*-*- c++ -*-********************************************************
+ * wxlparser.h : parsers,  import/export for wxLayoutList           *
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *******************************************************************/
+#ifndef WXLPARSER_H
+#   define   WXLPARSER_H
+
+#ifdef __GNUG__
+#   pragma interface "wxlparser.h"
+#endif
+
+#ifndef   NULL
+#   define   NULL 0
+#endif
+
+enum wxLayoutExportType
+{
+   WXLO_EXPORT_TEXT,        
+   WXLO_EXPORT_HTML,        
+   WXLO_EXPORT_OBJECT
+};
+
+enum wxLayoutExportMode
+{
+   WXLO_EXPORT_AS_TEXT,
+   WXLO_EXPORT_AS_TEXT_AND_COMMANDS,
+   WXLO_EXPORT_AS_HTML,
+   WXLO_EXPORT_AS_OBJECTS
+};
+
+struct wxLayoutExportObject
+{
+   wxLayoutExportType type;
+   union
+   {
+      String           *text;
+      wxLayoutObjectBase *object;
+   }content;
+   ~wxLayoutExportObject()
+      {
+         if(type == WXLO_EXPORT_TEXT || type == WXLO_EXPORT_HTML)
+            delete content.text;
+      }
+};
+
+/// import text into a wxLayoutList (including linefeeds):
+void wxLayoutImportText(wxLayoutList &list, String const &str);
+
+
+wxLayoutExportObject *wxLayoutExport(wxLayoutList &list,
+                               wxLayoutList::iterator &from,
+                               wxLayoutExportMode WXLO_EXPORT_AS_TEXT);
+
+#endif //WXLPARSER_H

user/wxLayout/wxlwindow.cpp

@@ -0,0 +1,194 @@
+/*-*- c++ -*-********************************************************
+ * wxLwindow.h : a scrolled Window for displaying/entering rich text*
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *******************************************************************/
+
+#ifdef __GNUG__
+#   pragma implementation "wxlwindow.h"
+#endif
+
+#include   "wxlwindow.h"
+
+#define   VAR(x)   cout << #x"=" << x << endl;
+
+BEGIN_EVENT_TABLE(wxLayoutWindow,wxScrolledWindow)
+   EVT_PAINT    (wxLayoutWindow::OnPaint)
+   EVT_CHAR     (wxLayoutWindow::OnChar)
+   EVT_LEFT_DOWN(wxLayoutWindow::OnMouse)
+END_EVENT_TABLE()
+
+wxLayoutWindow::wxLayoutWindow(wxWindow *parent)
+   : wxScrolledWindow(parent, -1, wxDefaultPosition, wxDefaultSize,
+                      wxHSCROLL | wxVSCROLL | wxBORDER)
+
+{
+   m_ScrollbarsSet = false;
+   m_EventId = -1;
+}
+
+#ifdef __WXMSW__
+long
+wxLayoutWindow::MSWGetDlgCode()
+{
+   // if we don't return this, we won't get OnChar() events
+   return DLGC_WANTCHARS | DLGC_WANTARROWS | DLGC_WANTMESSAGE;
+}
+#endif //MSW
+
+
+void
+wxLayoutWindow::OnMouse(wxMouseEvent& event)
+{
+   SetFocus();
+
+   if(m_EventId == -1) // nothing to do
+      return;
+   
+   m_FindPos.x = event.GetX();
+   m_FindPos.y = event.GetY();
+   m_FoundObject = (wxLayoutObjectBase *) NULL;
+
+#ifdef   WXLAYOUT_DEBUG
+   //doesn't work, undefined functions
+   //wxLogTrace("OnMouse: (%d, %d)", m_FindPos.x, m_FindPos.y);
+#endif
+   Refresh();
+   if(m_FoundObject)
+   {
+      if(m_EventId != -1)
+      {
+         wxCommandEvent commandEvent(wxEVENT_TYPE_MENU_COMMAND, m_EventId);
+         commandEvent.SetEventObject( this );
+         commandEvent.SetClientData((char *)m_FoundObject);
+         m_ClickPosition = wxPoint(event.GetX(), event.GetY());
+         GetEventHandler()->ProcessEvent(commandEvent);
+      }
+   }
+}
+
+/*
+ * some simple keyboard handling
+ */
+void
+wxLayoutWindow::OnChar(wxKeyEvent& event)
+{
+   if(! m_llist.IsEditable()) // do nothing
+   {
+      event.Skip();
+      return;
+   }
+   
+   long keyCode = event.KeyCode();
+   wxPoint p;
+   CoordType help;
+   
+   switch(event.KeyCode())
+   {
+      case WXK_RIGHT:
+      m_llist.MoveCursor(1);
+      break;
+   case WXK_LEFT:
+      m_llist.MoveCursor(-1);
+      break;
+   case WXK_UP:
+      m_llist.MoveCursor(0,-1);
+      break;
+   case WXK_DOWN:
+      m_llist.MoveCursor(0,1);
+      break;
+   case WXK_PRIOR:
+      m_llist.MoveCursor(0,-20);
+      break;
+   case WXK_NEXT:
+      m_llist.MoveCursor(0,20);
+      break;
+   case WXK_HOME:
+      p = m_llist.GetCursor();
+      p.x = 0;
+      m_llist.SetCursor(p);
+      break;
+   case WXK_END:
+      p = m_llist.GetCursor();
+      p.x = m_llist.GetLineLength(m_llist.FindCurrentObject((CoordType *) NULL));
+      m_llist.SetCursor(p);
+      break;
+   case WXK_DELETE :
+      if(event.ControlDown()) // delete to end of line
+      {
+         help = m_llist.GetLineLength(
+            m_llist.FindCurrentObject((CoordType *) NULL))
+            - m_llist.GetCursor().x;
+         m_llist.Delete(help ? help : 1);
+      }
+      else
+         m_llist.Delete(1);
+      break;
+   case WXK_BACK: // backspace
+      if(m_llist.MoveCursor(-1))
+         m_llist.Delete(1);
+      break;
+   case WXK_RETURN:
+      m_llist.LineBreak();
+      break;
+#ifdef WXLAYOUT_DEBUG   
+   case WXK_F1:
+      m_llist.Debug();
+      break;
+#endif 
+   default:
+      if(keyCode < 256 && keyCode >= 32)
+      {
+         String tmp;
+         tmp += keyCode;
+         m_llist.Insert(tmp);
+      }
+      break;
+   }
+   Refresh();
+   UpdateScrollbars();
+}
+
+void
+wxLayoutWindow::OnPaint( wxPaintEvent &WXUNUSED(event)w)  // or: OnDraw(wxDC& dc)
+{
+   wxPaintDC dc( this );  // only when used as OnPaint for OnDraw we
+   PrepareDC( dc );       // can skip the first two lines
+
+   if(m_EventId != -1) // look for keyclicks
+      m_FoundObject = m_llist.Draw(dc,true,m_FindPos);
+   else
+      m_llist.Draw(dc);
+   if(! m_ScrollbarsSet)
+   {
+      m_ScrollbarsSet = true; // avoid recursion
+      UpdateScrollbars();
+   }
+}
+
+void
+wxLayoutWindow::UpdateScrollbars(void)
+{
+   CoordType
+      max_x, max_y, lineHeight;
+   
+   m_llist.GetSize(&max_x, &max_y, &lineHeight);
+   SetScrollbars(10, lineHeight, max_x/10+1, max_y/lineHeight+1);
+   EnableScrolling(true,true);
+}
+
+void
+wxLayoutWindow::Print(void)
+{
+   VAR(wxThePrintSetupData);
+
+   wxPostScriptDC   dc("layout.ps",true,this);
+   if (dc.Ok() && dc.StartDoc((char *)_("Printing message...")))
+   {
+      //dc.SetUserScale(1.0, 1.0);
+      m_llist.Draw(dc);
+      dc.EndDoc();
+   }
+}

user/wxLayout/wxlwindow.h

@@ -0,0 +1,70 @@
+/*-*- c++ -*-********************************************************
+ * wxLwindow.h : a scrolled Window for displaying/entering rich text*
+ *                                                                  *
+ * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
+ *                                                                  *
+ * $Id$
+ *******************************************************************/
+#ifndef WXLWINDOW_H
+#define WXLWINDOW_H
+
+#ifdef __GNUG__
+#   pragma interface "wxlwindow.h"
+#endif
+
+#ifndef USE_PCH
+#  include   <wx/wx.h>
+#endif
+
+#include   "wxllist.h"
+
+class wxLayoutWindow : public wxScrolledWindow
+{
+public:
+   wxLayoutWindow(wxWindow *parent);
+
+   wxLayoutList & GetLayoutList(void) { return m_llist; }
+
+   // clears the window and sets default parameters:
+   void Clear(int family = wxROMAN, int size=12, int style=wxNORMAL, int weight=wxNORMAL,
+              int underline=0, char const *fg="black", char const
+              *bg="white")
+      {
+         GetLayoutList().Clear(family,size,style,weight,underline,fg,bg);
+         SetBackgroundColour( *GetLayoutList().GetDefaults()->GetBGColour());
+      }
+
+   // callbacks
+   // NB: these functions are used as event handlers and must not be virtual
+   //void OnDraw(wxDC &dc);
+   void OnPaint(wxPaintEvent &WXUNUSED(event));
+   void OnMouse(wxMouseEvent& event);
+   void OnChar(wxKeyEvent& event);
+
+#ifdef __WXMSW__
+   virtual long MSWGetDlgCode();
+#endif //MSW
+
+   void UpdateScrollbars(void);
+   void Print(void);
+   void SetEventId(int id) { m_EventId = id; }
+   // what for? Caller doesn't even know object's positions in window
+   //wxPoint const &GetClickPosition(void) const { return m_ClickPosition; }
+   virtual ~wxLayoutWindow() {}
+private:
+   /// for sending events
+   wxWindow *m_Parent;
+   int m_EventId;
+   /// the layout list to be displayed
+   wxLayoutList m_llist;
+   /// have we already set the scrollbars?
+   bool m_ScrollbarsSet;
+   /// if we want to find an object:
+   wxPoint m_FindPos;
+   wxLayoutObjectBase *m_FoundObject;
+   wxPoint m_ClickPosition;
+
+   DECLARE_EVENT_TABLE()
+};
+
+#endif

wxPython/.cvsignore

@@ -1,24 +0,0 @@
-.DS_Store
-.emacs.desktop
-.gdb_history
-BUILD
-MANIFEST
-_build_dmg
-_build_rpm
-build
-build-dbg
-build-gtk
-build-gtk2
-build-gtk2-dbg.unicode
-build-gtk2.unicode
-build-pkg
-build-pkg-debug
-build-x11
-build.local
-build.unicode
-build_options.py
-dist
-licence
-s.bat
-temp
-update.log

wxPython/SWIG/README.txt

@@ -1,158 +0,0 @@
-SWIG 1.3.x Patches
-==================
-
-This directory holds a set of patches for the CVS version of SWIG that
-are required if you wish to use SWIG for wxPython development, or for
-building your own extension modules that need to interface with
-wxPython.  These have been submitted to SWIG's SourceForge patch
-tracker, so hopefully they will get incorporated into the main SWIG
-source tree soon.
-
-wxPython currently uses the 1.3.29 version of SWIG, which you can get
-from https://sourceforge.net/projects/swig/, plus the patch(es) in
-this directory.  Download the SWIG sources, apply the patch(es) here
-and then build as normal.  I have also have made available a tarball
-containing the patched SWIG sources, plus a win32 binary, located
-here:
-
-	http://wxpython.wxcommunity.com/tools/
-
-If you want to use the patched version of SWIG and still have the
-stock version available for other projects, then you can configure the
-patched version to use a different --prefix and then specify that
-executable when running setup.py, like this:
-
-	python setup.py SWIG=/path/to/my/swig [other params]
-
-
-
-------------------------------------------------------------------------
-
-swig-1.3.29.patch
-
-    SWIG changed how the import statements are output to the proxy
-    file, but this also caused the order to change (they all moved to
-    the very top of the file) so this broke the module docstring, as
-    well as some behavior that Chandler development is depending upon,
-    so this patch changes back to how it was done in prior releases.
-
-    Changed the exception message used for TypeErrors to make a little
-    more sense.
-
-    Added support for dropping the leading wx from wxNames using
-    %rename("%(wxpy)s") ""; 
-
-    Don't set a module attribute for the *_swigregister functions,
-    just call the one in the extension module directly.
-
-    Fixes to allow compiling with Python 2.5 headers.
-
-
-------------------------------------------------------------------------
-
-swig-1.3.27.patch
-
-    SWIG changed slightly how the runtime type_info data is structured
-    in order to optimize load time and runtime access.  wxPython
-    uncovered a bug in the implementation, so this patch includes the
-    fix that was checked in to CVS for 1.3.28.
-
-    SWIG changed how the import statements are output to the proxy
-    file, but this also caused the order to change (they all moved to
-    the very top of the file) so this broke the module docstring, as
-    well as some behavior that Chandler development is depending upon,
-    so this patch changes back to how it was done in prior releases.
-
-    Bug fix for SWIG's definition of the %makedefault macro.
-
-    Fixes to allow compiling with Python 2.5 headers.
-    
-
-------------------------------------------------------------------------
-
-swig-1.3.24.patch (now obsolete)
-
-    A bug was introduced in SWIG 1.3.23 and remains in 1.3.24 that
-    causes compilation problems with wxPython (copies are being made
-    of objects that don't have a copy constructor.)  This patch fixes
-    the code generator to use a reference to the object instead of
-    making a copy.
-
-    Part of my autodoc patch was disabled because a unit-test failed.
-    It turns out that the failure was due to a name clash in the unit
-    test itself, so I re-enabled that section of code in this patch.
-
-    Don't generate the autodocs string for a class if it has a
-    docstring attribute.
-
-    Some typos fixed, etc.
-
-
-
-
-------------------------------------------------------------------------
-This patch was added to SWIG's CVS on 10/2/2004 and a modified version
-of it is in 1.3.23 and 1.3.24.
-------------------------------------------------------------------------
-
-
-swig.python-2.patch  
-
-    Adds the following features to the Python Module in SWIG.  See the
-    updated docs in the patch for more details.
-
-            %feature("autodoc")
-            %feature("docstring")
-            %feature("pythonprepend")
-            %feature("pythonappend")
-
-            %module(docstring="string")
-            %module(package="string")
-
-    https://sourceforge.net/tracker/index.php?func=detail&aid=1023309&group_id=1645&atid=301645
-
-
-------------------------------------------------------------------------
-This patch was applied to SWIG's CVS on 07/12/2004 and is in the
-1.3.22 release.
-------------------------------------------------------------------------
-
-swig.xmlout.patch            Fixes a couple problems in the XML output
-                             of SWIG: an extra "/>" was removed and
-                             newlines in attribute values were changed
-                             to the #10; entity reference so they will
-                             be preserved by parsers.
-
-                             Also, added options for dumping or
-                             writing to a file the XML of the parse
-                             tree *after* other language modules have
-                             been run (previously you could only do
-                             the XML output *instead of* a regular
-                             language module.)
-                             See SF Patch #864689
-
-
-
-------------------------------------------------------------------------
-These patches have already been checked in to SWIG's CVS and are in
-the 1.3.20 release.
-------------------------------------------------------------------------
-
-swig.SplitLines.patch       Adds a new SplitLines function to the DOH
-                            library.  See SF Patch #829317.
-                            *Checked in 10/31/2003*
-
-swig.xml.patch              Adds an option that drastically reduces
-                            the size of the XML output of SWIG, which
-                            increases the performance of the
-                            build_renamers script used in the wxPython
-                            build.  See SF Patch #829319.
-                            *Checked in 10/31/2003*
-
-swig.python.patch           Lots of changes for SWIG's Python module,
-                            especially in how the proxy code is
-                            generated.  See swig.python.patch.txt for
-                            more details, also SF Patch #829325.
-                            *Checked in 10/31/2003*
-
-------------------------------------------------------------------------

wxPython/SWIG/swig-1.3.24.patch

@@ -1,201 +0,0 @@
-? .configure
-? .emacs.desktop
-? .test
-? mytests
-? switch_cvs.py
-? Source/Modules/mystuff
-Index: Doc/Manual/Python.html
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Doc/Manual/Python.html,v
-retrieving revision 1.20
-diff -u -4 -r1.20 Python.html
---- Doc/Manual/Python.html	25 Oct 2004 20:42:08 -0000	1.20
-+++ Doc/Manual/Python.html	15 Apr 2005 23:11:25 -0000
-@@ -3869,10 +3869,10 @@
- 
- <H2><a name="Python_nn65"></a>26.10 Docstring Features</H2>
- 
- 
--Usign docstrings in Python code is becoming more and more important
--ans more tools are coming on the scene that take advantage of them,
-+Using docstrings in Python code is becoming more and more important
-+and more tools are coming on the scene that take advantage of them,
- everything from full-blown documentaiton generators to class browsers
- and popup call-tips in Python-aware IDEs.  Given the way that SWIG
- generates the proxy code by default, your users will normally get
- something like <tt>"function_name(*args)"</tt> in the popup calltip of
-Index: Lib/python/pyrun.swg
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Lib/python/pyrun.swg,v
-retrieving revision 1.53
-diff -u -4 -r1.53 pyrun.swg
---- Lib/python/pyrun.swg	11 Dec 2004 23:38:44 -0000	1.53
-+++ Lib/python/pyrun.swg	15 Apr 2005 23:11:25 -0000
-@@ -455,9 +455,10 @@
- 	} else {
- 	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
- 		       type, otype);
- 	}
--	Py_DECREF(str);
-+	if (str)
-+          Py_DECREF(str);
- 	return;
-       }
-     }   
-     PyErr_Format(PyExc_TypeError, "a '%s' is expected", type);
-Index: Source/Modules/python.cxx
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Source/Modules/python.cxx,v
-retrieving revision 1.81
-diff -u -4 -r1.81 python.cxx
---- Source/Modules/python.cxx	13 Dec 2004 22:12:47 -0000	1.81
-+++ Source/Modules/python.cxx	15 Apr 2005 23:11:26 -0000
-@@ -74,9 +74,9 @@
-      -modern         - Use modern python features only, without compatibility code\n\
-      -apply          - Use apply() in proxy classes\n\
-      -new_vwm        - New value wrapper mode, use only when everything else fails \n\
-      -new_repr       - Use more informative version of __repr__ in proxy classes\n\
--     -old_repr       - Use shorter ald old version of __repr__ in proxy classes\n\
-+     -old_repr       - Use shorter and old version of __repr__ in proxy classes\n\
-      -noexcept       - No automatic exception handling\n\
-      -noh            - Don't generate the output header file\n\
-      -noproxy        - Don't generate proxy classes \n\n";
- 
-@@ -749,10 +749,15 @@
-         
-       // Do the param type too?
-       if (showTypes) {
-         type =  SwigType_base(type);
--	lookup = Swig_symbol_clookup(type, 0);
--	if (lookup) type = Getattr(lookup, "sym:name");
-+        SwigType* qt = SwigType_typedef_resolve_all(type);
-+        if (SwigType_isenum(qt))
-+          type = NewString("int");
-+        else {
-+          lookup = Swig_symbol_clookup(type, 0);
-+          if (lookup) type = Getattr(lookup, "sym:name");
-+        }
-         Printf(doc, "%s ", type);
-       }
- 
-       if (name) {
-@@ -853,13 +858,19 @@
-         }
-         
-         switch ( ad_type ) {
-         case AUTODOC_CLASS:
--	  if (CPlusPlus) {
--	    Printf(doc, "Proxy of C++ %s class", class_name);
--	  } else {
--	    Printf(doc, "Proxy of C %s struct", class_name);
--	  }
-+          {
-+            // Only do the autodoc if there isn't a docstring for the class
-+            String* str = Getattr(n, "feature:docstring");
-+            if  (str == NULL || Len(str) == 0) {
-+              if (CPlusPlus) {
-+                Printf(doc, "Proxy of C++ %s class", class_name);
-+              } else {
-+                Printf(doc, "Proxy of C %s struct", class_name);
-+              }
-+            }
-+          }
- 	  break;
-         case AUTODOC_CTOR:
-           if ( Strcmp(class_name, symname) == 0) {
-             String* paramList = make_autodocParmList(n, showTypes);
-@@ -1027,10 +1038,12 @@
-       Printf(methods,"\t { (char *)\"%s\", (PyCFunction) %s, METH_VARARGS | METH_KEYWORDS, ", name, function);
-     
-     if (n && Getattr(n,"feature:callback")) {
-       if (have_docstring(n)) {
-+        String* ds = docstring(n, AUTODOC_FUNC, "", false);
-+        Replaceall(ds, "\n", "\\n");
- 	Printf(methods,"(char *)\"%s\\nswig_ptr: %s\"",
--	       docstring(n, AUTODOC_FUNC, "", false),
-+	       ds,
- 	       Getattr(n,"feature:callback:name"));
-       } else {
- 	Printf(methods,"(char *)\"swig_ptr: %s\"",Getattr(n,"feature:callback:name"));
-       }
-@@ -1950,11 +1963,13 @@
- 	  Printf(f_shadow, modern ? "(object)" : "(_object)");
- 	}
-       }
-       Printf(f_shadow,":\n");
--      if ( have_docstring(n) ) 
--          Printv(f_shadow, tab4, docstring(n, AUTODOC_CLASS, tab4), "\n", NIL);
--      
-+      if ( have_docstring(n) ) {
-+        String* str = docstring(n, AUTODOC_CLASS, tab4);
-+        if (str != NULL && Len(str)) 
-+          Printv(f_shadow, tab4, str, "\n", NIL);
-+      }
-       if (!modern) {
-         Printv(f_shadow,tab4,"__swig_setmethods__ = {}\n",NIL);
-         if (Len(base_class)) {
-           Printf(f_shadow,"%sfor _s in [%s]: __swig_setmethods__.update(_s.__swig_setmethods__)\n",tab4,base_class);
-@@ -2139,11 +2154,11 @@
- 	  Replaceall(pycode,"$action", pyaction);
- 	  Delete(pyaction);
- 	  Printv(f_shadow,pycode,"\n",NIL);
- 	} else {
--	  Printv(f_shadow, tab4, "def ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "): ", NIL);
-+	  Printv(f_shadow, tab4, "def ", symname, "(*args", (allow_kwargs ? ", **kwargs" : ""), "):", NIL);
- 	  if (!have_addtofunc(n)) {
--	    Printv(f_shadow, "return ", funcCallHelper(Swig_name_member(class_name,symname), allow_kwargs), "\n", NIL);
-+	    Printv(f_shadow, " return ", funcCallHelper(Swig_name_member(class_name,symname), allow_kwargs), "\n", NIL);
- 	  } else {
-             Printv(f_shadow, "\n", NIL);
-             if ( have_docstring(n) )
-               Printv(f_shadow, tab8, docstring(n, AUTODOC_METHOD, tab8), "\n", NIL);
-@@ -2175,12 +2190,9 @@
-       return SWIG_OK;
-     }
-     
-     if (shadow) {
--      //
--      // static + autodoc/prepend/append + def args not working!!!, disable by now
--      //
--      if (0 && !classic && !Getattr(n,"feature:python:callback") && have_addtofunc(n)) {
-+      if ( !classic && !Getattr(n,"feature:python:callback") && have_addtofunc(n)) {
-         int kw = (check_kwargs(n) && !Getattr(n,"sym:overloaded")) ? 1 : 0;
-         Printv(f_shadow, tab4, "def ", symname, "(*args", (kw ? ", **kwargs" : ""), "):\n", NIL);
-         if ( have_docstring(n) )
-           Printv(f_shadow, tab8, docstring(n, AUTODOC_STATICFUNC, tab8), "\n", NIL);
-Index: Source/Swig/cwrap.c
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Source/Swig/cwrap.c,v
-retrieving revision 1.51
-diff -u -4 -r1.51 cwrap.c
---- Source/Swig/cwrap.c	4 Dec 2004 08:33:02 -0000	1.51
-+++ Source/Swig/cwrap.c	15 Apr 2005 23:11:26 -0000
-@@ -172,17 +172,26 @@
-       tycode = SwigType_type(type);
-       if (tycode == T_REFERENCE) {
- 	if (pvalue) {
- 	  SwigType *tvalue;
--	  String *defname, *defvalue, *rvalue;
-+	  String *defname, *defvalue, *rvalue, *qvalue;
- 	  rvalue = SwigType_typedef_resolve_all(pvalue);
-+	  qvalue = SwigType_typedef_qualified(rvalue);
- 	  defname = NewStringf("%s_defvalue", lname);
- 	  tvalue = Copy(type);
- 	  SwigType_del_reference(tvalue);
--	  defvalue = NewStringf("%s = %s", SwigType_lstr(tvalue,defname), rvalue);
-+	  tycode = SwigType_type(tvalue);
-+	  if (tycode != T_USER) {
-+	    /* plain primitive type, we copy the the def value */
-+	    defvalue = NewStringf("%s = %s", SwigType_lstr(tvalue,defname),qvalue);
-+	  } else {
-+	    /* user type, we copy the reference value */
-+	    defvalue = NewStringf("%s = %s",SwigType_str(type,defname),qvalue);
-+	  }
- 	  Wrapper_add_localv(w,defname, defvalue, NIL);
- 	  Delete(tvalue);
- 	  Delete(rvalue);
-+	  Delete(qvalue);
- 	  Delete(defname);
- 	  Delete(defvalue);
- 	}
-       }  else if (!pvalue && ((tycode == T_POINTER) || (tycode == T_STRING))) {

wxPython/SWIG/swig-1.3.27.patch

@@ -1,310 +0,0 @@
-Index: Doc/Manual/Python.html
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Doc/Manual/Python.html,v
-retrieving revision 1.31
-diff -u -4 -r1.31 Python.html
---- Doc/Manual/Python.html	6 Oct 2005 21:49:58 -0000	1.31
-+++ Doc/Manual/Python.html	28 Jun 2006 22:22:00 -0000
-@@ -4461,10 +4461,10 @@
- <H2><a name="Python_nn65"></a>26.10 Docstring Features</H2>
- 
- 
- <p>
--Usign docstrings in Python code is becoming more and more important
--ans more tools are coming on the scene that take advantage of them,
-+Using docstrings in Python code is becoming more and more important
-+and more tools are coming on the scene that take advantage of them,
- everything from full-blown documentaiton generators to class browsers
- and popup call-tips in Python-aware IDEs.  Given the way that SWIG
- generates the proxy code by default, your users will normally get
- something like <tt>"function_name(*args)"</tt> in the popup calltip of
-Index: Lib/swig.swg
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Lib/swig.swg,v
-retrieving revision 1.49
-diff -u -4 -r1.49 swig.swg
---- Lib/swig.swg	15 Oct 2005 00:15:30 -0000	1.49
-+++ Lib/swig.swg	28 Jun 2006 22:22:00 -0000
-@@ -51,9 +51,9 @@
- 
- #define %nodefault       %feature("nodefault","1")
- #define %default         %feature("nodefault","0")
- #define %clearnodefault  %feature("nodefault","")
--#define %makedefault     %cleardefault
-+#define %makedefault     %clearnodefault
- 
- /* the %exception directive */
- 
- #ifdef SWIGCSHARP
-Index: Lib/swiginit.swg
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Lib/swiginit.swg,v
-retrieving revision 1.5
-diff -u -4 -r1.5 swiginit.swg
---- Lib/swiginit.swg	12 Sep 2005 23:25:03 -0000	1.5
-+++ Lib/swiginit.swg	28 Jun 2006 22:22:00 -0000
-@@ -40,14 +40,19 @@
- **/
- 
- #ifdef __cplusplus
- extern "C" {
-+#if 0
-+} /* c-mode */
-+#endif
-+#endif
-+
-+#if 0
-+#define SWIGRUNTIME_DEBUG
- #endif
- 
- SWIGRUNTIME void
- SWIG_InitializeModule(void *clientdata) {
--  swig_type_info *type, *ret;
--  swig_cast_info *cast;
-   size_t i;
-   swig_module_info *module_head;
-   static int init_run = 0;
- 
-@@ -71,18 +76,35 @@
-     SWIG_SetModule(clientdata, &swig_module);
-   }
- 		 
-   /* Now work on filling in swig_module.types */
-+#ifdef SWIGRUNTIME_DEBUG
-+  printf("SWIG_InitializeModule: size %d\n", swig_module.size);
-+#endif
-   for (i = 0; i < swig_module.size; ++i) {
--    type = 0;
-+    swig_type_info *type = 0;
-+    swig_type_info *ret;
-+    swig_cast_info *cast;
-+  
-+#ifdef SWIGRUNTIME_DEBUG
-+    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
-+#endif
- 
-     /* if there is another module already loaded */
-     if (swig_module.next != &swig_module) {
-       type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name);
-     }
-     if (type) {
-       /* Overwrite clientdata field */
--      if (swig_module.type_initial[i]->clientdata) type->clientdata = swig_module.type_initial[i]->clientdata;
-+#ifdef SWIGRUNTIME_DEBUG
-+      printf("SWIG_InitializeModule: found type %s\n", type->name);
-+#endif
-+      if (swig_module.type_initial[i]->clientdata) {
-+	type->clientdata = swig_module.type_initial[i]->clientdata;
-+#ifdef SWIGRUNTIME_DEBUG
-+      printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name);
-+#endif
-+      }
-     } else {
-       type = swig_module.type_initial[i];
-     }
- 
-@@ -91,31 +113,66 @@
-     while (cast->type) {
-     
-       /* Don't need to add information already in the list */
-       ret = 0;
-+#ifdef SWIGRUNTIME_DEBUG
-+      printf("SWIG_InitializeModule: look cast %s\n", cast->type->name);
-+#endif
-       if (swig_module.next != &swig_module) {
-         ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name);
-+#ifdef SWIGRUNTIME_DEBUG
-+	if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name);
-+#endif
-       }
--      if (ret && type == swig_module.type_initial[i]) {
--        cast->type = ret;
--        ret = 0;
-+      if (ret) {
-+	if (type == swig_module.type_initial[i]) {
-+#ifdef SWIGRUNTIME_DEBUG
-+	  printf("SWIG_InitializeModule: skip old type %s\n", ret->name);
-+#endif
-+	  cast->type = ret;
-+	  ret = 0;
-+	} else {
-+	  /* Check for casting already in the list */
-+	  swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type);
-+#ifdef SWIGRUNTIME_DEBUG
-+	  if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name);
-+#endif
-+	  if (!ocast) ret = 0;
-+	}
-       }
--      
-+
-       if (!ret) {
-+#ifdef SWIGRUNTIME_DEBUG
-+	printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name);
-+#endif
-         if (type->cast) {
-           type->cast->prev = cast;
-           cast->next = type->cast;
-         }
-         type->cast = cast;
-       }
--
-       cast++;
-     }
--
-     /* Set entry in modules->types array equal to the type */
-     swig_module.types[i] = type;
-   }
-   swig_module.types[i] = 0;
-+
-+#ifdef SWIGRUNTIME_DEBUG
-+  printf("**** SWIG_InitializeModule: Cast List ******\n");
-+  for (i = 0; i < swig_module.size; ++i) {
-+    int j = 0;
-+    swig_cast_info *cast = swig_module.cast_initial[i];
-+    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
-+    while (cast->type) {
-+      printf("SWIG_InitializeModule: cast type %s\n", cast->type->name);
-+      cast++;
-+      ++j;
-+    }
-+  printf("---- Total casts: %d\n",j);
-+  }
-+  printf("**** SWIG_InitializeModule: Cast List ******\n");
-+#endif
- }
- 
- /* This function will propagate the clientdata field of type to
- * any new swig_type_info structures that have been added into the list
-@@ -145,6 +202,9 @@
-   }
- }
- 
- #ifdef __cplusplus
-+#if 0
-+{ /* c-mode */
-+#endif
- }
- #endif
-Index: Source/Modules/python.cxx
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Source/Modules/python.cxx,v
-retrieving revision 1.107
-diff -u -4 -r1.107 python.cxx
---- Source/Modules/python.cxx	7 Oct 2005 13:17:41 -0000	1.107
-+++ Source/Modules/python.cxx	28 Jun 2006 22:22:01 -0000
-@@ -36,9 +36,8 @@
- static  File         *f_directors_h = 0;
- static  File         *f_init = 0;
- static  File         *f_shadow_py = 0;
- static  String       *f_shadow = 0;
--static  String       *f_shadow_imports = 0;
- static  String       *f_shadow_stubs = 0;
- 
- static  String       *methods;
- static  String       *class_name;
-@@ -322,9 +321,8 @@
-       }
-       Delete(filen); filen = NULL;
- 
-       f_shadow = NewString("");
--      f_shadow_imports = NewString("");
-       f_shadow_stubs = NewString("");
- 
-       Swig_register_filebyname("shadow",f_shadow);
-       Swig_register_filebyname("python",f_shadow);
-@@ -343,8 +341,10 @@
-       if (mod_docstring && Len(mod_docstring)) {
-         Printv(f_shadow, "\n\"\"\"\n", mod_docstring, "\n\"\"\"\n", NIL);
-         Delete(mod_docstring); mod_docstring = NULL;
-       }
-+
-+      Printf(f_shadow,"\nimport %s\n\n", module);
-       
-       /* if (!modern) */
-       /* always needed, a class can be forced to be no-modern, such as an exception */
-       { 
-@@ -445,10 +445,8 @@
-     Printf(f_wrappers,"}\n");
-     Printf(f_wrappers,"#endif\n");
- 
-     if (shadow) {
--      Printf(f_shadow_imports,"\nimport %s\n", module);
--      Printv(f_shadow_py, f_shadow_imports, "\n",NIL);
-       Printv(f_shadow_py, f_shadow, "\n",NIL);
-       Printv(f_shadow_py, f_shadow_stubs, "\n",NIL);
- 
-       Close(f_shadow_py);
-@@ -507,12 +505,9 @@
-         }
- 
-         // finally, output the name of the imported module
- 	Printf(import, "%s\n", modname);
--
--	if (!Strstr(f_shadow_imports, import)) {
--	  Printf(f_shadow_imports, "%s", import);
--	}
-+	Printf(f_shadow, "%s", import);
- 	Delete(import);
-       }
-     }
-     return Language::importDirective(n);
-@@ -774,10 +769,15 @@
-         
-       // Do the param type too?
-       if (showTypes) {
-         type =  SwigType_base(type);
--	lookup = Swig_symbol_clookup(type, 0);
--	if (lookup) type = Getattr(lookup, "sym:name");
-+        SwigType* qt = SwigType_typedef_resolve_all(type);
-+        if (SwigType_isenum(qt))
-+          type = NewString("int");
-+        else {
-+          lookup = Swig_symbol_clookup(type, 0);
-+          if (lookup) type = Getattr(lookup, "sym:name");
-+        }
-         Printf(doc, "%s ", type);
-       }
- 
-       if (name) {
-Index: Lib/python/pyinit.swg
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Lib/python/pyinit.swg,v
-retrieving revision 1.19
-diff -u -4 -r1.19 pyinit.swg
---- Lib/python/pyinit.swg	17 Jun 2005 19:12:20 -0000	1.19
-+++ Lib/python/pyinit.swg	28 Jun 2006 22:22:01 -0000
-@@ -214,13 +214,13 @@
- 		       swig_type_info **types,
- 		       swig_type_info **types_initial) {
-   size_t i;
-   for (i = 0; methods[i].ml_name; ++i) {
--    char *c = methods[i].ml_doc;
-+    const char *c = methods[i].ml_doc;
-     if (c && (c = strstr(c, "swig_ptr: "))) {
-       int j;
-       swig_const_info *ci = 0;
--      char *name = c + 10;
-+      const char *name = c + 10;
-       for (j = 0; const_table[j].type; ++j) {
- 	if (strncmp(const_table[j].name, name, 
- 		    strlen(const_table[j].name)) == 0) {
- 	  ci = &(const_table[j]);
-Index: Lib/python/pyrun.swg
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Lib/python/pyrun.swg,v
-retrieving revision 1.73
-diff -u -4 -r1.73 pyrun.swg
---- Lib/python/pyrun.swg	23 Aug 2005 10:55:05 -0000	1.73
-+++ Lib/python/pyrun.swg	28 Jun 2006 22:22:01 -0000
-@@ -635,9 +635,9 @@
-   if (pyobj && !obj) {    
-     obj = pyobj;
-     if (PyCFunction_Check(obj)) {
-       /* here we get the method pointer for callbacks */
--      char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-+      const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-       c = doc ? strstr(doc, "swig_ptr: ") : 0;
-       if (c) {
- 	c = ty ? SWIG_UnpackVoidPtr(c + 10, &vptr, ty->name) : 0;
- 	if (!c) goto type_error;

wxPython/SWIG/swig-1.3.29.patch

@@ -1,254 +0,0 @@
-Index: Makefile.in
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Makefile.in,v
-retrieving revision 1.103
-diff -u -4 -r1.103 Makefile.in
---- Makefile.in	10 Mar 2006 22:54:02 -0000	1.103
-+++ Makefile.in	5 Jul 2006 00:50:18 -0000
-@@ -21,9 +21,9 @@
- 
- source:
- 	@cd $(SOURCE) && $(MAKE)
- 
--libfiles: Lib/swigwarn.swg
-+libfiles: $(srcdir)/Lib/swigwarn.swg
- 
- .PHONY: source libfiles
- 
- #####################################################################
-@@ -339,9 +339,9 @@
- #####################################################################
- # Update the Lib/swigwarn.swg file
- #####################################################################
- 
--Lib/swigwarn.swg: Source/Include/swigwarn.h
-+$(srcdir)/Lib/swigwarn.swg: $(srcdir)/Source/Include/swigwarn.h
- 	echo "/* Automatically generated file containing all the swig warning codes.  */" > $@
- 	echo "/* Do not modify this file by hand, change 'Source/Include/swigwarn.h'  */" >> $@
- 	echo  "/* and use the command 'make Lib/swigwarn.swg' instead.                 */" >> $@
- 	echo >> $@; echo >> $@
-Index: Lib/typemaps/exception.swg
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Lib/typemaps/exception.swg,v
-retrieving revision 1.8
-diff -u -4 -r1.8 exception.swg
---- Lib/typemaps/exception.swg	7 Mar 2006 00:14:10 -0000	1.8
-+++ Lib/typemaps/exception.swg	5 Jul 2006 00:50:18 -0000
-@@ -12,9 +12,9 @@
- 
- /* macros for error manipulation */
- #define %nullref_fmt()                     "invalid null reference "		   
- #define %varfail_fmt(_type,_name)          "in variable '"`_name`"' of type '"`_type`"'"
--#define %argfail_fmt(_type,_name,_argn)    "in method '" `_name` "', argument " `_argn`" of type '" `_type`"'"
-+#define %argfail_fmt(_type,_name,_argn)    "in method '" `_name` "', expected argument " `_argn`" of type '" `_type`"'"
- #define %outfail_fmt(_type)                "in output value of type '"_type"'"	   
- #define %argnullref_fmt(_type,_name,_argn) %nullref_fmt() %argfail_fmt(_type, _name, _argn)  
- #define %varnullref_fmt(_type,_name)       %nullref_fmt() %varfail_fmt(_type, _name)  		   
- #define %outnullref_fmt(_type)             %nullref_fmt() %outfail_fmt(_type)         
-Index: Source/Modules/python.cxx
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Source/Modules/python.cxx,v
-retrieving revision 1.203
-diff -u -4 -r1.203 python.cxx
---- Source/Modules/python.cxx	16 Mar 2006 01:46:50 -0000	1.203
-+++ Source/Modules/python.cxx	5 Jul 2006 00:50:19 -0000
-@@ -39,9 +39,8 @@
- static  File         *f_directors_h = 0;
- static  File         *f_init = 0;
- static  File         *f_shadow_py = 0;
- static  String       *f_shadow = 0;
--static  String       *f_shadow_imports = 0;
- static  String       *f_shadow_stubs = 0;
- 
- static  String       *methods;
- static  String       *class_name;
-@@ -669,9 +668,8 @@
-       }
-       Delete(filen); filen = NULL;
- 
-       f_shadow = NewString("");
--      f_shadow_imports = NewString("");
-       f_shadow_stubs = NewString("");
- 
-       Swig_register_filebyname("shadow",f_shadow);
-       Swig_register_filebyname("python",f_shadow);
-@@ -817,12 +815,8 @@
-     Printf(f_wrappers,"}\n");
-     Printf(f_wrappers,"#endif\n");
- 
-     if (shadow) {
--      /*
--      Printf(f_shadow_imports,"\nimport %s\n", module);
--      Printv(f_shadow_py, f_shadow_imports, "\n",NIL);
--      */
-       Printv(f_shadow_py, f_shadow, "\n",NIL);
-       Printv(f_shadow_py, f_shadow_stubs, "\n",NIL);
- 
-       Close(f_shadow_py);
-@@ -882,14 +876,11 @@
-         }
- 
-         // finally, output the name of the imported module
- 	if (shadowimport) {
--	  if (!options || (!Getattr(options, "noshadow") && !Getattr(options, "noproxy"))) {	    
--	    Printf(import, "_%s\n", modname);
--	    if (!Strstr(f_shadow_imports, import)) {
--	      Printf(f_shadow, "import %s\n", modname);
--	      Printv(f_shadow_imports, import, NULL);
--	    }
-+	  if (!options || (!Getattr(options, "noshadow") && !Getattr(options, "noproxy"))) {
-+            Printf(import, "%s\n", modname);
-+            Printf(f_shadow, "%s", import);
- 	  }
- 	}
- 	
- 	Delete(import);
-@@ -1154,10 +1145,15 @@
-         
-       // Do the param type too?
-       if (showTypes) {
-         type =  SwigType_base(type);
--	lookup = Swig_symbol_clookup(type, 0);
--	if (lookup) type = Getattr(lookup, "sym:name");
-+        SwigType* qt = SwigType_typedef_resolve_all(type);
-+        if (SwigType_isenum(qt))
-+          type = NewString("int");
-+        else {
-+          lookup = Swig_symbol_clookup(type, 0);
-+          if (lookup) type = Getattr(lookup, "sym:name");
-+        }
-         Printf(doc, "%s ", type);
-       }
- 
-       if (name) {
-@@ -2793,10 +2789,10 @@
- 	  Printf(f_shadow_file,"%s.%s = new_instancemethod(%s.%s,None,%s)\n", 
- 		 class_name, symname, module, Swig_name_member(class_name,symname), class_name);
- 	}
-       }
--      Printf(f_shadow_file,"%s_swigregister = %s.%s_swigregister\n", class_name, module, class_name);
--      Printf(f_shadow_file,"%s_swigregister(%s)\n", class_name, class_name,0);
-+
-+      Printf(f_shadow_file,"%s.%s_swigregister(%s)\n", module, class_name, class_name);
-       
-       shadow_indent = 0;
-       Printf(f_shadow_file,"%s\n", f_shadow_stubs);
-       Clear(f_shadow_stubs);
-Index: Source/Swig/misc.c
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Source/Swig/misc.c,v
-retrieving revision 1.57
-diff -u -4 -r1.57 misc.c
---- Source/Swig/misc.c	6 Mar 2006 22:51:00 -0000	1.57
-+++ Source/Swig/misc.c	5 Jul 2006 00:50:19 -0000
-@@ -899,8 +899,26 @@
- }
- #endif
- 
- 
-+
-+/* -----------------------------------------------------------------------------
-+ * Swig_string_wxpy()
-+ *
-+ * Drop a leading 'wx' for all wxNames, except for wxEVT*
-+ * ----------------------------------------------------------------------------- */
-+String *Swig_string_wxpy(String *s) {
-+  String* ns = NewStringEmpty();
-+  char* cptr = Char(s);
-+  if (cptr[0] == 'w' && cptr[1] == 'x') {
-+    if ( ! (cptr[2] == 'E' && cptr[3] == 'V' && cptr[4] == 'T')) {
-+      ns = NewString(&cptr[2]);
-+    }
-+  }
-+  return ns;
-+}
-+
-+
- /* -----------------------------------------------------------------------------
-  * Swig_init()
-  *
-  * Initialize the SWIG core
-@@ -928,8 +946,11 @@
-   DohEncoding("undercase", Swig_string_ucase);
-   DohEncoding("firstuppercase", Swig_string_first_upper);
-   DohEncoding("firstlowercase", Swig_string_first_lower);
- 
-+  /* wxPython's rename encoder */
-+  DohEncoding("wxpy", Swig_string_wxpy);
-+
-   /* Initialize the swig keys */
-   Swig_keys_init();
- 
-   /* Initialize typemaps */
-Index: Lib/python/pyinit.swg
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Lib/python/pyinit.swg,v
-retrieving revision 1.32
-diff -u -4 -r1.32 pyinit.swg
---- Lib/python/pyinit.swg	2 Feb 2006 23:48:56 -0000	1.32
-+++ Lib/python/pyinit.swg	5 Jul 2006 00:50:19 -0000
-@@ -225,13 +225,13 @@
- 		       swig_type_info **types,
- 		       swig_type_info **types_initial) {
-   size_t i;
-   for (i = 0; methods[i].ml_name; ++i) {
--    char *c = methods[i].ml_doc;
-+    const char *c = methods[i].ml_doc;
-     if (c && (c = strstr(c, "swig_ptr: "))) {
-       int j;
-       swig_const_info *ci = 0;
--      char *name = c + 10;
-+      const char *name = c + 10;
-       for (j = 0; const_table[j].type; ++j) {
- 	if (strncmp(const_table[j].name, name, 
- 		    strlen(const_table[j].name)) == 0) {
- 	  ci = &(const_table[j]);
-Index: Lib/python/pyrun.swg
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Lib/python/pyrun.swg,v
-retrieving revision 1.141
-diff -u -4 -r1.141 pyrun.swg
---- Lib/python/pyrun.swg	7 Mar 2006 00:35:17 -0000	1.141
-+++ Lib/python/pyrun.swg	5 Jul 2006 00:50:19 -0000
-@@ -11,8 +11,12 @@
-  * ----------------------------------------------------------------------------- */
- 
- /* Common SWIG API */
- 
-+#if PY_VERSION_HEX < 0x02050000
-+typedef int Py_ssize_t;
-+#endif
-+
- /* for raw pointers */
- #define SWIG_Python_ConvertPtr(obj, pptr, type, flags)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
- #define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Python_ConvertPtr(obj, pptr, type, flags)
- #define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, own)
-@@ -1074,9 +1078,9 @@
-   } else {
-     void *vptr = 0;
-     
-     /* here we get the method pointer for callbacks */
--    char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-+    const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
-     const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
-     if (desc) {
-       desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
-       if (!desc) return SWIG_ERROR;
-Index: Lib/python/pystrings.swg
-===================================================================
-RCS file: /cvsroot/swig/SWIG/Lib/python/pystrings.swg,v
-retrieving revision 1.27
-diff -u -4 -r1.27 pystrings.swg
---- Lib/python/pystrings.swg	23 Feb 2006 21:43:33 -0000	1.27
-+++ Lib/python/pystrings.swg	5 Jul 2006 00:50:19 -0000
-@@ -5,9 +5,9 @@
- SWIGINTERN int
- SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
- {
-   if (PyString_Check(obj)) {
--    char *cstr; int len;
-+    char *cstr; Py_ssize_t len;
-     PyString_AsStringAndSize(obj, &cstr, &len);
-     if (cptr)  {
-       if (alloc) {
- 	/* 

wxPython/b

@@ -1,163 +0,0 @@
-#!/bin/bash
-
-# Are we using bash on win32?  If so source that file and then exit.
-if [ "$OSTYPE" = "cygwin" ]; then
-    source b.win32
-    exit
-fi
-
-# make it easy to switch versions of SWIG
-if [ "$SWIG" = "" ]; then
-  SWIG=/opt/swig/bin/swig-1.3.29
-fi
-
-
-function getpyver {
-    if [ "$1" = "15" ]; then
-	PYVER=1.5
-    elif [ "$1" = "20" ]; then
-	PYVER=2.0
-    elif [ "$1" = "21" ]; then
-	PYVER=2.1
-    elif [ "$1" = "22" ]; then
-	PYVER=2.2
-    elif [ "$1" = "23" ]; then
-	PYVER=2.3
-    elif [ "$1" = "24" ]; then
-	PYVER=2.4
-    elif [ "$1" = "25" ]; then
-	PYVER=2.5
-    else
-	echo You must specify Python version as first parameter.
-        exit
-    fi
-}
-
-getpyver $1
-shift
-
-python$PYVER -c "import sys;print '\n', sys.version, '\n'"
-
-
-SETUP="python$PYVER -u setup.py"
-FLAGS="USE_SWIG=1 SWIG=$SWIG" 
-OTHERFLAGS=""
-PORTFLAGS=""
-UNIFLAG="UNICODE=1"
-
-
-
-if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then 
-    PORTFLAGS="WXPORT=gtk"
-    UNIFLAG="UNICODE=0"
-    shift
-elif [ "$1" = "gtk2" ]; then 
-    PORTFLAGS="WXPORT=gtk2"
-    UNIFLAG="UNICODE=1"
-    shift
-fi
-
-for p in $*; do
-    if [ "$p" = "UNICODE=0" -o "$p" = "UNICODE=1" ]; then
-	UNIFLAG=""
-	break
-    fi
-done
-
-FLAGS="$FLAGS $PORTFLAGS $UNIFLAG"
-
-
-
-# "c" --> clean
-if [ "$1" =  "c" ]; then
-    shift
-    CMD="$SETUP $FLAGS $OTHERFLAGS clean $*"
-    OTHERCMD="rm -f wx/*.so"
-
-# "d" --> clean extension modules only
-elif [ "$1" = "d" ]; then
-    shift
-    CMD="rm -f wx/*.so"
-
-# "t" --> touch *.i files
-elif [ "$1" = "t" ]; then
-    shift
-    CMD='find . -name "*.i" | xargs touch'
-
-# "i" --> install
-elif [ "$1" = "i" ]; then
-    shift
-    CMD="$SETUP $FLAGS $OTHERFLAGS build_ext install $*"
-
-# "s" --> source dist
-elif [ "$1" = "s" ]; then
-    shift
-    CMD="$SETUP $OTHERFLAGS sdist $*"
-
-# "r" --> rpm dist
-elif [ "$1" = "r" ]; then
-    WXPYVER=`python$PYVER -c "import setup;print setup.VERSION"`
-    for VER in 21 22; do
-	getpyver $VER
-
-	echo "*****************************************************************"
-	echo "*******      Building wxPython for Python $PYVER"
-	echo "*****************************************************************"
-
-	SETUP="python$PYVER -u setup.py"
-
-	# save the original
-	cp setup.py setup.py.save
-
-	# fix up setup.py the way we want...
-	sed "s/BUILD_GLCANVAS = /BUILD_GLCANVAS = 0 #/" < setup.py.save > setup.py.temp
-	sed "s/GL_ONLY = /GL_ONLY = 1 #/" < setup.py.temp > setup.py
-
-	# build wxPython-gl RPM
-	$SETUP $OTHERFLAGS bdist_rpm --binary-only --doc-files README.txt --python=python$PYVER
-			### --requires=python$PYVER
-	rm dist/wxPython-gl*.tar.gz
-
-	# Build wxPython RPM
-	cp setup.py setup.py.temp
-	sed "s/GL_ONLY = /GL_ONLY = 0 #/" < setup.py.temp > setup.py
-	$SETUP $OTHERFLAGS bdist_rpm --binary-only --python=python$PYVER
-			### --requires=python$PYVER
-
-	# put the oringal setup.py back
-	cp setup.py.save setup.py
-	rm setup.py.*
-
-	# rename the binary RPM's
-	mv dist/wxPython-$WXPYVER-1.i386.rpm dist/wxPython-$WXPYVER-1-Py$VER.i386.rpm
-	mv dist/wxPython-gl-$WXPYVER-1.i386.rpm dist/wxPython-gl-$WXPYVER-1-Py$VER.i386.rpm
-
-    done
-
-    # rebuild the source dists without the munched up setup.py
-    $SETUP $OTHERFLAGS bdist_rpm --source-only
-    exit 0
-
-
-# "f" --> FINAL (no debug)
-elif [ "$1" = "f" ]; then
-    shift
-    CMD="$SETUP $FLAGS $OTHERFLAGS build_ext --inplace $*"
-
-# (no command arg) --> normal build for development
-else
-    CMD="$SETUP $FLAGS $OTHERFLAGS build_ext --inplace --debug $*"
-fi
-
-
-echo $CMD
-eval $CMD
-RC=$?
-
-if [ "$RC" = "0" -a  "$OTHERCMD" != "" ]; then
-    echo $OTHERCMD
-    $OTHERCMD
-    RC=$?
-fi
-
-exit $RC

wxPython/b.bat

@@ -1,3 +0,0 @@
-@echo off
-
-call bash.bat -c "b.win32 %*"

wxPython/b.win32

@@ -1,128 +0,0 @@
-#!/bin/bash
-# ----------------------------------------------------------------------
-
-if [ "$SWIGDIR" = "" ]; then
-  SWIGDIR=$PROJECTS\\SWIG-1.3.29
-fi
-
-
-#  Use non-default python?
-case $1 in
-    21 | 2.1) VER=21; shift ;;
-    22 | 2.2) VER=22; shift ;;
-    23 | 2.3) VER=23; shift ;;
-    24 | 2.4) VER=24; shift ;;
-    25 | 2.5) VER=25; shift ;;
-
-    *) 	VER=24
-esac
-
-PYTHON=$TOOLS/python$VER/python.exe
-
-SETUP="$PYTHON -u setup.py"
-$PYTHON -c "import sys;print '\n', sys.version, '\n'"
-
-
-FLAGS="USE_SWIG=1 SWIG=$SWIGDIR\\swig.exe"
-UNIFLAG="UNICODE=1"
-
-for p in $*; do
-    if [ "$p" = "UNICODE=0" -o "$p" = "UNICODE=1" ]; then
-	UNIFLAG=""
-	break
-    fi
-done
-
-FLAGS="$FLAGS $UNIFLAG"
-
-
-
-
-
-
-# "c" --> clean
-if [ "$1" = "c" ]; then
-    shift
-    CMD="$SETUP $FLAGS clean $@"
-    OTHERCMD="rm wx/*.pyd"
-
-# just remove the *.pyd's
-elif [ "$1" = "d" ]; then
-    shift
-    CMD="rm wx/*.pyd"
-
-# touch all the *.i files so swig will regenerate
-elif [ "$1" = "t" ]; then
-    shift
-    CMD=
-    find . -name "*.i" | xargs -l touch
-
-# "i" --> install
-elif [ "$1" = "i" ]; then
-    shift
-    CMD="$SETUP build install"
-
-# "r" --> make installer
-elif [ "$1" = "r" ]; then
-    shift
-    CMD="$PYTHON -u distrib\make_installer.py $@"
-
-# "s" --> source dist
-elif [ "$1" = "s" ]; then
-    shift
-    CMD="$SETUP sdist"
-
-# "f" --> FINAL
-elif [ "$1" == "f" ]; then
-    shift
-    CMD="$SETUP $FLAGS FINAL=1 build_ext --inplace $@"
-
-# "h" --> HYBRID
-elif [ "$1" = "h" ]; then
-    shift
-    CMD="$SETUP $FLAGS HYBRID=1 build_ext --inplace $@"
-
-# "a" --> make all installers
-elif [ "$1" = "a" ]; then
-    shift
-    CMD=
-
-    $0 23 d UNICODE=0
-    $0 23 h UNICODE=0
-    $0 23 r UNICODE=0
-    $0 23 d UNICODE=1
-    $0 23 h UNICODE=1
-    $0 23 r UNICODE=1
-
-    $0 24 d UNICODE=0
-    $0 24 h UNICODE=0
-    $0 24 r UNICODE=0
-    $0 24 d UNICODE=1
-    $0 24 h UNICODE=1
-    $0 24 r UNICODE=1
-
-
-# "b" --> both debug and hybrid builds
-elif [ "$1" = "b" ]; then
-    shift
-    CMD="echo Finished!"
-    $0 $VER   $@
-    $0 $VER h $@
-
-# (no command arg) --> normal debug build for development
-else
-    CMD="$SETUP $FLAGS HYBRID=0 build_ext --inplace --debug $@"
-fi
-
-
-
-if [ "$CMD" != "" ]; then
-    echo $CMD
-    $CMD
-fi
-
-if [ "$OTHERCMD" != "" ]; then
-    echo $OTHERCMD
-    $OTHERCMD
-fi
-

wxPython/contrib/.cvsignore

@@ -1 +0,0 @@
-update.log

wxPython/contrib/README

@@ -1,3 +0,0 @@
-These sub directories contain add-on modules that are not part of the
-core wxPython, either because of licensing issues, optional code in
-wxWindows, contrib code in wxWindows, or whatever.

wxPython/contrib/activex/_activex_ex.py

@@ -1,211 +0,0 @@
-
-
-#---------------------------------------------------------------------------
-# Some helper and utility functions for ActiveX
-
-
-t4 = " " * 4
-t8 = " " * 8
-
-def GetAXInfo(ax):
-    """
-    Returns a printable summary of the TypeInfo from the ActiveX instance
-    passed in.
-    """
-
-    def ProcessFuncX(f, out, name):
-        out.append(name)
-        out.append(t4 + "retType:  %s" % f.retType.vt_type)
-        if f.params:
-            out.append(t4 + "params:")
-            for p in f.params:
-                out.append(t8 + p.name)
-                out.append(t8+t4+ "in:%s  out:%s  optional:%s  type:%s" % (p.isIn, p.isOut, p.isOptional, p.vt_type))
-        out.append('')
-
-    def ProcessPropX(p, out):
-        out.append(GernerateAXModule.trimPropName(p.name))
-        out.append(t4+ "type:%s  arg:%s  canGet:%s  canSet:%s" % (p.type.vt_type, p.arg.vt_type, p.canGet, p.canSet))
-        out.append('')
-
-    out = []
-
-    out.append("PROPERTIES")
-    out.append("-"*20)
-    for p in ax.GetAXProperties():
-        ProcessPropX(p, out)
-    out.append('\n\n')
-
-    out.append("METHODS")
-    out.append("-"*20)
-    for m in ax.GetAXMethods():
-        ProcessFuncX(m, out, GernerateAXModule.trimMethodName(m.name))
-    out.append('\n\n')
-
-    out.append("EVENTS")
-    out.append("-"*20)
-    for e in ax.GetAXEvents():
-        ProcessFuncX(e, out, GernerateAXModule.trimEventName(e.name))
-    out.append('\n\n')
-
-    return "\n".join(out)
-
-
-
-class GernerateAXModule:
-    def __init__(self, ax, className, modulePath, moduleName=None, verbose=False):
-        """
-        Make a Python module file with a class that has been specialized
-        for the AcitveX object.
-
-            ax           An instance of the ActiveXWindow class
-            className    The name to use for the new class
-            modulePath   The path where the new module should be written to
-            moduleName   The name of the .py file to create.  If not given
-                         then the className will be used.
-        """
-        import os
-        if moduleName is None:
-            moduleName = className + '.py'
-        filename = os.path.join(modulePath, moduleName)
-        if verbose:
-            print "Creating module in:", filename
-            print "  ProgID:  ", ax.GetCLSID().GetProgIDString()
-            print "  CLSID:   ", ax.GetCLSID().GetCLSIDString()
-            print
-        self.mf = file(filename, "w")
-        self.WriteFileHeader(ax)
-        self.WriteEvents(ax)
-        self.WriteClassHeader(ax, className)
-        self.WriteMethods(ax)
-        self.WriteProperties(ax)
-        self.WriteDocs(ax)
-        self.mf.close()
-        del self.mf
-
-
-    def WriteFileHeader(self, ax):
-        self.write("# This module was generated by the wx.activex.GernerateAXModule class\n"
-                   "# (See also the genaxmodule script.)\n")
-        self.write("import wx")
-        self.write("import wx.activex\n")
-        self.write("clsID = '%s'\nprogID = '%s'\n"
-                   % (ax.GetCLSID().GetCLSIDString(), ax.GetCLSID().GetProgIDString()))
-        self.write("\n")
-
-
-    def WriteEvents(self, ax):
-        events = ax.GetAXEvents()
-        if events:
-            self.write("# Create eventTypes and event binders")
-            for e in events:
-                self.write("wxEVT_%s = wx.activex.RegisterActiveXEvent('%s')"
-                           % (self.trimEventName(e.name), e.name))
-            self.write()
-            for e in events:
-                n = self.trimEventName(e.name)
-                self.write("EVT_%s = wx.PyEventBinder(wxEVT_%s, 1)" % (n,n))
-            self.write("\n")
-
-
-    def WriteClassHeader(self, ax, className):
-        self.write("# Derive a new class from ActiveXWindow")
-        self.write("""\
-class %s(wx.activex.ActiveXWindow):
-    def __init__(self, parent, ID=-1, pos=wx.DefaultPosition,
-                 size=wx.DefaultSize, style=0, name='%s'):
-        wx.activex.ActiveXWindow.__init__(self, parent,
-            wx.activex.CLSID('%s'),
-            ID, pos, size, style, name)
-        """ % (className, className, ax.GetCLSID().GetCLSIDString()) )
-
-
-    def WriteMethods(self, ax):
-        methods = ax.GetAXMethods()
-        if methods:
-            self.write(t4, "# Methods exported by the ActiveX object")
-            for m in methods:
-                name = self.trimMethodName(m.name)
-                self.write(t4, "def %s(self%s):" % (name, self.getParameters(m, True)))
-                self.write(t8, "return self.CallAXMethod('%s'%s)" % (m.name, self.getParameters(m, False)))
-                self.write()
-            
-
-    def WriteProperties(self, ax):
-        props = ax.GetAXProperties()
-        if props:
-            self.write(t4, "# Getters, Setters and properties")
-            for p in props:
-                getterName = setterName = "None"
-                if p.canGet:
-                    getterName = "_get_" + p.name
-                    self.write(t4, "def %s(self):" % getterName)
-                    self.write(t8, "return self.GetAXProp('%s')" % p.name)
-                if p.canSet:
-                    setterName = "_set_" + p.name
-                    self.write(t4, "def %s(self, %s):" % (setterName, p.arg.name))
-                    self.write(t8, "self.SetAXProp('%s', %s)" % (p.name, p.arg.name))
-
-                self.write(t4, "%s = property(%s, %s)" %
-                           (self.trimPropName(p.name), getterName, setterName))
-                self.write()
-                
-
-    def WriteDocs(self, ax):
-        self.write()
-        doc = GetAXInfo(ax)
-        for line in doc.split('\n'):
-            self.write("#  ", line)
-            
-
-
-    def write(self, *args):
-        for a in args:
-            self.mf.write(a)
-        self.mf.write("\n")
-
-
-    def trimEventName(name):
-        if name.startswith("On"):
-            name = name[2:]
-        return name
-    trimEventName = staticmethod(trimEventName)
-
-
-    def trimPropName(name):
-        #name = name[0].lower() + name[1:]
-        name = name.lower()
-        import keyword
-        if name in keyword.kwlist: name += '_'
-        return name
-    trimPropName = staticmethod(trimPropName)
-
-
-    def trimMethodName(name):
-        import keyword
-        if name in keyword.kwlist: name += '_'
-        return name
-    trimMethodName = staticmethod(trimMethodName)
-    
-
-    def getParameters(self, m, withDefaults):
-        import keyword
-        st = ""
-        # collect the input parameters, if both isIn and isOut are
-        # False then assume it is an input paramater
-        params = []
-        for p in m.params:
-            if p.isIn or (not p.isIn and not p.isOut):
-                params.append(p)
-        # did we get any?
-        for p in params:
-            name = p.name
-            if name in keyword.kwlist: name += '_'
-            st += ", "
-            st += name
-            if withDefaults and p.isOptional:
-                st += '=None'
-        return st
-
-
-#---------------------------------------------------------------------------

wxPython/contrib/activex/activex.py

@@ -1,604 +0,0 @@
-# This file was created automatically by SWIG 1.3.29.
-# Don't modify this file, modify the SWIG interface instead.
-
-import _activex
-import new
-new_instancemethod = new.instancemethod
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'PySwigObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static) or hasattr(self,name):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError,name
-
-def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
-import types
-try:
-    _object = types.ObjectType
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
-del types
-
-
-def _swig_setattr_nondynamic_method(set):
-    def set_attr(self,name,value):
-        if (name == "thisown"): return self.this.own(value)
-        if hasattr(self,name) or (name == "this"):
-            set(self,name,value)
-        else:
-            raise AttributeError("You cannot add attributes to %s" % self)
-    return set_attr
-
-
-import _core
-wx = _core 
-__docfilter__ = wx.__DocFilter(globals()) 
-#---------------------------------------------------------------------------
-
-class CLSID(object):
-    """
-    This class wraps the Windows CLSID structure and is used to
-    specify the class of the ActiveX object that is to be created.  A
-    CLSID can be constructed from either a ProgID string, (such as
-    'WordPad.Document.1') or a classID string, (such as
-    '{CA8A9783-280D-11CF-A24D-444553540000}').
-    """
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """
-        __init__(self, String id) -> CLSID
-
-        This class wraps the Windows CLSID structure and is used to
-        specify the class of the ActiveX object that is to be created.  A
-        CLSID can be constructed from either a ProgID string, (such as
-        'WordPad.Document.1') or a classID string, (such as
-        '{CA8A9783-280D-11CF-A24D-444553540000}').
-        """
-        _activex.CLSID_swiginit(self,_activex.new_CLSID(*args, **kwargs))
-    __swig_destroy__ = _activex.delete_CLSID
-    __del__ = lambda self : None;
-    def GetCLSIDString(*args, **kwargs):
-        """GetCLSIDString(self) -> String"""
-        return _activex.CLSID_GetCLSIDString(*args, **kwargs)
-
-    def GetProgIDString(*args, **kwargs):
-        """GetProgIDString(self) -> String"""
-        return _activex.CLSID_GetProgIDString(*args, **kwargs)
-
-    def __str__(self):   return self.GetCLSIDString() 
-_activex.CLSID_swigregister(CLSID)
-
-#---------------------------------------------------------------------------
-
-class ParamX(object):
-    """Proxy of C++ ParamX class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    flags = property(_activex.ParamX_flags_get)
-    isPtr = property(_activex.ParamX_isPtr_get)
-    isSafeArray = property(_activex.ParamX_isSafeArray_get)
-    isOptional = property(_activex.ParamX_isOptional_get)
-    vt = property(_activex.ParamX_vt_get)
-    name = property(_activex.ParamX_name_get)
-    vt_type = property(_activex.ParamX_vt_type_get)
-
-    isIn = property(_activex.ParamX_IsIn)
-
-    isOut = property(_activex.ParamX_IsOut)
-
-    isRetVal = property(_activex.ParamX_IsRetVal)
-
-_activex.ParamX_swigregister(ParamX)
-
-class FuncX(object):
-    """Proxy of C++ FuncX class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    name = property(_activex.FuncX_name_get)
-    memid = property(_activex.FuncX_memid_get)
-    hasOut = property(_activex.FuncX_hasOut_get)
-    retType = property(_activex.FuncX_retType_get)
-    params = property(_activex.FuncX_params_get)
-_activex.FuncX_swigregister(FuncX)
-
-class PropX(object):
-    """Proxy of C++ PropX class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    name = property(_activex.PropX_name_get)
-    memid = property(_activex.PropX_memid_get)
-    type = property(_activex.PropX_type_get)
-    arg = property(_activex.PropX_arg_get)
-    putByRef = property(_activex.PropX_putByRef_get)
-    canGet = property(_activex.PropX_CanGet)
-
-    canSet = property(_activex.PropX_CanSet)
-
-_activex.PropX_swigregister(PropX)
-
-class ParamXArray(object):
-    """Proxy of C++ ParamXArray class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    def __nonzero__(*args, **kwargs):
-        """__nonzero__(self) -> bool"""
-        return _activex.ParamXArray___nonzero__(*args, **kwargs)
-
-    def __len__(*args, **kwargs):
-        """__len__(self) -> int"""
-        return _activex.ParamXArray___len__(*args, **kwargs)
-
-    def __getitem__(*args, **kwargs):
-        """__getitem__(self, int idx) -> ParamX"""
-        return _activex.ParamXArray___getitem__(*args, **kwargs)
-
-_activex.ParamXArray_swigregister(ParamXArray)
-
-class FuncXArray(object):
-    """Proxy of C++ FuncXArray class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    def __nonzero__(*args, **kwargs):
-        """__nonzero__(self) -> bool"""
-        return _activex.FuncXArray___nonzero__(*args, **kwargs)
-
-    def __len__(*args, **kwargs):
-        """__len__(self) -> int"""
-        return _activex.FuncXArray___len__(*args, **kwargs)
-
-    def __getitem__(*args, **kwargs):
-        """__getitem__(self, int idx) -> FuncX"""
-        return _activex.FuncXArray___getitem__(*args, **kwargs)
-
-_activex.FuncXArray_swigregister(FuncXArray)
-
-class PropXArray(object):
-    """Proxy of C++ PropXArray class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    def __nonzero__(*args, **kwargs):
-        """__nonzero__(self) -> bool"""
-        return _activex.PropXArray___nonzero__(*args, **kwargs)
-
-    def __len__(*args, **kwargs):
-        """__len__(self) -> int"""
-        return _activex.PropXArray___len__(*args, **kwargs)
-
-    def __getitem__(*args, **kwargs):
-        """__getitem__(self, int idx) -> PropX"""
-        return _activex.PropXArray___getitem__(*args, **kwargs)
-
-_activex.PropXArray_swigregister(PropXArray)
-
-#---------------------------------------------------------------------------
-
-class ActiveXWindow(_core.Window):
-    """
-    ActiveXWindow derives from wxWindow and the constructor accepts a
-    CLSID for the ActiveX Control that should be created.  The
-    ActiveXWindow class simply adds methods that allow you to query
-    some of the TypeInfo exposed by the ActiveX object, and also to
-    get/set properties or call methods by name.  The Python
-    implementation automatically handles converting parameters and
-    return values to/from the types expected by the ActiveX code as
-    specified by the TypeInfo.
-
-    """
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """
-        __init__(self, Window parent, CLSID clsId, int id=-1, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=0, 
-            String name=PanelNameStr) -> ActiveXWindow
-
-        Creates an ActiveX control from the clsID given and makes it act
-        as much like a regular wx.Window as possible.
-        """
-        _activex.ActiveXWindow_swiginit(self,_activex.new_ActiveXWindow(*args, **kwargs))
-        self._setOORInfo(self)
-
-    def GetCLSID(*args, **kwargs):
-        """
-        GetCLSID(self) -> CLSID
-
-        Return the CLSID used to construct this ActiveX window
-        """
-        return _activex.ActiveXWindow_GetCLSID(*args, **kwargs)
-
-    def GetAXEventCount(*args, **kwargs):
-        """
-        GetAXEventCount(self) -> int
-
-        Number of events defined for this control
-        """
-        return _activex.ActiveXWindow_GetAXEventCount(*args, **kwargs)
-
-    def GetAXEventDesc(*args, **kwargs):
-        """
-        GetAXEventDesc(self, int idx) -> FuncX
-
-        Returns event description by index
-        """
-        return _activex.ActiveXWindow_GetAXEventDesc(*args, **kwargs)
-
-    def GetAXPropCount(*args, **kwargs):
-        """
-        GetAXPropCount(self) -> int
-
-        Number of properties defined for this control
-        """
-        return _activex.ActiveXWindow_GetAXPropCount(*args, **kwargs)
-
-    def GetAXPropDesc(*args):
-        """
-        GetAXPropDesc(self, int idx) -> PropX
-        GetAXPropDesc(self, String name) -> PropX
-        """
-        return _activex.ActiveXWindow_GetAXPropDesc(*args)
-
-    def GetAXMethodCount(*args, **kwargs):
-        """
-        GetAXMethodCount(self) -> int
-
-        Number of methods defined for this control
-        """
-        return _activex.ActiveXWindow_GetAXMethodCount(*args, **kwargs)
-
-    def GetAXMethodDesc(*args):
-        """
-        GetAXMethodDesc(self, int idx) -> FuncX
-        GetAXMethodDesc(self, String name) -> FuncX
-        """
-        return _activex.ActiveXWindow_GetAXMethodDesc(*args)
-
-    def GetAXEvents(*args, **kwargs):
-        """
-        GetAXEvents(self) -> FuncXArray
-
-        Returns a sequence of FuncX objects describing the events
-        available for this ActiveX object.
-        """
-        return _activex.ActiveXWindow_GetAXEvents(*args, **kwargs)
-
-    def GetAXMethods(*args, **kwargs):
-        """
-        GetAXMethods(self) -> FuncXArray
-
-        Returns a sequence of FuncX objects describing the methods
-        available for this ActiveX object.
-        """
-        return _activex.ActiveXWindow_GetAXMethods(*args, **kwargs)
-
-    def GetAXProperties(*args, **kwargs):
-        """
-        GetAXProperties(self) -> PropXArray
-
-        Returns a sequence of PropX objects describing the properties
-        available for this ActiveX object.
-        """
-        return _activex.ActiveXWindow_GetAXProperties(*args, **kwargs)
-
-    def SetAXProp(*args, **kwargs):
-        """
-        SetAXProp(self, String name, PyObject value)
-
-        Set a property of the ActiveX object by name.
-        """
-        return _activex.ActiveXWindow_SetAXProp(*args, **kwargs)
-
-    def GetAXProp(*args, **kwargs):
-        """
-        GetAXProp(self, String name) -> PyObject
-
-        Get the value of an ActiveX property by name.
-        """
-        return _activex.ActiveXWindow_GetAXProp(*args, **kwargs)
-
-    def _CallAXMethod(*args):
-        """
-        _CallAXMethod(self, String name, PyObject args) -> PyObject
-
-        The implementation for CallMethod.  Calls an ActiveX method, by
-        name passing the parameters given in args.
-        """
-        return _activex.ActiveXWindow__CallAXMethod(*args)
-
-    def CallAXMethod(self, name, *args):
-        """
-        Front-end for _CallMethod.  Simply passes all positional args
-        after the name as a single tuple to _CallMethod.
-        """
-        return self._CallAXMethod(name, args)
-
-_activex.ActiveXWindow_swigregister(ActiveXWindow)
-
-#---------------------------------------------------------------------------
-
-
-def RegisterActiveXEvent(*args, **kwargs):
-  """
-    RegisterActiveXEvent(String eventName) -> EventType
-
-    Creates a standard wx event ID for the given eventName.
-    """
-  return _activex.RegisterActiveXEvent(*args, **kwargs)
-class ActiveXEvent(_core.CommandEvent):
-    """
-    An instance of ActiveXEvent is sent to the handler for all bound
-    ActiveX events.  Any event parameters from the ActiveX cntrol are
-    turned into attributes of the Python proxy for this event object.
-    Additionally, there is a property called eventName that will
-    return (surprisingly <wink>) the name of the ActiveX event.
-    """
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    def __init__(self): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    eventName = property(_activex.ActiveXEvent_EventName)
-
-    def _preCallInit(*args, **kwargs):
-        """_preCallInit(self, PyObject pyself)"""
-        return _activex.ActiveXEvent__preCallInit(*args, **kwargs)
-
-    def _postCallCleanup(*args, **kwargs):
-        """_postCallCleanup(self, PyObject pyself)"""
-        return _activex.ActiveXEvent__postCallCleanup(*args, **kwargs)
-
-_activex.ActiveXEvent_swigregister(ActiveXEvent)
-
-#---------------------------------------------------------------------------
-
-class IEHtmlWindowBase(ActiveXWindow):
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        _activex.IEHtmlWindowBase_swiginit(self,_activex.new_IEHtmlWindowBase(*args, **kwargs))
-        self._setOORInfo(self)
-
-    def SetCharset(*args, **kwargs): return _activex.IEHtmlWindowBase_SetCharset(*args, **kwargs)
-    def LoadString(*args, **kwargs): return _activex.IEHtmlWindowBase_LoadString(*args, **kwargs)
-    def LoadStream(*args, **kwargs): return _activex.IEHtmlWindowBase_LoadStream(*args, **kwargs)
-    def GetStringSelection(*args, **kwargs): return _activex.IEHtmlWindowBase_GetStringSelection(*args, **kwargs)
-    def GetText(*args, **kwargs): return _activex.IEHtmlWindowBase_GetText(*args, **kwargs)
-_activex.IEHtmlWindowBase_swigregister(IEHtmlWindowBase)
-
-#---------------------------------------------------------------------------
-# Some helper and utility functions for ActiveX
-
-
-t4 = " " * 4
-t8 = " " * 8
-
-def GetAXInfo(ax):
-    """
-    Returns a printable summary of the TypeInfo from the ActiveX instance
-    passed in.
-    """
-
-    def ProcessFuncX(f, out, name):
-        out.append(name)
-        out.append(t4 + "retType:  %s" % f.retType.vt_type)
-        if f.params:
-            out.append(t4 + "params:")
-            for p in f.params:
-                out.append(t8 + p.name)
-                out.append(t8+t4+ "in:%s  out:%s  optional:%s  type:%s" % (p.isIn, p.isOut, p.isOptional, p.vt_type))
-        out.append('')
-
-    def ProcessPropX(p, out):
-        out.append(GernerateAXModule.trimPropName(p.name))
-        out.append(t4+ "type:%s  arg:%s  canGet:%s  canSet:%s" % (p.type.vt_type, p.arg.vt_type, p.canGet, p.canSet))
-        out.append('')
-
-    out = []
-
-    out.append("PROPERTIES")
-    out.append("-"*20)
-    for p in ax.GetAXProperties():
-        ProcessPropX(p, out)
-    out.append('\n\n')
-
-    out.append("METHODS")
-    out.append("-"*20)
-    for m in ax.GetAXMethods():
-        ProcessFuncX(m, out, GernerateAXModule.trimMethodName(m.name))
-    out.append('\n\n')
-
-    out.append("EVENTS")
-    out.append("-"*20)
-    for e in ax.GetAXEvents():
-        ProcessFuncX(e, out, GernerateAXModule.trimEventName(e.name))
-    out.append('\n\n')
-
-    return "\n".join(out)
-
-
-
-class GernerateAXModule:
-    def __init__(self, ax, className, modulePath, moduleName=None, verbose=False):
-        """
-        Make a Python module file with a class that has been specialized
-        for the AcitveX object.
-
-            ax           An instance of the ActiveXWindow class
-            className    The name to use for the new class
-            modulePath   The path where the new module should be written to
-            moduleName   The name of the .py file to create.  If not given
-                         then the className will be used.
-        """
-        import os
-        if moduleName is None:
-            moduleName = className + '.py'
-        filename = os.path.join(modulePath, moduleName)
-        if verbose:
-            print "Creating module in:", filename
-            print "  ProgID:  ", ax.GetCLSID().GetProgIDString()
-            print "  CLSID:   ", ax.GetCLSID().GetCLSIDString()
-            print
-        self.mf = file(filename, "w")
-        self.WriteFileHeader(ax)
-        self.WriteEvents(ax)
-        self.WriteClassHeader(ax, className)
-        self.WriteMethods(ax)
-        self.WriteProperties(ax)
-        self.WriteDocs(ax)
-        self.mf.close()
-        del self.mf
-
-
-    def WriteFileHeader(self, ax):
-        self.write("# This module was generated by the wx.activex.GernerateAXModule class\n"
-                   "# (See also the genaxmodule script.)\n")
-        self.write("import wx")
-        self.write("import wx.activex\n")
-        self.write("clsID = '%s'\nprogID = '%s'\n"
-                   % (ax.GetCLSID().GetCLSIDString(), ax.GetCLSID().GetProgIDString()))
-        self.write("\n")
-
-
-    def WriteEvents(self, ax):
-        events = ax.GetAXEvents()
-        if events:
-            self.write("# Create eventTypes and event binders")
-            for e in events:
-                self.write("wxEVT_%s = wx.activex.RegisterActiveXEvent('%s')"
-                           % (self.trimEventName(e.name), e.name))
-            self.write()
-            for e in events:
-                n = self.trimEventName(e.name)
-                self.write("EVT_%s = wx.PyEventBinder(wxEVT_%s, 1)" % (n,n))
-            self.write("\n")
-
-
-    def WriteClassHeader(self, ax, className):
-        self.write("# Derive a new class from ActiveXWindow")
-        self.write("""\
-class %s(wx.activex.ActiveXWindow):
-    def __init__(self, parent, ID=-1, pos=wx.DefaultPosition,
-                 size=wx.DefaultSize, style=0, name='%s'):
-        wx.activex.ActiveXWindow.__init__(self, parent,
-            wx.activex.CLSID('%s'),
-            ID, pos, size, style, name)
-        """ % (className, className, ax.GetCLSID().GetCLSIDString()) )
-
-
-    def WriteMethods(self, ax):
-        methods = ax.GetAXMethods()
-        if methods:
-            self.write(t4, "# Methods exported by the ActiveX object")
-            for m in methods:
-                name = self.trimMethodName(m.name)
-                self.write(t4, "def %s(self%s):" % (name, self.getParameters(m, True)))
-                self.write(t8, "return self.CallAXMethod('%s'%s)" % (m.name, self.getParameters(m, False)))
-                self.write()
-            
-
-    def WriteProperties(self, ax):
-        props = ax.GetAXProperties()
-        if props:
-            self.write(t4, "# Getters, Setters and properties")
-            for p in props:
-                getterName = setterName = "None"
-                if p.canGet:
-                    getterName = "_get_" + p.name
-                    self.write(t4, "def %s(self):" % getterName)
-                    self.write(t8, "return self.GetAXProp('%s')" % p.name)
-                if p.canSet:
-                    setterName = "_set_" + p.name
-                    self.write(t4, "def %s(self, %s):" % (setterName, p.arg.name))
-                    self.write(t8, "self.SetAXProp('%s', %s)" % (p.name, p.arg.name))
-
-                self.write(t4, "%s = property(%s, %s)" %
-                           (self.trimPropName(p.name), getterName, setterName))
-                self.write()
-                
-
-    def WriteDocs(self, ax):
-        self.write()
-        doc = GetAXInfo(ax)
-        for line in doc.split('\n'):
-            self.write("#  ", line)
-            
-
-
-    def write(self, *args):
-        for a in args:
-            self.mf.write(a)
-        self.mf.write("\n")
-
-
-    def trimEventName(name):
-        if name.startswith("On"):
-            name = name[2:]
-        return name
-    trimEventName = staticmethod(trimEventName)
-
-
-    def trimPropName(name):
-        #name = name[0].lower() + name[1:]
-        name = name.lower()
-        import keyword
-        if name in keyword.kwlist: name += '_'
-        return name
-    trimPropName = staticmethod(trimPropName)
-
-
-    def trimMethodName(name):
-        import keyword
-        if name in keyword.kwlist: name += '_'
-        return name
-    trimMethodName = staticmethod(trimMethodName)
-    
-
-    def getParameters(self, m, withDefaults):
-        import keyword
-        st = ""
-        # collect the input parameters, if both isIn and isOut are
-        # False then assume it is an input paramater
-        params = []
-        for p in m.params:
-            if p.isIn or (not p.isIn and not p.isOut):
-                params.append(p)
-        # did we get any?
-        for p in params:
-            name = p.name
-            if name in keyword.kwlist: name += '_'
-            st += ", "
-            st += name
-            if withDefaults and p.isOptional:
-                st += '=None'
-        return st
-
-
-#---------------------------------------------------------------------------
-
-
-

wxPython/contrib/activex/wxie/IEHtmlStream.h

@@ -1,133 +0,0 @@
-/*
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-*/
-
-// This module contains the declarations of the stream adapters and such that
-// used to be in IEHtmlWin.cpp, so that they can be used independently in the
-// wxPython wrappers...
-
-
-#ifndef _IEHTMLSTREAM_H_
-#define _IEHTMLSTREAM_H_
-
-
-class IStreamAdaptorBase : public IStream
-{
-private:
-    DECLARE_OLE_UNKNOWN(IStreamAdaptorBase);
-
-public:
-    string prepend;
-
-    IStreamAdaptorBase() {}
-    virtual ~IStreamAdaptorBase() {}
-
-    virtual int Read(char *buf, int cb) = 0;
-
-    // ISequentialStream
-    HRESULT STDMETHODCALLTYPE Read(void __RPC_FAR *pv, ULONG cb, ULONG __RPC_FAR *pcbRead);
-
-    HRESULT STDMETHODCALLTYPE Write(const void __RPC_FAR *pv, ULONG cb, ULONG __RPC_FAR *pcbWritten) {return E_NOTIMPL;}
-
-    // IStream
-    HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER __RPC_FAR *plibNewPosition) {return E_NOTIMPL;}
-    HRESULT STDMETHODCALLTYPE SetSize(ULARGE_INTEGER libNewSize) {return E_NOTIMPL;}
-    HRESULT STDMETHODCALLTYPE CopyTo(IStream __RPC_FAR *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER __RPC_FAR *pcbRead, ULARGE_INTEGER __RPC_FAR *pcbWritten) {return E_NOTIMPL;}
-    HRESULT STDMETHODCALLTYPE Commit(DWORD grfCommitFlags) {return E_NOTIMPL;}
-    HRESULT STDMETHODCALLTYPE Revert(void) {return E_NOTIMPL;}
-    HRESULT STDMETHODCALLTYPE LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {return E_NOTIMPL;}
-    HRESULT STDMETHODCALLTYPE UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) {return E_NOTIMPL;}
-    HRESULT STDMETHODCALLTYPE Stat(STATSTG __RPC_FAR *pstatstg, DWORD grfStatFlag) {return E_NOTIMPL;}
-    HRESULT STDMETHODCALLTYPE Clone(IStream __RPC_FAR *__RPC_FAR *ppstm) {return E_NOTIMPL;}
-};    
-    
-
-
-class IStreamAdaptor : public IStreamAdaptorBase
-{
-private:
-    istream *m_is;
-
-public:
-    IStreamAdaptor(istream *is);
-    ~IStreamAdaptor();
-    int Read(char *buf, int cb);
-};
-
-
-
-class IwxStreamAdaptor : public IStreamAdaptorBase
-{
-private:
-    wxInputStream *m_is;
-
-public:
-    IwxStreamAdaptor(wxInputStream *is);
-    ~IwxStreamAdaptor();
-    int Read(char *buf, int cb);
-};
-
-
-class wxOwnedMemInputStream : public wxMemoryInputStream
-{
-public:
-    char *m_data;
-
-    wxOwnedMemInputStream(char *data, size_t len);
-    ~wxOwnedMemInputStream();
-};
-
-
-wxAutoOleInterface<IHTMLTxtRange> wxieGetSelRange(IOleObject *oleObject);
-
-#endif

wxPython/contrib/activex/wxie/IEHtmlWin.cpp

@@ -1,478 +0,0 @@
-/*
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-*/
-
-#include "IEHtmlWin.h"
-#include <wx/strconv.h>
-#include <wx/string.h>
-#include <wx/event.h>
-#include <wx/listctrl.h>
-#include <wx/mstream.h>
-#include <oleidl.h>
-#include <winerror.h>
-#include <exdispid.h>
-#include <exdisp.h>
-#include <olectl.h>
-#include <Mshtml.h>
-#include <sstream>
-#include <IEHtmlStream.h>
-using namespace std;
-
-
-
-//////////////////////////////////////////////////////////////////////
-// Stream adapters and such
-
-HRESULT STDMETHODCALLTYPE IStreamAdaptorBase::Read(void __RPC_FAR *pv, ULONG cb, ULONG __RPC_FAR *pcbRead)
-{
-    if (prepend.size() > 0)
-    {
-        int n = wxMin(prepend.size(), cb);
-        prepend.copy((char *) pv, n);
-        prepend = prepend.substr(n);
-        if (pcbRead)
-            *pcbRead = n;
-
-        return S_OK;
-    };
-
-    int rc = Read((char *) pv, cb);
-    if (pcbRead)
-        *pcbRead = rc;
-
-    return S_OK;
-};
-
-DEFINE_OLE_TABLE(IStreamAdaptorBase)
-    OLE_IINTERFACE(IUnknown)
-    OLE_IINTERFACE(ISequentialStream)
-    OLE_IINTERFACE(IStream)
-END_OLE_TABLE;
-
-
-IStreamAdaptor::IStreamAdaptor(istream *is)
-    : IStreamAdaptorBase(), m_is(is)
-{
-    wxASSERT(m_is != NULL);
-}
-
-IStreamAdaptor::~IStreamAdaptor()   
-{
-    delete m_is;
-}
-
-int IStreamAdaptor::Read(char *buf, int cb)
-{
-    m_is->read(buf, cb);
-    return m_is->gcount();
-}
-
-
-IwxStreamAdaptor::IwxStreamAdaptor(wxInputStream *is)
-    : IStreamAdaptorBase(), m_is(is) 
-{
-    wxASSERT(m_is != NULL);
-}
-IwxStreamAdaptor::~IwxStreamAdaptor() 
-{
-    delete m_is;
-}
-
-// ISequentialStream
-int IwxStreamAdaptor::Read(char *buf, int cb)
-{
-    m_is->Read(buf, cb);
-    return m_is->LastRead();
-};
-
-wxOwnedMemInputStream::wxOwnedMemInputStream(char *data, size_t len)
-    :  wxMemoryInputStream(data, len), m_data(data)
-{}
-
-wxOwnedMemInputStream::~wxOwnedMemInputStream() 
-{
-    free(m_data);
-}
-
-
-//////////////////////////////////////////////////////////////////////
-BEGIN_EVENT_TABLE(wxIEHtmlWin, wxActiveX)
-END_EVENT_TABLE()
-
-
-static const CLSID CLSID_MozillaBrowser =
-{ 0x1339B54C, 0x3453, 0x11D2,
-  { 0x93, 0xB9, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00 } };
-
-
-//#define PROGID "Shell.Explorer"
-#define PROGID CLSID_WebBrowser
-//#define PROGID CLSID_MozillaBrowser
-//#define PROGID CLSID_HTMLDocument
-//#define PROGID "MSCAL.Calendar"
-//#define PROGID ""
-//#define PROGID "SoftwareFX.ChartFX.20"
-
-wxIEHtmlWin::wxIEHtmlWin(wxWindow * parent, wxWindowID id,
-        const wxPoint& pos,
-        const wxSize& size,
-        long style,
-        const wxString& name) : 
-    wxActiveX(parent, PROGID, id, pos, size, style, name)
-{
-    SetupBrowser();
-}
-
-
-wxIEHtmlWin::~wxIEHtmlWin()
-{
-}
-
-void wxIEHtmlWin::SetupBrowser()
-{
-    HRESULT hret;
-
-    // Get IWebBrowser2 Interface
-    hret = m_webBrowser.QueryInterface(IID_IWebBrowser2, m_ActiveX);
-    assert(SUCCEEDED(hret));
-
-    // web browser setup
-    m_webBrowser->put_MenuBar(VARIANT_FALSE);
-    m_webBrowser->put_AddressBar(VARIANT_FALSE);
-    m_webBrowser->put_StatusBar(VARIANT_FALSE);
-    m_webBrowser->put_ToolBar(VARIANT_FALSE);
-
-    m_webBrowser->put_RegisterAsBrowser(VARIANT_TRUE);
-    m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE);
-
-    m_webBrowser->Navigate( L"about:blank", NULL, NULL, NULL, NULL );
-}
-
-
-void wxIEHtmlWin::SetEditMode(bool seton)
-{
-    m_bAmbientUserMode = ! seton;
-    AmbientPropertyChanged(DISPID_AMBIENT_USERMODE);
-};
-
-bool wxIEHtmlWin::GetEditMode()
-{
-    return ! m_bAmbientUserMode;
-};
-
-
-void wxIEHtmlWin::SetCharset(const wxString& charset)
-{
-    // HTML Document ?
-    IDispatch *pDisp = NULL;
-    HRESULT hret = m_webBrowser->get_Document(&pDisp);
-    wxAutoOleInterface<IDispatch> disp(pDisp);
-
-    if (disp.Ok())
-    {
-        wxAutoOleInterface<IHTMLDocument2> doc(IID_IHTMLDocument2, disp);
-        if (doc.Ok())
-            doc->put_charset((BSTR) (const wchar_t *) charset.wc_str(wxConvUTF8));
-            //doc->put_charset((BSTR) wxConvUTF8.cMB2WC(charset).data());
-    };
-};
-
-
-void wxIEHtmlWin::LoadUrl(const wxString& url)
-{
-    VARIANTARG navFlag, targetFrame, postData, headers;
-    navFlag.vt = VT_EMPTY; 
-    navFlag.vt = VT_I2;
-    navFlag.iVal = navNoReadFromCache;
-    targetFrame.vt = VT_EMPTY;
-    postData.vt = VT_EMPTY;
-    headers.vt = VT_EMPTY;
-
-    HRESULT hret = 0;
-    hret = m_webBrowser->Navigate((BSTR) (const wchar_t *) url.wc_str(wxConvUTF8), 
-        &navFlag, &targetFrame, &postData, &headers);   
-};
-
-
-bool  wxIEHtmlWin::LoadString(const wxString& html)
-{
-    char *data = NULL;
-    size_t len = html.length();
-#ifdef UNICODE
-    len *= 2;
-#endif
-    data = (char *) malloc(len);
-    memcpy(data, html.c_str(), len);
-    return LoadStream(new wxOwnedMemInputStream(data, len));
-};
-
-bool wxIEHtmlWin::LoadStream(IStreamAdaptorBase *pstrm)
-{
-    // need to prepend this as poxy MSHTML will not recognise a HTML comment
-    // as starting a html document and treats it as plain text
-    // Does nayone know how to force it to html mode ?
-    pstrm->prepend = "<html>";
-
-    // strip leading whitespace as it can confuse MSHTML
-    wxAutoOleInterface<IStream> strm(pstrm);
-
-    // Document Interface
-    IDispatch *pDisp = NULL;
-    HRESULT hret = m_webBrowser->get_Document(&pDisp);
-    if (! pDisp)
-        return false;
-    wxAutoOleInterface<IDispatch> disp(pDisp);
-
-
-    // get IPersistStreamInit
-    wxAutoOleInterface<IPersistStreamInit>
-        pPersistStreamInit(IID_IPersistStreamInit, disp);
-
-    if (pPersistStreamInit.Ok())
-    {
-        HRESULT hr = pPersistStreamInit->InitNew();
-        if (SUCCEEDED(hr))
-            hr = pPersistStreamInit->Load(strm);
-
-        return SUCCEEDED(hr);
-    }
-    else
-        return false;
-};
-
-bool  wxIEHtmlWin::LoadStream(istream *is)
-{
-    // wrap reference around stream
-    IStreamAdaptor *pstrm = new IStreamAdaptor(is);
-    pstrm->AddRef();
-
-    return LoadStream(pstrm);
-};
-
-bool wxIEHtmlWin::LoadStream(wxInputStream *is)
-{
-    // wrap reference around stream
-    IwxStreamAdaptor *pstrm = new IwxStreamAdaptor(is);
-    pstrm->AddRef();
-
-    return LoadStream(pstrm);
-};
-
-
-bool wxIEHtmlWin::GoBack()
-{
-    HRESULT hret = 0;
-    hret = m_webBrowser->GoBack();
-    return hret == S_OK;
-}
-
-bool wxIEHtmlWin::GoForward()
-{
-    HRESULT hret = 0;
-    hret = m_webBrowser->GoForward();
-    return hret == S_OK;
-}
-
-bool wxIEHtmlWin::GoHome()
-{
-    try
-    {
-        CallMethod(_T("GoHome"));
-        return true;
-    }
-    catch(exception&)
-    {
-        return false;
-    };
-}
-
-bool wxIEHtmlWin::GoSearch()
-{
-    HRESULT hret = 0;
-    hret = m_webBrowser->GoSearch();
-    return hret == S_OK;
-}
-
-bool wxIEHtmlWin::Refresh(wxIEHtmlRefreshLevel level)
-{
-    VARIANTARG levelArg;
-    HRESULT hret = 0;
-
-    levelArg.vt = VT_I2;
-    levelArg.iVal = level;
-    hret = m_webBrowser->Refresh2(&levelArg);
-    return hret == S_OK;
-}
-
-bool wxIEHtmlWin::Stop()
-{
-    HRESULT hret = 0;
-    hret = m_webBrowser->Stop();
-    return hret == S_OK;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-
-static wxAutoOleInterface<IHTMLSelectionObject> GetSelObject(IOleObject *oleObject)
-{
-    // Query for IWebBrowser interface
-    wxAutoOleInterface<IWebBrowser2> wb(IID_IWebBrowser2, oleObject);
-    if (! wb.Ok())
-        return wxAutoOleInterface<IHTMLSelectionObject>();
-
-    IDispatch *iDisp = NULL;
-    HRESULT hr = wb->get_Document(&iDisp);
-    if (hr != S_OK)
-        return wxAutoOleInterface<IHTMLSelectionObject>();
-
-    // Query for Document Interface
-    wxAutoOleInterface<IHTMLDocument2> hd(IID_IHTMLDocument2, iDisp);
-    iDisp->Release();
-
-    if (! hd.Ok())
-        return wxAutoOleInterface<IHTMLSelectionObject>();
-
-    IHTMLSelectionObject *_so = NULL;
-    hr = hd->get_selection(&_so);
-
-    // take ownership of selection object
-    wxAutoOleInterface<IHTMLSelectionObject> so(_so);
-
-    return so;
-};
-
-wxAutoOleInterface<IHTMLTxtRange> wxieGetSelRange(IOleObject *oleObject)
-{
-    wxAutoOleInterface<IHTMLTxtRange> tr;
-
-    wxAutoOleInterface<IHTMLSelectionObject> so(GetSelObject(oleObject));
-    if (! so)
-        return tr;
-
-    IDispatch *iDisp = NULL;
-    HRESULT hr = so->createRange(&iDisp);
-    if (hr != S_OK)
-        return tr;
-
-    // Query for IHTMLTxtRange interface
-    tr.QueryInterface(IID_IHTMLTxtRange, iDisp);
-    iDisp->Release();
-    return tr;
-};
-
-
-wxString wxIEHtmlWin::GetStringSelection(bool asHTML)
-{
-    wxAutoOleInterface<IHTMLTxtRange> tr(wxieGetSelRange(m_oleObject));
-    if (! tr)
-        return wxEmptyString;
-
-    BSTR text = NULL;
-    HRESULT hr = E_FAIL;
-    
-    if (asHTML)
-        hr = tr->get_htmlText(&text);
-    else
-        hr = tr->get_text(&text);
-    if (hr != S_OK)
-        return wxEmptyString;
-
-    wxString s = text;
-    SysFreeString(text);
-
-    return s;
-};
-
-wxString wxIEHtmlWin::GetText(bool asHTML)
-{
-    if (! m_webBrowser.Ok())
-        return wxEmptyString;
-
-    // get document dispatch interface
-    IDispatch *iDisp = NULL;
-    HRESULT hr = m_webBrowser->get_Document(&iDisp);
-    if (hr != S_OK)
-        return wxEmptyString;
-
-    // Query for Document Interface
-    wxAutoOleInterface<IHTMLDocument2> hd(IID_IHTMLDocument2, iDisp);
-    iDisp->Release();
-
-    if (! hd.Ok())
-        return wxEmptyString;
-
-    // get body element
-    IHTMLElement *_body = NULL;
-    hd->get_body(&_body);
-    if (! _body)
-        return wxEmptyString;
-    wxAutoOleInterface<IHTMLElement> body(_body);
-
-    // get inner text
-    BSTR text = NULL;
-    hr = E_FAIL;
-    
-    if (asHTML)
-        hr = body->get_innerHTML(&text);
-    else
-        hr = body->get_innerText(&text);
-    if (hr != S_OK)
-        return wxEmptyString;
-
-    wxString s = text;
-    SysFreeString(text);
-
-    return s;   
-};

wxPython/contrib/activex/wxie/IEHtmlWin.h

@@ -1,120 +0,0 @@
-/*
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-*/
-
-/*! \file iehtmlwin.h 
-    \brief implements wxIEHtmlWin window class
-*/ 
-#ifndef _IEHTMLWIN_H_
-#define _IEHTMLWIN_H_
-#pragma warning( disable : 4101 4786)
-#pragma warning( disable : 4786)
-
-
-#include <wx/setup.h>
-#include <wx/wx.h>
-#include <exdisp.h>
-#include <iostream>
-using namespace std;
-
-#include "wxactivex.h"
-
-
-enum wxIEHtmlRefreshLevel 
-{
-    wxIEHTML_REFRESH_NORMAL = 0,
-    wxIEHTML_REFRESH_IFEXPIRED = 1,
-    wxIEHTML_REFRESH_CONTINUE = 2,
-    wxIEHTML_REFRESH_COMPLETELY = 3
-};
-
-class IStreamAdaptorBase;
-
-class wxIEHtmlWin : public wxActiveX
-{
-public:
-    wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxPanelNameStr);
-    virtual ~wxIEHtmlWin();
-
-    void LoadUrl(const wxString& url);
-    bool LoadString(const wxString& html);
-    bool LoadStream(istream *strm);
-    bool LoadStream(wxInputStream *is);
-
-    void SetCharset(const wxString& charset);
-    void SetEditMode(bool seton);
-    bool GetEditMode();
-    wxString GetStringSelection(bool asHTML = false);
-    wxString GetText(bool asHTML = false);
-
-    bool GoBack();
-    bool GoForward();
-    bool GoHome();
-    bool GoSearch();
-    bool Refresh(wxIEHtmlRefreshLevel level);
-    bool Stop();
-
-    DECLARE_EVENT_TABLE();
-
-protected:
-    void SetupBrowser();
-    bool LoadStream(IStreamAdaptorBase *pstrm);
-
-    wxAutoOleInterface<IWebBrowser2>        m_webBrowser;
-};
-
-#endif /* _IEHTMLWIN_H_ */

wxPython/contrib/activex/wxie/README.1st.txt

@@ -1,6 +0,0 @@
-The contents of this dir are from the 9-Jan-2004 version of wxie.zip
-downloaded from:
- 
-    http://members.optusnet.com.au/~blackpaw1/wxactivex.html
-
-

wxPython/contrib/activex/wxie/default.doxygen

@@ -1,205 +0,0 @@
-# Doxyfile 1.3-rc2
-
-#---------------------------------------------------------------------------
-# General configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = wxActiveX
-PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = 
-OUTPUT_LANGUAGE        = English
-EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-HIDE_UNDOC_MEMBERS     = YES
-HIDE_UNDOC_CLASSES     = YES
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-SHORT_NAMES            = NO
-HIDE_SCOPE_NAMES       = NO
-VERBATIM_HEADERS       = YES
-SHOW_INCLUDE_FILES     = YES
-JAVADOC_AUTOBRIEF      = YES
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = YES
-INHERIT_DOCS           = NO
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
-DISTRIBUTE_GROUP_DOC   = YES
-TAB_SIZE               = 8
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ALIASES                = 
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = NO
-SHOW_USED_FILES        = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_FORMAT            = "$file($line): $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = .\wxactivex.h .\iehtmlwin.h
-FILE_PATTERNS          = *.cpp \
-                         *.c \
-                         *.h \
-                         *.cxx \
-                         *.idl
-RECURSIVE              = NO
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = YES
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION    = NO
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 4
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = doxydoc
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = no
-CHM_FILE               = wxactivex.chm
-HHC_LOCATION           = hhc.exe
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = YES
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_SCHEMA             = 
-XML_DTD                = 
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-TEMPLATE_RELATIONS     = YES
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-GRAPHICAL_HIERARCHY    = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
-CGI_NAME               = search.cgi
-CGI_URL                = 
-DOC_URL                = 
-DOC_ABSPATH            = 
-BIN_ABSPATH            = /usr/local/bin/
-EXT_DOC_PATHS          = 

wxPython/contrib/activex/wxie/license.txt

@@ -1,53 +0,0 @@
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-
-

wxPython/contrib/activex/wxie/makefile

@@ -1,24 +0,0 @@
-CC = gcc
-
-PROGRAM = wxIE
-
-CFLAGS = -I/m/snowball/icicle/gswd/devenv/include -D__WXMOTIF__
-LFLAGS = -L/m/snowball/icicle/devenv/lib
-
-# implementation
-
-.SUFFIXES:      .o .cpp
-
-SOURCES:sh= /bin/ls *.cpp
-
-OBJECTS = $(SOURCES:.cpp=.o)
-
-.cpp.o :
-	$(CC) -c $(CFLAGS) `wx-config --cflags` -o $@ $<
-
-$(PROGRAM): $(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) $(LFLAGS) `wx-config --libs`
-
-clean:
-	rm -f *.o $(PROGRAM)
-

wxPython/contrib/activex/wxie/makefile.gtk

@@ -1,24 +0,0 @@
-CC = gcc
-
-PROGRAM = wxIE
-
-CFLAGS = -I/m/snowball/icicle/gswd/devenv/include -D__WXGTK__
-LFLAGS = -L/m/snowball/icicle/devenv/lib
-
-# implementation
-
-.SUFFIXES:      .o .cpp
-
-SOURCES:sh= /bin/ls *.cpp
-
-OBJECTS = $(SOURCES:.cpp=.o)
-
-.cpp.o :
-	$(CC) -c $(CFLAGS) `wx-config --cflags` -o $@ $<
-
-$(PROGRAM): $(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) $(LFLAGS) `wx-config --libs`
-
-clean:
-	rm -f *.o $(PROGRAM)
-

wxPython/contrib/activex/wxie/makefile.mtf

@@ -1,24 +0,0 @@
-CC = gcc
-
-PROGRAM = wxIE
-
-CFLAGS = -I/m/snowball/icicle/gswd/devenv/include -D__WXMOTIF__
-LFLAGS = -L/m/snowball/icicle/devenv/lib
-
-# implementation
-
-.SUFFIXES:      .o .cpp
-
-SOURCES:sh= /bin/ls *.cpp
-
-OBJECTS = $(SOURCES:.cpp=.o)
-
-.cpp.o :
-	$(CC) -c $(CFLAGS) `wx-config --cflags` -o $@ $<
-
-$(PROGRAM): $(OBJECTS)
-	$(CC) -o $(PROGRAM) $(OBJECTS) $(LFLAGS) `wx-config --libs`
-
-clean:
-	rm -f *.o $(PROGRAM)
-

wxPython/contrib/activex/wxie/notes.txt

@@ -1,2 +0,0 @@
-Flash needs the following GUID for its event interface
-{D27CDB6D-AE6D-11CF-96B8-444553540000}

wxPython/contrib/activex/wxie/readme.txt

@@ -1,149 +0,0 @@
-Lindsay Mathieson
-Email : <lmathieson@optusnet.com.au>
-
-This is prelimanary stuff - the controls need extra methods and events etc,
-feel free to email with suggestions &/or patches.
-
-Tested with wxWindows 2.3.2.
-Built with MS Visual C++ 6.0 & DevStudio
-Minor use of templates and STL
-
------------------------------------------------------------
-This sample illustrates using wxActiveX and wxIEHtmlWin too:
-1. Host an arbitrary ActiveX control
-1.1 - Capture and logging of all events from control
-2. Specifically host the MSHTML Control
-
-
-wxActiveX:
-==========
-wxActiveX is used to host and siplay any activeX control, all the wxWindows developer
-needs to know is either the ProgID or CLSID of the control in question.
-
-Derived From:
-- wxWindow
-
-Include Files:
-- wxactivex.h
-
-Source Files:
-- wxactivex.cpp
-
-Event Handling:
----------------
-- EVT_ACTIVEX(id, eventName, handler) (handler = void OnActiveX(wxActiveXEvent& event))
-- EVT_ACTIVEX_DISPID(id, eventDispId, handler) (handler = void OnActiveX(wxActiveXEvent& event))
-class wxActiveXEvent : public wxNotifyEvent
-    wxString EventName();
-    int ParamCount() const;
-    wxString ParamType(int idx);
-    wxString ParamName(int idx);
-    wxVariant  operator[] (int idx) const;	// parameter by index
-    wxVariant& operator[] (int idx);
-    wxVariant  operator[] (wxString name) const; // named parameters
-    wxVariant& operator[] (wxString name);
-
-
-Members:
---------
-wxActiveX::wxActiveX(wxWindow * parent, REFCLSID clsid, wxWindowID id = -1);
-- Creates a activeX control identified by clsid
-e.g
-  wxFrame *frame = new wxFrame(this, -1, "test");
-  wxActiveX *X = new wxActiveX(frame, CLSID_WebBrowser);
-
-wxActiveX::wxActiveX(wxWindow * parent, wxString progId, wxWindowID id = -1);
-- Creates a activeX control identified by progId
-e.g.
-  wxFrame *frame = new wxFrame(this, -1, "test");
-  wxActiveX *X = new wxActiveX(frame, "MSCAL.Calendar");
-
-
-wxActiveX::~wxActiveX();
-- Destroys the control
-- disconnects all connection points
-
-- int GetEventCount() const;
-  Number of events generated by control
-
-- const FuncX& GetEvent(int idx) const;
-  Names, Params and Typeinfo for events
-
-HRESULT wxActiveX::ConnectAdvise(REFIID riid, IUnknown *eventSink);
-- Connects a event sink. Connections are automaticlly diconnected in the destructor
-e.g.
-  FS_DWebBrowserEvents2 *events = new FS_DWebBrowserEvents2(iecontrol);
-  hret = iecontrol->ConnectAdvise(DIID_DWebBrowserEvents2, events);
-  if (! SUCCEEDED(hret))
-    delete events;
-
-
-Sample Events:
---------------
-EVT_ACTIVEX(ID_MSHTML, "BeforeNavigate2",   OnMSHTMLBeforeNavigate2X)
-
-void wxIEFrame::OnMSHTMLBeforeNavigate2X(wxActiveXEvent& event)
-{
-  wxString url = event["Url"];
-
-  int rc = wxMessageBox(url, "Allow open url ?", wxYES_NO);
-
-  if (rc != wxYES)
-    event["Cancel"] = true;
-};
-
-
-wxIEHtmlWin:
-============
-wxIEHtmlWin is a specialisation of the wxActiveX control for hosting the MSHTML control.
-
-Derived From:
-- wxActiveX
-- wxWindow
-
-Event Handling:
----------------
-- see wxActiveX
-Members:
---------
-wxIEHtmlWin::wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1);
-- Constructs and initialises the MSHTML control
-- LoadUrl("about:blank") is called
-
-wxIEHtmlWin::~wxIEHtmlWin();
-- destroys the control
-
-void wxIEHtmlWin::LoadUrl(const wxString&);
-- Attempts to browse to the url, the control uses its internal (MS)
-  network streams
-
-bool wxIEHtmlWin::LoadString(wxString html);
-- Load the passed HTML string
-
-bool wxIEHtmlWin::LoadStream(istream *strm);
-- load the passed HTML stream. The control takes ownership of
-  the pointer, deleting when finished.
-
-bool wxIEHtmlWin::LoadStream(wxInputStream *is);
-- load the passed HTML stream. The control takes ownership of
-  the pointer, deleting when finished.
-
-void wxIEHtmlWin::SetCharset(wxString charset);
-- Sets the charset of the loaded document
-
-void wxIEHtmlWin::SetEditMode(bool seton);
-- Sets edit mode. 
-  NOTE: This does work, but is bare bones - we need more events exposed before
-        this is usable as an HTML editor.
-
-bool wxIEHtmlWin::GetEditMode();
-- Returns the edit mode setting
-
-wxString wxIEHtmlWin::GetStringSelection(bool asHTML = false);
-- Returns the currently selected text (plain or HTML text)
-
-wxString GetText(bool asHTML = false);
-- Returns the body text (plain or HTML text)
-
-Lindsay Mathieson
-Email : <lmathieson@optusnet.com.au>

wxPython/contrib/activex/wxie/resource.h

@@ -1,70 +0,0 @@
-/*
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-*/
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by wxIE.rc
-//
-#define DUMMY                           4
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

wxPython/contrib/activex/wxie/wxActiveXFrame.cpp

@@ -1,284 +0,0 @@
-/*
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-*/
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-// For compilers that support precompilation, includes "wx/wx.h".
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-        #include "wx/wx.h"
-#endif
-#include "wx/wxprec.h"
-#include "wx/filedlg.h"
-#include "wx/textdlg.h"
-#include "wxActiveXFrame.h"
-#include <sstream>
-using namespace std;
-#include "wx/splitter.h"
-#include "wx/textctrl.h"
-#include "wx/clipbrd.h"
-#include <wx/msgdlg.h>
-
-enum
-{
-    // menu items
-    MENU_GETTYPEINFO = 700,
-	MENU_INVOKEMETHOD,
-	MENU_TEST
-};
-
-BEGIN_EVENT_TABLE(wxActiveXFrame, wxFrame)
-    EVT_MENU(MENU_GETTYPEINFO, wxActiveXFrame::OnGetTypeInfo)
-	EVT_MENU(MENU_INVOKEMETHOD, wxActiveXFrame::OnInvokeMethod)
-	EVT_MENU(MENU_TEST, wxActiveXFrame::OnTest)
-END_EVENT_TABLE()
-
-
-wxActiveXFrame::wxActiveXFrame(wxWindow *parent, wxString title) :
-    wxFrame(parent, -1, title) 
-{
-    // create a menu bar
-    wxMenu *xMenu = new wxMenu("", wxMENU_TEAROFF);
-
-	xMenu->Append(MENU_GETTYPEINFO, "Get Type Info", "");
-	xMenu->Append(MENU_INVOKEMETHOD, "Invoke Method (no params)", "");
-	xMenu->Append(MENU_TEST, "Test", "For debugging purposes");
-
-    // now append the freshly created menu to the menu bar...
-    wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(xMenu, "&ActiveX");
-
-    // ... and attach this menu bar to the frame
-    SetMenuBar(menuBar);
-
-    wxSplitterWindow *sp = new wxSplitterWindow(this);
-    X = new wxActiveX(sp, title, 101);
-
-    textLog = new wxTextCtrl(sp, -1, "", wxPoint(0,0),  wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
-
-    sp->SplitHorizontally(X, textLog, 0);
-
-    // conenct all events
-    for (int i = 0; i < X->GetEventCount(); i++)
-    {
-        const wxActiveX::FuncX& func = X->GetEventDesc(i);
-        const wxEventType& ev = RegisterActiveXEvent((DISPID) func.memid);
-        Connect(101, ev, (wxObjectEventFunction) OnActiveXEvent);
-    };
-}
-
-wxString VarTypeAsString(VARTYPE vt)
-{
-#define VT(vtype, desc) case vtype : return desc
-
-    if (vt & VT_BYREF)
-        vt -= VT_BYREF;
-
-    if (vt & VT_ARRAY)
-        vt -= VT_ARRAY;
-
-    switch (vt)
-    {
-    VT(VT_SAFEARRAY, "SafeArray");
-    VT(VT_EMPTY, "empty");
-    VT(VT_NULL, "null");
-    VT(VT_UI1, "byte");
-    VT(VT_I1, "char");
-    VT(VT_I2, "short");
-    VT(VT_I4, "long");
-    VT(VT_UI2, "unsigned short");
-    VT(VT_UI4, "unsigned long");
-    VT(VT_INT, "int");
-    VT(VT_UINT, "unsigned int");
-    VT(VT_R4, "real(4)");
-    VT(VT_R8, "real(8)");
-    VT(VT_CY, "Currency");
-    VT(VT_DATE, "wxDate");
-    VT(VT_BSTR, "wxString");
-    VT(VT_DISPATCH, "IDispatch");
-    VT(VT_ERROR, "SCode Error");
-    VT(VT_BOOL, "bool");
-    VT(VT_VARIANT, "wxVariant");
-    VT(VT_UNKNOWN, "IUknown");
-    VT(VT_VOID, "void");
-    VT(VT_PTR, "void *");
-    VT(VT_USERDEFINED, "*user defined*");
-
-    default:
-        {
-            wxString s;
-            s << "Unknown(" << vt << ")";
-            return s;
-        };
-    };
-
-#undef VT
-};
-
-#define ENDL "\r\n"
-
-
-void OutFunc(wxString& os, const wxActiveX::FuncX& func)
-{
-    os << VarTypeAsString(func.retType.vt) << " " << func.name << "(";
-    for (unsigned int p = 0; p < func.params.size(); p++)
-    {
-        const wxActiveX::ParamX& param = func.params[p];
-        if (param.IsIn() && param.IsOut())
-            os << "[IN OUT] ";
-        else if (param.IsIn())
-            os << "[IN] ";
-        else if (param.IsIn())
-            os << "[OUT] ";
-        os << VarTypeAsString(param.vt) << " " << (param.isPtr ? "*" : "") << param.name;
-        if (p < func.params.size() - 1)
-            os << ", ";
-    };
-    os << ")" << ENDL;
-};
-
-void wxActiveXFrame::OnGetTypeInfo(wxCommandEvent& event)
-{
-    wxString os;
-
-	int i =0;
-    os << 
-        "Props" << ENDL <<
-        "=====" << ENDL;
-    for (i = 0; i < X->GetPropCount(); i++)
-    {
-        wxActiveX::PropX prop = X->GetPropDesc(i);
-        os << VarTypeAsString(prop.type.vt) << " " << prop.name << "(";
-        if (prop.CanSet())
-        {
-            os << VarTypeAsString(prop.arg.vt);
-        };
-        os << ")" << ENDL;
-
-    };
-	os << ENDL;
-
-    os << 
-        "Events" << ENDL <<
-        "======" << ENDL;
-    for (i = 0; i < X->GetEventCount(); i++)
-		OutFunc(os, X->GetEventDesc(i));
-	os << ENDL;
-
-    os << 
-        "Methods" << ENDL <<
-        "=======" << ENDL;
-    for (i = 0; i < X->GetMethodCount(); i++)
-		OutFunc(os, X->GetMethodDesc(i));
-	os << ENDL;
-
-
-	if (wxTheClipboard->Open())
-	{
-		wxDataObjectSimple *wo = new wxTextDataObject(os);
-		wxTheClipboard->SetData(wo);
-        wxTheClipboard->Flush();
-		wxTheClipboard->Close();
-	};
-
-    wxMessageBox(os, "Type Info", wxOK, this);
-};
-
-void wxActiveXFrame::OnInvokeMethod(wxCommandEvent& event)
-{
-	//wxTextEntryDialog dlg(this, "Method");
-	//if (dlg.ShowModal() == wxID_OK)
-	//	X->CallMethod(dlg.GetValue());
-};
-
-void wxActiveXFrame::OnTest(wxCommandEvent& event)
-{
-	// flash testing
-    wxVariant args[] = {0L, "http://www.macromedia.com/support/flash/ts/documents/java_script_comm/flash_to_javascript.swf"};
-    X->CallMethod("LoadMovie", args);   
-	//X->Prop("Movie") = "http://www.macromedia.com/support/flash/ts/documents/java_script_comm/flash_to_javascript.swf";
-
-	// mc cal testing
-    //X->Prop("year") = 1964L;
-    //X->Prop("Value") = wxDateTime::Now();
-
-	// pdf testing
-	//wxVariant file = "C:\\WINNT\\wx2\\docs\\pdf\\dialoged.pdf";
-	//X->CallMethod("LoadFile", &file);
-};
-
-void wxActiveXFrame::OnActiveXEvent(wxActiveXEvent& event)
-{
-#ifdef UNICODE
-    wostringstream os;
-#else
-    ostringstream os;
-#endif
-
-    os << (const wxChar *) event.EventName() << wxT("(");
-
-    for (int p = 0; p < event.ParamCount(); p++)
-    {
-        os << 
-            (const wxChar *) event.ParamType(p) << wxT(" ") << 
-            (const wxChar *) event.ParamName(p) << wxT(" = ") <<
-            (const wxChar *) (wxString) event[p];
-        if (p < event.ParamCount() - 1)
-            os << wxT(", ");
-    };
-    os << wxT(")") << endl;
-    wxString data = os.str().c_str();
-    textLog->AppendText(data);
-};
-

wxPython/contrib/activex/wxie/wxActiveXFrame.h

@@ -1,77 +0,0 @@
-/*
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-*/
-
-#ifndef wxActiveXFrame_h
-#define wxActiveXFrame_h
-
-#include "wxactivex.h"
-
-class wxActiveXFrame : public wxFrame
-{
-public:
-    wxActiveX *X;
-    wxTextCtrl *textLog;
-
-    wxActiveXFrame(wxWindow *parent, wxString title);
-
-    DECLARE_EVENT_TABLE()
-
-    void OnGetTypeInfo(wxCommandEvent& event);
-    void OnInvokeMethod(wxCommandEvent& event);
-	void OnTest(wxCommandEvent& event);
-    void OnActiveXEvent(wxActiveXEvent& event);
-};
-
-
-#endif

wxPython/contrib/activex/wxie/wxIE.dsp

@@ -1,404 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wxIE" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=wxIE - Win32 Unicode Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wxIE.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wxIE.mak" CFG="wxIE - Win32 Unicode Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wxIE - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "wxIE - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "wxIE - Win32 Unicode Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "wxIE - Win32 Unicode Release" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "wxIE - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "$(WXWIN)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
-# ADD BASE RSC /l 0xc09 /d "NDEBUG"
-# ADD RSC /l 0xc09 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"$(WXWIN)\Lib" /libpath:"$(WXWIN)\contrib\Lib"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "wxIE - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /GZ /c
-# ADD BASE RSC /l 0xc09 /d "_DEBUG"
-# ADD RSC /l 0xc09 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib    wxbase25d.lib             wxbase25d_net.lib         wxbase25d_xml.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"$(WXWIN)\Lib" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"$(WXWIN)\contrib\Lib"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "wxIE - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "wxIE___Win32_Unicode_Debug"
-# PROP BASE Intermediate_Dir "wxIE___Win32_Unicode_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "wxIE___Win32_Unicode_Debug"
-# PROP Intermediate_Dir "wxIE___Win32_Unicode_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(WXWIN)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(WXWIN)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D UNICODE=1 /Yu"wx/wxprec.h" /FD /GZ /c
-# ADD BASE RSC /l 0xc09 /d "_DEBUG"
-# ADD RSC /l 0xc09 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"wxIE.exe" /pdbtype:sept /libpath:"$(WXWIN)\Lib" /libpath:"$(WXWIN)\contrib\Lib"
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"wxIE.exe" /pdbtype:sept /libpath:"$(WXWIN)\Lib" /libpath:"$(WXWIN)\contrib\Lib"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "wxIE - Win32 Unicode Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "wxIE___Win32_Unicode_Release"
-# PROP BASE Intermediate_Dir "wxIE___Win32_Unicode_Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "wxIE___Win32_Unicode_Release"
-# PROP Intermediate_Dir "wxIE___Win32_Unicode_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "$(WXWIN)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "$(WXWIN)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
-# ADD BASE RSC /l 0xc09 /d "NDEBUG"
-# ADD RSC /l 0xc09 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib xpm.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"wxIE.exe"
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"wxIE.exe" /libpath:"$(WXWIN)\Lib" /libpath:"$(WXWIN)\contrib\Lib"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "wxIE - Win32 Release"
-# Name "wxIE - Win32 Debug"
-# Name "wxIE - Win32 Unicode Debug"
-# Name "wxIE - Win32 Unicode Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\IEHtmlWin.cpp
-
-!IF  "$(CFG)" == "wxIE - Win32 Release"
-
-# SUBTRACT CPP /YX
-
-!ELSEIF  "$(CFG)" == "wxIE - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxIE - Win32 Unicode Debug"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxIE - Win32 Unicode Release"
-
-# SUBTRACT BASE CPP /YX
-# SUBTRACT CPP /YX
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxactivex.cpp
-
-!IF  "$(CFG)" == "wxIE - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "wxIE - Win32 Debug"
-
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxIE - Win32 Unicode Debug"
-
-# SUBTRACT BASE CPP /YX /Yc /Yu
-# SUBTRACT CPP /YX /Yc /Yu
-
-!ELSEIF  "$(CFG)" == "wxIE - Win32 Unicode Release"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxActiveXFrame.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxIE.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxIEApp.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxIEFrm.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\IEHtmlWin.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxactivex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxActiveXFrame.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxIEApp.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxIEFrm.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\wx\msw\blank.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\bullseye.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\colours.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\cross.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\disable.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\error.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\hand.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\info.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\magnif1.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\noentry.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pbrush.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pencil.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\plot_dwn.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\plot_enl.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\plot_shr.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\plot_up.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\plot_zin.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\plot_zot.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pntleft.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pntright.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\query.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\question.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\roller.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\size.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\tick.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\tip.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\warning.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\watch1.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxIE.ico
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\default.doxygen
-# End Source File
-# Begin Source File
-
-SOURCE=.\license.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\makefile
-# PROP Exclude_From_Scan -1
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\makefile.gtk
-# PROP Exclude_From_Scan -1
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\makefile.mtf
-# PROP Exclude_From_Scan -1
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
-SOURCE=.\notes.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\readme.txt
-# End Source File
-# Begin Source File
-
-SOURCE=.\wxIE.xpm
-# PROP Exclude_From_Scan -1
-# PROP BASE Exclude_From_Build 1
-# PROP Exclude_From_Build 1
-# End Source File
-# End Target
-# End Project

wxPython/contrib/activex/wxie/wxIE.rc

@@ -1,169 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-//#include "afxres.h"
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#include <winuser.rh>
-#include <commctrl.rh>
-#include <dde.rh>
-#include <winnt.rh>
-#include <dlgs.h>
-#include <winver.h>
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-/*
-WXDISABLE_BUTTON_BITMAP BITMAP  MOVEABLE PURE   "wx/msw/disable.bmp"
-WXBITMAP_STD_COLOURS    BITMAP  MOVEABLE PURE   "wx/msw/colours.bmp"
-TICK_BMP                BITMAP  MOVEABLE PURE   "wx/msw/tick.bmp"
-PLOT_ZOT_BMP            BITMAP  MOVEABLE PURE   "wx/msw/plot_zot.bmp"
-PLOT_ZIN_BMP            BITMAP  MOVEABLE PURE   "wx/msw/plot_zin.bmp"
-PLOT_UP_BMP             BITMAP  MOVEABLE PURE   "wx/msw/plot_up.bmp"
-PLOT_SHR_BMP            BITMAP  MOVEABLE PURE   "wx/msw/plot_shr.bmp"
-PLOT_ENL_BMP            BITMAP  MOVEABLE PURE   "wx/msw/plot_enl.bmp"
-PLOT_DWN_BMP            BITMAP  MOVEABLE PURE   "wx/msw/plot_dwn.bmp"
-CROSS_BMP               BITMAP  MOVEABLE PURE   "wx/msw/cross.bmp"
-*/
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Cursor
-//
-
-/*
-WXCURSOR_WATCH          CURSOR  DISCARDABLE     "wx\\msw\\watch1.cur"
-WXCURSOR_SIZING         CURSOR  DISCARDABLE     "wx/msw/size.cur"
-WXCURSOR_ROLLER         CURSOR  DISCARDABLE     "wx/msw/roller.cur"
-WXCURSOR_QARROW         CURSOR  DISCARDABLE     "wx/msw/query.cur"
-WXCURSOR_PRIGHT         CURSOR  DISCARDABLE     "wx/msw/pntright.cur"
-WXCURSOR_PLEFT          CURSOR  DISCARDABLE     "wx/msw/pntleft.cur"
-WXCURSOR_PENCIL         CURSOR  DISCARDABLE     "wx/msw/pencil.cur"
-WXCURSOR_PBRUSH         CURSOR  DISCARDABLE     "wx/msw/pbrush.cur"
-WXCURSOR_NO_ENTRY       CURSOR  DISCARDABLE     "wx/msw/noentry.cur"
-WXCURSOR_MAGNIFIER      CURSOR  DISCARDABLE     "wx/msw/magnif1.cur"
-WXCURSOR_HAND           CURSOR  DISCARDABLE     "wx/msw/hand.cur"
-WXCURSOR_BULLSEYE       CURSOR  DISCARDABLE     "wx/msw/bullseye.cur"
-WXCURSOR_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
-*/
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-WXRESIZEABLEDIALOG DIALOG DISCARDABLE  34, 22, 144, 75
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-BEGIN
-END
-
-WXNOCAPTIONDIALOG DIALOG DISCARDABLE  34, 22, 144, 75
-STYLE WS_POPUP
-BEGIN
-END
-
-WXCAPTIONDIALOG DIALOG DISCARDABLE  34, 22, 144, 75
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dummy dialog"
-BEGIN
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-WXIE                    ICON    DISCARDABLE     "wxIE.ico"
-/*
-WXICON_WARNING          ICON    DISCARDABLE     "wx\\msw\\warning.ico"
-WXICON_TIP              ICON    DISCARDABLE     "wx/msw/tip.ico"
-WXICON_QUESTION         ICON    DISCARDABLE     "wx/msw/question.ico"
-WXICON_INFO             ICON    DISCARDABLE     "wx/msw/info.ico"
-WXICON_ERROR            ICON    DISCARDABLE     "wx/msw/error.ico"
-*/
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-WXWINDOWMENU MENU DISCARDABLE 
-BEGIN
-    POPUP "&Window"
-    BEGIN
-        MENUITEM "&Cascade",                    4002
-        MENUITEM "Tile &Horizontally",          4001
-        MENUITEM "Tile &Vertically",            4005
-        MENUITEM "",                            65535
-        MENUITEM "&Arrange Icons",              4003
-        MENUITEM "&Next",                       4004
-    END
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

wxPython/contrib/activex/wxie/wxIE.xpm

@@ -1,44 +0,0 @@
-/* XPM */
-static char *wxIE_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 6 1",
-"  c Black",
-". c Blue",
-"X c #00bf00",
-"o c Red",
-"O c Yellow",
-"+ c Gray100",
-/* pixels */
-"                                ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-" oooooo +++++++++++++++++++++++ ",
-"                                ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++ .... ",
-" ++++++ ++++++++++++++++++      ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++ ++++++++++++++++++ ++++ ",
-" ++++++                    ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
-"                                "
-};

wxPython/contrib/activex/wxie/wxIEApp.cpp

@@ -1,99 +0,0 @@
-/*
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-*/
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-// For compilers that support precompilation, includes "wx/wx.h".
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-        #include "wx/wx.h"
-#endif
-#include "wx/wxprec.h"
-#include "wxIEApp.h"
-#include "wxIEFrm.h"
-#include "resource.h"
-
-
-
-// Create a new application object: this macro will allow wxWindows to create
-// the application object during program execution (it's better than using a
-// static object for many reasons) and also declares the accessor function
-// wxGetApp() which will return the reference of the right type (i.e. wxIEApp and
-// not wxApp)
-IMPLEMENT_APP(wxIEApp)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// the application class
-// ----------------------------------------------------------------------------
-
-// 'Main program' equivalent: the program execution "starts" here
-bool wxIEApp::OnInit()
-{
-    // create the main application window
-    wxIEFrame *frame = new wxIEFrame(wxT("IE Test"));
-
-    // and show it (the frames, unlike simple controls, are not shown when
-    // created initially)
-    frame->Show(TRUE);
-
-    // success: wxApp::OnRun() will be called which will enter the main message
-    // loop and the application will run. If we returned FALSE here, the
-    // application would exit immediately.
-    return TRUE;
-}
-

wxPython/contrib/activex/wxie/wxIEApp.h

@@ -1,66 +0,0 @@
-/*
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-*/
-
-// Define a new application type, each program should derive a class from wxApp
-class wxIEApp : public wxApp
-{
-public:
-    // override base class virtuals
-    // ----------------------------
-
-    // this one is called on application startup and is a good place for the app
-    // initialization (doing it here and not in the ctor allows to have an error
-    // return: if OnInit() returns false, the application terminates)
-    virtual bool OnInit();
-};

wxPython/contrib/activex/wxie/wxIEFrm.cpp

@@ -1,381 +0,0 @@
-/*
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-*/
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-// For compilers that support precompilation, includes "wx/wx.h".
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-        #include "wx/wx.h"
-#endif
-#include "wx/wxprec.h"
-#include "wx/filedlg.h"
-#include "wxIEApp.h"
-#include "wxIEFrm.h"
-#include "wxActiveXFrame.h"
-#include <istream>
-#include <fstream>
-using namespace std;
-#include <exdispid.h>
-
-// ----------------------------------------------------------------------------
-// resources
-// ----------------------------------------------------------------------------
-// the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-    #include "wxIE.xpm"
-#endif
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// IDs for the controls and the menu commands
-enum
-{
-    // menu items
-    FILE_QUIT = 1,
-	FILE_OPEN,
-	FILE_BROWSE,
-    FILE_HTML_EDITMODE,
-	FILE_TEST_HTML,
-	FILE_TEST_SELECT,
-	FILE_TEST_HTMLSELECT,
-	FILE_TEST_GETTEXT,
-	FILE_TEST_HTMLGETTEXT,
-    FILE_TEST_HOME,
-    FILE_TEST_ACTIVEX,
-    FILE_ABOUT,
-
-	// controls
-	ID_MSHTML = 501,
-	ID_PROGRESS_GAUGE
-};
-
-// ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
-// ----------------------------------------------------------------------------
-
-// the event tables connect the wxWindows events with the functions (event
-// handlers) which process them. It can be also done at run-time, but for the
-// simple menu events like this the static method is much simpler.
-BEGIN_EVENT_TABLE(wxIEFrame, wxFrame)
-    EVT_SIZE(wxIEFrame::OnSize)
-    EVT_MENU(FILE_QUIT,		wxIEFrame::OnQuit)
-	EVT_MENU(FILE_BROWSE,		wxIEFrame::OnBrowse)
-	EVT_MENU(FILE_OPEN,			wxIEFrame::OnOpen)
-    EVT_MENU(FILE_HTML_EDITMODE, wxIEFrame::OnEditMode)
-    EVT_UPDATE_UI(FILE_HTML_EDITMODE, wxIEFrame::OnEditModeUI)
-    EVT_MENU(FILE_TEST_HTML,	wxIEFrame::OnTestHTML)
-    EVT_MENU(FILE_TEST_SELECT,  wxIEFrame::OnTestSelect)
-    EVT_MENU(FILE_TEST_HTMLSELECT,  wxIEFrame::OnTestHTMLSelect)
-    EVT_MENU(FILE_TEST_GETTEXT,  wxIEFrame::OnTestGetText)
-    EVT_MENU(FILE_TEST_HTMLGETTEXT,  wxIEFrame::OnTestHTMLGetText)
-    EVT_MENU(FILE_TEST_HOME, wxIEFrame::OnTestHome)
-    EVT_MENU(FILE_TEST_ACTIVEX, wxIEFrame::OnTestActiveX)
-    EVT_MENU(FILE_ABOUT,		wxIEFrame::OnAbout)
-
-    // ActiveX Events
-    EVT_ACTIVEX_DISPID(ID_MSHTML, DISPID_STATUSTEXTCHANGE,  OnMSHTMLStatusTextChangeX)
-    EVT_ACTIVEX(ID_MSHTML, "BeforeNavigate2",   OnMSHTMLBeforeNavigate2X)
-	EVT_ACTIVEX(ID_MSHTML, "TitleChange",       OnMSHTMLTitleChangeX)
-	EVT_ACTIVEX(ID_MSHTML, "NewWindow2",        OnMSHTMLNewWindow2X)
-	EVT_ACTIVEX(ID_MSHTML, "ProgressChange",    OnMSHTMLProgressChangeX)
-END_EVENT_TABLE()
-
-// ----------------------------------------------------------------------------
-// main frame
-// ----------------------------------------------------------------------------
-
-// frame constructor
-wxIEFrame::wxIEFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
-{
-    // set the frame icon
-    SetIcon(wxICON(wxIE));
-
-    // create a menu bar
-    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
-
-    // the "About" item should be in the help menu
-    wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(FILE_ABOUT, "&About...\tCtrl-A", "Show about dialog");
-
-	menuFile->Append(FILE_TEST_HTML, "Test HTML", "Demonstrates LoadString()");
-	menuFile->Append(FILE_OPEN, "Open HTML File", "Demonstrates LoadStream(istream *)");
-	menuFile->Append(FILE_BROWSE, "Browse Web Page", "Demonstrates LoadUrl(url)");
-	menuFile->Append(FILE_HTML_EDITMODE, "Edit Mode", "Demonstrates editing html", true);
-	menuFile->AppendSeparator();
-	menuFile->Append(FILE_TEST_SELECT, "Get Selected Text", "Demonstrates GetStringSelection(false)");
-	menuFile->Append(FILE_TEST_HTMLSELECT, "Get HTML Selected Text", "Demonstrates GetStringSelection(true)");
-	menuFile->AppendSeparator();
-	menuFile->Append(FILE_TEST_GETTEXT, "Get Text", "Demonstrates GetText(false)");
-	menuFile->Append(FILE_TEST_HTMLGETTEXT, "Get HTML Text", "Demonstrates GetText(true)");
-	menuFile->Append(FILE_TEST_HOME, "Open Home Page", "Demonstrates GoHome()");
-	menuFile->AppendSeparator();
-	menuFile->Append(FILE_TEST_ACTIVEX, "Display a ActiveX control", "Demonstrates the Generic ActiveX Container");
-	menuFile->AppendSeparator();
-    menuFile->Append(FILE_QUIT, "E&xit\tAlt-X", "Quit this program");
-
-    // now append the freshly created menu to the menu bar...
-    wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(menuFile, "&File");
-    menuBar->Append(helpMenu, "&Help");
-
-    // ... and attach this menu bar to the frame
-    SetMenuBar(menuBar);
-
-    // create a status bar just for fun (by default with 1 pane only)
-    wxStatusBar * sb = CreateStatusBar(2);
-    SetStatusText("Ready");
-
-	// progress gauge (belongs to status bar)
-	m_gauge = new wxGauge(sb, ID_PROGRESS_GAUGE, 100);
-
-	// IE Control
-	m_ie = new wxIEHtmlWin(this, ID_MSHTML);
-
-}
-
-
-// event handlers
-
-void wxIEFrame::OnSize(wxSizeEvent& event)
-{
-	wxFrame::OnSize(event);
-
-	wxStatusBar* sb = GetStatusBar();
-	if (! sb)
-		return;
-
-	wxRect rc;
-	sb->GetFieldRect(1, rc);
-
-	m_gauge->SetSize(rc);
-};
-
-void wxIEFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-{
-    // TRUE is to force the frame to close
-    Close(TRUE);
-}
-
-void wxIEFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    wxString msg;
-    msg.Printf( _T("About wxIE...\n"));
-    wxMessageBox(msg, "About wxIE", wxOK | wxICON_INFORMATION, this);
-}
-
-void wxIEFrame::OnTestHTML(wxCommandEvent& WXUNUSED(event))
-{
-	wxString html = 
-		"<HTML><BODY><H1>Hello World</H1>Plain Text</body></html>";
-	m_ie->LoadString(html);
-}
-
-
-void wxIEFrame::OnTestSelect(wxCommandEvent& WXUNUSED(event))
-{
-	wxString s = m_ie->GetStringSelection();
-
-	wxMessageBox(s);
-}
-
-void wxIEFrame::OnTestHTMLSelect(wxCommandEvent& WXUNUSED(event))
-{
-	wxString s = m_ie->GetStringSelection(true);
-
-	wxMessageBox(s);
-}
-
-void wxIEFrame::OnTestGetText(wxCommandEvent& WXUNUSED(event))
-{
-	wxString s = m_ie->GetText();
-
-	wxMessageBox(s);
-}
-
-void wxIEFrame::OnTestHTMLGetText(wxCommandEvent& WXUNUSED(event))
-{
-	wxString s = m_ie->GetText(true);
-
-	wxMessageBox(s);
-}
-
-void wxIEFrame::OnTestHome(wxCommandEvent& WXUNUSED(event))
-{
-	m_ie->GoHome();
-};
-
-
-void wxIEFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
-{
-	wxFileDialog dlg(this, "Chooose a HTML File", "", "", "HTML files (*.html; *.htm)|*.html;*.htm|",wxOPEN);
-
-	if (dlg.ShowModal() == wxID_OK)
-	{
-		wxString fname = dlg.GetPath();
-
-		ifstream *is = new ifstream(fname.mb_str());
-		m_ie->LoadStream(is);
-	};
-}
-
-void wxIEFrame::OnEditMode(wxCommandEvent& WXUNUSED(event))
-{
-	m_ie->SetEditMode(! m_ie->GetEditMode());
-}
-
-void wxIEFrame::OnEditModeUI(wxUpdateUIEvent& event)
-{
-    if (m_ie)
-	    event.Check(m_ie->GetEditMode());
-}
-
-void wxIEFrame::OnBrowse(wxCommandEvent& WXUNUSED(event))
-{
-	wxString url = wxGetTextFromUser("Enter URL:", "Browse", "", this);
-
-	m_ie->LoadUrl(url);
-}
-
-void wxIEFrame::OnMSHTMLStatusTextChangeX(wxActiveXEvent& event)
-{
-    SetStatusText(event["Text"]);
-};
-
-
-void wxIEFrame::OnMSHTMLBeforeNavigate2X(wxActiveXEvent& event)
-{
-    wxString url = event["Url"];
-	if (url == "about:blank")
-		return;
-
-	int rc = wxMessageBox(url, "Allow open url ?", wxYES_NO);
-
-	if (rc != wxYES)
-		event["Cancel"] = true;
-};
-
-void wxIEFrame::OnMSHTMLTitleChangeX(wxActiveXEvent& event)
-{
-	SetTitle(event["Text"]);
-};
-
-
-void wxIEFrame::OnMSHTMLNewWindow2X(wxActiveXEvent& event)
-{
-	int rc = wxMessageBox("New Window requested", "Allow New Window ?", wxYES_NO);
-
-	if (rc != wxYES)
-		event["Cancel"] = true;
-};
-
-
-void wxIEFrame::OnMSHTMLProgressChangeX(wxActiveXEvent& event)
-{
-	if ((long) event["ProgressMax"] != m_gauge->GetRange())
-		m_gauge->SetRange((long) event["ProgressMax"]);
-
-	m_gauge->SetValue((long) event["Progress"]);
-};
-
-void wxIEFrame::OnTestActiveX(wxCommandEvent& WXUNUSED(event))
-{
-// Some known prog ids
-//#define PROGID "Shell.Explorer"
-//#define PROGID CLSID_WebBrowser
-//#define PROGID CLSID_MozillaBrowser
-//#define PROGID CLSID_HTMLDocument
-//#define PROGID "MSCAL.Calendar"
-//#define PROGID "WordPad.Document"
-//#define PROGID "SoftwareFX.ChartFX"
-//#define PROGID "PDF.PdfCtrl"
-#define PROGID "ShockwaveFlash.ShockwaveFlash"
-
-    wxDialog dlg(this, -1, wxString(wxT("Test ActiveX")));
-
-    wxFlexGridSizer *sz = new wxFlexGridSizer(2);
-    sz->Add(new wxStaticText(&dlg, -1, wxT("Enter a ActiveX ProgId")), 0, wxALL, 5 );
-
-    wxComboBox *cb = new wxComboBox(&dlg, 101, "");
-    cb->Append(wxT("ShockwaveFlash.ShockwaveFlash"));
-    cb->Append(wxT("MSCAL.Calendar"));
-    cb->Append(wxT("Shell.Explorer"));
-    cb->Append(wxT("WordPad.Document.1"));
-    cb->Append(wxT("SoftwareFX.ChartFX.20"));
-    cb->Append(wxT("PDF.PdfCtrl.5"));
-    cb->SetSelection(0);
-
-    sz->Add(cb, 0, wxALL, 5 );
-
-    // next row
-    sz->Add(new wxButton(&dlg, wxID_CANCEL, "Cancel"), 0, wxALIGN_RIGHT|wxALL, 5 );
-    sz->Add(new wxButton(&dlg, wxID_OK, "Ok"), 0, wxALIGN_RIGHT|wxALL, 5 );
-
-    dlg.SetAutoLayout( TRUE );
-    dlg.SetSizer(sz);
-    sz->Fit(&dlg);
-    sz->SetSizeHints(&dlg);
-
-
-    if (dlg.ShowModal() == wxID_OK)
-    {
-        wxString progId = cb->GetValue();
-        wxActiveXFrame *frame = new wxActiveXFrame(this, progId);
-        frame->Show();
-    };
-}
-

wxPython/contrib/activex/wxie/wxIEFrm.h

@@ -1,95 +0,0 @@
-/*
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-*/
-
-#include "IEHtmlWin.h"
-#include "wx/gauge.h"
-
-// Define a new frame type: this is going to be our main frame
-class wxIEFrame : public wxFrame
-{
-public:
-	wxIEHtmlWin	*m_ie;
-	wxGauge *m_gauge;
-
-    // ctor(s)
-    wxIEFrame(const wxString& title, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize);
-
-    // event handlers (these functions should _not_ be virtual)
-	void OnSize(wxSizeEvent& event);
-    void OnQuit(wxCommandEvent& event);
-    void OnAbout(wxCommandEvent& event);
-
-    void OnEditMode(wxCommandEvent& event);
-    void OnEditModeUI(wxUpdateUIEvent& event);
-	void OnBrowse(wxCommandEvent& event);
-	void OnOpen(wxCommandEvent& event);
-    void OnTestHTML(wxCommandEvent& event);
-    void OnTestSelect(wxCommandEvent& event);
-    void OnTestHTMLSelect(wxCommandEvent& event);
-    void OnTestGetText(wxCommandEvent& event);
-    void OnTestHTMLGetText(wxCommandEvent& event);
-    void OnTestHome(wxCommandEvent& event);
-    void OnTestActiveX(wxCommandEvent& event);
-
-private:
-    // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE()
-
-    void OnMSHTMLStatusTextChangeX(wxActiveXEvent& event);
-    void OnMSHTMLBeforeNavigate2X(wxActiveXEvent& event);
-    void OnMSHTMLTitleChangeX(wxActiveXEvent& event);
-	void OnMSHTMLNewWindow2X(wxActiveXEvent& event);
-    void OnMSHTMLProgressChangeX(wxActiveXEvent& event);
-};

wxPython/contrib/activex/wxie/wxactivex.h

@@ -1,680 +0,0 @@
-/*
-                wxActiveX Library Licence, Version 3
-                ====================================
-
-  Copyright (C) 2003 Lindsay Mathieson [, ...]
-
-  Everyone is permitted to copy and distribute verbatim copies
-  of this licence document, but changing it is not allowed.
-
-                       wxActiveX LIBRARY LICENCE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public Licence as published by
-  the Free Software Foundation; either version 2 of the Licence, or (at
-  your option) any later version.
-  
-  This library is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
-  General Public Licence for more details.
-
-  You should have received a copy of the GNU Library General Public Licence
-  along with this software, usually in a file named COPYING.LIB.  If not,
-  write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-  Boston, MA 02111-1307 USA.
-
-  EXCEPTION NOTICE
-
-  1. As a special exception, the copyright holders of this library give
-  permission for additional uses of the text contained in this release of
-  the library as licenced under the wxActiveX Library Licence, applying
-  either version 3 of the Licence, or (at your option) any later version of
-  the Licence as published by the copyright holders of version 3 of the
-  Licence document.
-
-  2. The exception is that you may use, copy, link, modify and distribute
-  under the user's own terms, binary object code versions of works based
-  on the Library.
-
-  3. If you copy code from files distributed under the terms of the GNU
-  General Public Licence or the GNU Library General Public Licence into a
-  copy of this library, as this licence permits, the exception does not
-  apply to the code that you add in this way.  To avoid misleading anyone as
-  to the status of such modified files, you must delete this exception
-  notice from such code and/or adjust the licensing conditions notice
-  accordingly.
-
-  4. If you write modifications of your own for this library, it is your
-  choice whether to permit this exception to apply to your modifications. 
-  If you do not wish that, you must delete the exception notice from such
-  code and/or adjust the licensing conditions notice accordingly.
-*/
-
-/*! \file wxactivex.h 
-    \brief implements wxActiveX window class and OLE tools
-*/ 
-
-#ifndef WX_ACTIVE_X
-#define WX_ACTIVE_X
-#pragma warning( disable : 4101 4786)
-#pragma warning( disable : 4786)
-
-
-#include <wx/setup.h>
-#include <wx/wx.h>
-#include <wx/variant.h>
-#include <wx/datetime.h>
-#include <oleidl.h>
-#include <exdisp.h>
-#include <docobj.h>
-#include <iostream>
-#include <vector>
-#include <map>
-using namespace std;
-
-/// \brief wxActiveX Namespace for stuff I want to keep out of other tools way.
-namespace NS_wxActiveX
-{
-    /// STL utilty class.
-    /// specific to wxActiveX, for creating
-    /// case insenstive maps etc
-    struct less_wxStringI
-    {
-        bool operator()(const wxString& x, const wxString& y) const
-        {
-            return x.CmpNoCase(y) < 0;
-        };
-    };
-};
-
-
-//////////////////////////////////////////
-/// Template class for smart interface handling.
-/// - Automatically dereferences ole interfaces
-/// - Smart Copy Semantics
-/// - Can Create Interfaces
-/// - Can query for other interfaces
-template <class I> class wxAutoOleInterface
-{
-    protected:
-    I *m_interface;
-
-    public:
-    /// takes ownership of an existing interface
-    /// Assumed to already have a AddRef() applied
-    explicit wxAutoOleInterface(I *pInterface = NULL) : m_interface(pInterface) {}
-
-    /// queries for an interface 
-    wxAutoOleInterface(REFIID riid, IUnknown *pUnk) : m_interface(NULL)
-    {
-        QueryInterface(riid, pUnk);
-    };
-    /// queries for an interface 
-    wxAutoOleInterface(REFIID riid, IDispatch *pDispatch) : m_interface(NULL)
-    {
-        QueryInterface(riid, pDispatch);
-    };
-
-    /// Creates an Interface
-    wxAutoOleInterface(REFCLSID clsid, REFIID riid) : m_interface(NULL)
-    {
-        CreateInstance(clsid, riid);
-    };
-
-    /// copy constructor
-    wxAutoOleInterface(const wxAutoOleInterface<I>& ti) : m_interface(NULL)
-    {
-        operator = (ti);
-    }
-
-    /// assignment operator
-    wxAutoOleInterface<I>& operator = (const wxAutoOleInterface<I>& ti)
-    {
-        if (ti.m_interface)
-            ti.m_interface->AddRef();
-        Free();
-        m_interface = ti.m_interface;
-        return *this;
-    }
-
-    /// takes ownership of an existing interface
-    /// Assumed to already have a AddRef() applied
-    wxAutoOleInterface<I>& operator = (I *&ti)
-    {
-        Free();
-        m_interface = ti;
-        return *this;
-    }
-
-    /// invokes Free()
-    ~wxAutoOleInterface()
-    {
-        Free();
-    };
-
-
-    /// Releases interface (i.e decrements refCount)
-    inline void Free()
-    {
-        if (m_interface)
-            m_interface->Release();
-        m_interface = NULL;
-    };
-
-    /// queries for an interface 
-    HRESULT QueryInterface(REFIID riid, IUnknown *pUnk)
-    {
-        Free();
-        wxCHECK(pUnk != NULL, -1);
-        return pUnk->QueryInterface(riid, (void **) &m_interface);
-    };
-
-    /// Create a Interface instance
-    HRESULT CreateInstance(REFCLSID clsid, REFIID riid)
-    {
-        Free();
-        return CoCreateInstance(clsid, NULL, CLSCTX_ALL, riid, (void **) &m_interface);
-    };
-
-
-    /// returns the interface pointer
-    inline operator I *() const {return m_interface;}
-
-    /// returns the dereferenced interface pointer
-    inline I* operator ->() {return m_interface;}
-    /// returns a pointer to the interface pointer
-    inline I** GetRef() {return &m_interface;}
-    /// returns true if we have a valid interface pointer
-    inline bool Ok() const  {return m_interface != NULL;}
-};
-
-
-/// \brief Converts a std HRESULT to its error code.
-/// Hardcoded, by no means a definitive list.
-wxString OLEHResultToString(HRESULT hr);
-/// \brief Returns the string description of a IID.
-/// Hardcoded, by no means a definitive list.
-wxString GetIIDName(REFIID riid);
-
-//#define __WXOLEDEBUG
-
-
-#ifdef __WXOLEDEBUG
-    #define WXOLE_TRACE(str) {OutputDebugString(str);OutputDebugString("\r\n");}
-    #define WXOLE_TRACEOUT(stuff)\
-    {\
-        wxString os;\
-        os << stuff << "\r\n";\
-        WXOLE_TRACE(os.mb_str());\
-    }
-
-    #define WXOLE_WARN(__hr,msg)\
-    {\
-        if (__hr != S_OK)\
-        {\
-            wxString s = "*** ";\
-            s += msg;\
-            s += " : "+ OLEHResultToString(__hr);\
-            WXOLE_TRACE(s.c_str());\
-        }\
-    }
-#else
-    #define WXOLE_TRACE(str)
-    #define WXOLE_TRACEOUT(stuff)
-    #define WXOLE_WARN(_proc,msg) {_proc;}
-#endif
-
-class wxOleInit
-{
-    public:
-    static IMalloc *GetIMalloc();
-
-    wxOleInit();
-    ~wxOleInit();
-};
-
-#define DECLARE_OLE_UNKNOWN(cls)\
-    private:\
-    class TAutoInitInt\
-    {\
-        public:\
-        LONG l;\
-        TAutoInitInt() : l(0) {}\
-    };\
-    TAutoInitInt refCount, lockCount;\
-    wxOleInit oleInit;\
-    static void _GetInterface(cls *self, REFIID iid, void **_interface, const char *&desc);\
-    public:\
-    LONG GetRefCount();\
-    HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void ** ppvObject);\
-    ULONG STDMETHODCALLTYPE AddRef();\
-    ULONG STDMETHODCALLTYPE Release();\
-    ULONG STDMETHODCALLTYPE AddLock();\
-    ULONG STDMETHODCALLTYPE ReleaseLock()
-
-#define DEFINE_OLE_TABLE(cls)\
-    LONG cls::GetRefCount() {return refCount.l;}\
-    HRESULT STDMETHODCALLTYPE cls::QueryInterface(REFIID iid, void ** ppvObject)\
-    {\
-        if (! ppvObject)\
-        {\
-            WXOLE_TRACE("*** NULL POINTER ***");\
-            return E_FAIL;\
-        };\
-        const char *desc = NULL;\
-        cls::_GetInterface(this, iid, ppvObject, desc);\
-        if (! *ppvObject)\
-        {\
-            WXOLE_TRACEOUT("<" << GetIIDName(iid).c_str() << "> Not Found");\
-            return E_NOINTERFACE;\
-        };\
-        WXOLE_TRACEOUT("QI : <" << desc <<">");\
-        ((IUnknown * )(*ppvObject))->AddRef();\
-        return S_OK;\
-    };\
-    ULONG STDMETHODCALLTYPE cls::AddRef()\
-    {\
-        WXOLE_TRACEOUT(# cls << "::Add ref(" << refCount.l << ")");\
-        InterlockedIncrement(&refCount.l);\
-        return refCount.l;\
-    };\
-    ULONG STDMETHODCALLTYPE cls::Release()\
-    {\
-        if (refCount.l > 0)\
-        {\
-            InterlockedDecrement(&refCount.l);\
-            WXOLE_TRACEOUT(# cls << "::Del ref(" << refCount.l << ")");\
-            if (refCount.l == 0)\
-            {\
-                delete this;\
-                return 0;\
-            };\
-            return refCount.l;\
-        }\
-        else\
-            return 0;\
-    }\
-    ULONG STDMETHODCALLTYPE cls::AddLock()\
-    {\
-        WXOLE_TRACEOUT(# cls << "::Add Lock(" << lockCount.l << ")");\
-        InterlockedIncrement(&lockCount.l);\
-        return lockCount.l;\
-    };\
-    ULONG STDMETHODCALLTYPE cls::ReleaseLock()\
-    {\
-        if (lockCount.l > 0)\
-        {\
-            InterlockedDecrement(&lockCount.l);\
-            WXOLE_TRACEOUT(# cls << "::Del Lock(" << lockCount.l << ")");\
-            return lockCount.l;\
-        }\
-        else\
-            return 0;\
-    }\
-    DEFINE_OLE_BASE(cls)
-
-#define DEFINE_OLE_BASE(cls)\
-    void cls::_GetInterface(cls *self, REFIID iid, void **_interface, const char *&desc)\
-    {\
-        *_interface = NULL;\
-        desc = NULL;
-
-#define OLE_INTERFACE(_iid, _type)\
-    if (IsEqualIID(iid, _iid))\
-    {\
-        WXOLE_TRACE("Found Interface <" # _type ">");\
-        *_interface = (IUnknown *) (_type *) self;\
-        desc = # _iid;\
-        return;\
-    }
-
-#define OLE_IINTERFACE(_face) OLE_INTERFACE(IID_##_face, _face)
-
-#define OLE_INTERFACE_CUSTOM(func)\
-    if (func(self, iid, _interface, desc))\
-    {\
-        return;\
-    }
-
-#define END_OLE_TABLE\
-    }
-
-
-/// Main class for embedding a ActiveX control.
-/// Use by itself or derive from it
-/// \note The utility program (wxie) can generate a list of events, methods & properties
-/// for a control. 
-/// First display the control (File|Display), 
-/// then get the type info (ActiveX|Get Type Info) - these are copied to the clipboard. 
-/// Eventually this will be expanded to autogenerate 
-/// wxWindows source files for a control with all methods etc encapsulated.
-/// \par Usage: 
-///     construct using a ProgId or class id
-///     \code new wxActiveX(parent, CLSID_WebBrowser, id, pos, size, style, name)\endcode
-///     \code new wxActiveX(parent, "ShockwaveFlash.ShockwaveFlash", id, pos, size, style, name)\endcode
-/// \par Properties
-/// Properties can be set using \c SetProp() and set/retrieved using \c Prop()
-///         \code SetProp(name, wxVariant(x)) \endcode or 
-///         \code wxString Prop("<name>") = x\endcode
-///         \code wxString result = Prop("<name>")\endcode
-///         \code flash_ctl.Prop("movie") = "file:///movies/test.swf";\endcode
-///         \code flash_ctl.Prop("Playing") = false;\endcode
-///         \code wxString current_movie = flash_ctl.Prop("movie");\endcode
-/// \par Methods
-/// Methods are invoked with \c CallMethod()
-/// \code wxVariant result = CallMethod("<name>", args, nargs = -1)\endcode
-/// \code wxVariant args[] = {0L, "file:///e:/dev/wxie/bug-zap.swf"};
-/// wxVariant result = X->CallMethod("LoadMovie", args);\endcode
-/// \par events
-/// respond to events with the
-///         \c EVT_ACTIVEX(controlId, eventName, handler) & 
-///         \c EVT_ACTIVEX_DISPID(controlId, eventDispId, handler) macros
-/// \code
-/// BEGIN_EVENT_TABLE(wxIEFrame, wxFrame)
-///     EVT_ACTIVEX_DISPID(ID_MSHTML, DISPID_STATUSTEXTCHANGE,  OnMSHTMLStatusTextChangeX)
-///     EVT_ACTIVEX(ID_MSHTML, "BeforeNavigate2",   OnMSHTMLBeforeNavigate2X)
-///     EVT_ACTIVEX(ID_MSHTML, "TitleChange",       OnMSHTMLTitleChangeX)
-///     EVT_ACTIVEX(ID_MSHTML, "NewWindow2",        OnMSHTMLNewWindow2X)
-///     EVT_ACTIVEX(ID_MSHTML, "ProgressChange",    OnMSHTMLProgressChangeX)
-/// END_EVENT_TABLE()\endcode
-class wxActiveX : public wxWindow {
-public:
-    /// General parameter and return type infoformation for Events, Properties and Methods.
-    /// refer to ELEMDESC, IDLDESC in MSDN
-    class ParamX 
-    {
-    public:
-        USHORT      flags;
-        bool        isPtr;
-        bool        isSafeArray;
-        bool        isOptional;
-        VARTYPE     vt;
-        wxString    name;
-
-        ParamX() : isOptional(false), vt(VT_EMPTY) {}
-        inline bool IsIn() const        {return (flags & IDLFLAG_FIN) != 0;}
-        inline bool IsOut() const       {return (flags & IDLFLAG_FOUT) != 0;}
-        inline bool IsRetVal() const    {return (flags & IDLFLAG_FRETVAL) != 0;}
-    };
-    typedef vector<ParamX>  ParamXArray;
-
-    
-    /// Type & Parameter info for Events and Methods.
-    /// refer to FUNCDESC in MSDN
-    class FuncX 
-    {
-    public:
-        wxString    name;
-        MEMBERID    memid;
-        bool        hasOut;
-
-        ParamX      retType;
-        ParamXArray params;
-    };
-    typedef vector<FuncX>  FuncXArray;
-
-    
-    /// Type info for properties.
-    class PropX
-    {
-    public:
-        wxString    name;
-        MEMBERID    memid;
-        ParamX      type;
-        ParamX      arg;
-        bool        putByRef;
-
-        PropX() : putByRef (false) {}
-        inline bool CanGet() const {return type.vt != VT_EMPTY;}
-        inline bool CanSet() const {return arg.vt != VT_EMPTY;}
-    };
-    typedef vector<PropX>  PropXArray;
-
-    
-    /// Create using clsid.
-    wxActiveX(wxWindow * parent, REFCLSID clsid, wxWindowID id = -1,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxPanelNameStr);
-    /// create using progid.
-    wxActiveX(wxWindow * parent, const wxString& progId, wxWindowID id = -1,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxPanelNameStr);
-    virtual ~wxActiveX();
-
-    /// Number of events defined for this control.
-    inline int GetEventCount() const {return m_events.size();}
-    /// returns event description by index.
-    /// throws exception for invalid index
-    const FuncX& GetEventDesc(int idx) const;
-
-    /// Number of properties defined for this control.
-    inline int GetPropCount() const {return m_props.size();}
-    /// returns property description by index.
-    /// throws exception for invalid index
-    const PropX& GetPropDesc(int idx) const;
-    /// returns property description by name.
-    /// throws exception for invalid name
-    const PropX& GetPropDesc(const wxString& name) const;
-
-    /// Number of methods defined for this control.
-    inline int GetMethodCount() const {return m_methods.size();}
-    /// returns method description by name.
-    /// throws exception for invalid index
-    const FuncX& GetMethodDesc(int idx) const;
-    /// returns method description by name.
-    /// throws exception for invalid name
-    const FuncX& GetMethodDesc(const wxString& name) const;
-
-    /// Set property VARIANTARG value by MEMBERID.
-    void SetProp(MEMBERID name, VARIANTARG& value);
-    /// Set property using wxVariant by name.
-    void SetProp(const wxString &name, const wxVariant &value);
-    
-    class wxPropertySetter
-    {
-    public:
-        wxActiveX *m_ctl;
-        wxString m_propName;
-
-        wxPropertySetter(wxActiveX *ctl, const wxString& propName) : 
-            m_ctl(ctl), m_propName(propName) {}
-        
-        inline const wxPropertySetter& operator = (wxVariant v) const
-        {
-            m_ctl->SetProp(m_propName, v);
-            return *this;
-        };
-
-        inline operator wxVariant() const   {return m_ctl->GetPropAsWxVariant(m_propName);};
-        inline operator wxString() const    {return m_ctl->GetPropAsString(m_propName);};
-        inline operator char() const        {return m_ctl->GetPropAsChar(m_propName);};
-        inline operator long() const        {return m_ctl->GetPropAsLong(m_propName);};
-        inline operator bool() const        {return m_ctl->GetPropAsBool(m_propName);};
-        inline operator double() const      {return m_ctl->GetPropAsDouble(m_propName);};
-        inline operator wxDateTime() const  {return m_ctl->GetPropAsDateTime(m_propName);};
-        inline operator void *() const      {return m_ctl->GetPropAsPointer(m_propName);};
-    };
-
-    /// \fn inline wxPropertySetter Prop(wxString name) {return wxPropertySetter(this, name);}
-    /// \param name Property name to read/set
-    /// \return wxPropertySetter, which has overloads for setting/getting the property
-    /// \brief Generic Get/Set Property by name.
-    /// Automatically handles most types
-    /// \par Usage:
-    ///     - Prop("\<name\>") =  \<value\>
-    ///     - var = Prop("\<name\>")
-    ///     - e.g:
-    ///         - \code flash_ctl.Prop("movie") = "file:///movies/test.swf";\endcode
-    ///         - \code flash_ctl.Prop("Playing") = false;\endcode
-    ///         - \code wxString current_movie = flash_ctl.Prop("movie");\endcode
-    /// \exception raises exception if \<name\> is invalid
-    /// \note Have to add a few more type conversions yet ...
-    inline wxPropertySetter Prop(wxString name) {return wxPropertySetter(this, name);}
-
-    VARIANT GetPropAsVariant(MEMBERID name);
-    VARIANT GetPropAsVariant(const wxString& name);
-    wxVariant GetPropAsWxVariant(const wxString& name);
-    wxString GetPropAsString(const wxString& name);
-    char GetPropAsChar(const wxString& name);
-    long GetPropAsLong(const wxString& name);
-    bool GetPropAsBool(const wxString& name);
-    double GetPropAsDouble(const wxString& name);
-    wxDateTime GetPropAsDateTime(const wxString& name);
-    void *GetPropAsPointer(const wxString& name);
-
-    // methods
-    // VARIANTARG form is passed straight to Invoke, 
-    // so args in *REVERSE* order
-    VARIANT CallMethod(MEMBERID name, VARIANTARG args[], int argc);
-    VARIANT CallMethod(const wxString& name, VARIANTARG args[] = NULL, int argc = -1);
-    // args are in *NORMAL* order
-    // args can be a single wxVariant or an array
-    /// \fn wxVariant CallMethod(wxString name, wxVariant args[], int nargs = -1);
-    /// \param name name of method to call
-    /// \param args array of wxVariant's, defaults to NULL (no args)
-    /// \param nargs number of arguments passed via args. Defaults to actual number of args for the method
-    /// \return wxVariant
-    /// \brief Call a method of the ActiveX control.
-    /// Automatically handles most types
-    /// \par Usage:
-    ///     - result = CallMethod("\<name\>", args, nargs)
-    ///     - e.g.
-    ///     - \code
-    ///     wxVariant args[] = {0L, "file:///e:/dev/wxie/bug-zap.swf"};
-    ///     wxVariant result = X->CallMethod("LoadMovie", args);\endcode
-    /// \exception raises exception if \<name\> is invalid
-    /// \note Since wxVariant has built in type conversion, most the std types can be passed easily
-    wxVariant CallMethod(const wxString& name, wxVariant args[], int nargs = -1);
-
-    HRESULT ConnectAdvise(REFIID riid, IUnknown *eventSink);
-
-    void OnSize(wxSizeEvent&);
-    void OnPaint(wxPaintEvent& event);
-    void OnMouse(wxMouseEvent& event);
-    void OnSetFocus(wxFocusEvent&);
-    void OnKillFocus(wxFocusEvent&);
-
-    DECLARE_EVENT_TABLE();
-
-protected:
-    friend class FrameSite;
-    friend class wxActiveXEvents;
-
-    unsigned long m_pdwRegister;
-        
-    typedef map<MEMBERID, int>                                  MemberIdMap;
-    typedef map<wxString, int, NS_wxActiveX::less_wxStringI>    NameMap;
-    
-    typedef wxAutoOleInterface<IConnectionPoint>    wxOleConnectionPoint;
-    typedef pair<wxOleConnectionPoint, DWORD>       wxOleConnection;
-    typedef vector<wxOleConnection>                 wxOleConnectionArray;
-
-    wxAutoOleInterface<IDispatch>           m_Dispatch;
-    wxAutoOleInterface<IOleClientSite>      m_clientSite;
-    wxAutoOleInterface<IUnknown>            m_ActiveX;
-    wxAutoOleInterface<IOleObject>          m_oleObject;
-    wxAutoOleInterface<IOleInPlaceObject>   m_oleInPlaceObject;
-    wxAutoOleInterface<IOleInPlaceActiveObject>
-
-                                            m_oleInPlaceActiveObject;
-    wxAutoOleInterface<IOleDocumentView>    m_docView;
-    wxAutoOleInterface<IViewObject>         m_viewObject;
-    HWND m_oleObjectHWND;
-    bool m_bAmbientUserMode;
-    DWORD m_docAdviseCookie;
-    wxOleConnectionArray                    m_connections;
-
-    void CreateActiveX(REFCLSID clsid);
-    void CreateActiveX(LPOLESTR progId);
-    HRESULT AmbientPropertyChanged(DISPID dispid);
-
-    void GetTypeInfo();
-    void GetTypeInfo(ITypeInfo *ti, bool defInterface, bool defEventSink);
-
-
-    // events
-    FuncXArray      m_events;
-    MemberIdMap     m_eventMemberIds;
-
-    // properties
-    PropXArray      m_props;
-    NameMap         m_propNames;
-
-    // Methods
-    FuncXArray      m_methods;
-    NameMap         m_methodNames;
-
-    virtual bool MSWTranslateMessage(WXMSG* pMsg);
-    long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-    DECLARE_CLASS(wxActiveX)
-};
-
-// events
-class wxActiveXEvent : public wxCommandEvent
-{
-private:
-    friend class wxActiveXEvents;
-
-    wxVariant m_params;
-
-public:
-
-    virtual wxEvent *Clone() const { return new wxActiveXEvent(*this); }
-
-    wxString EventName();
-    int ParamCount() const;
-    wxString ParamType(int idx);
-    wxString ParamName(int idx);
-    wxVariant& operator[] (int idx);
-    wxVariant& operator[] (wxString name);
-
-private:
-    DECLARE_CLASS(wxActiveXEvent)
-};
-
-const wxEventType& RegisterActiveXEvent(const wxChar *eventName);
-const wxEventType& RegisterActiveXEvent(DISPID event);
-
-typedef void (wxEvtHandler::*wxActiveXEventFunction)(wxActiveXEvent&);
-
-/// \def EVT_ACTIVEX(id, eventName, fn)
-/// \brief Event handle for events by name
-#define EVT_ACTIVEX(id, eventName, fn) DECLARE_EVENT_TABLE_ENTRY(RegisterActiveXEvent(wxT(eventName)), id, -1, (wxObjectEventFunction) (wxEventFunction) (wxActiveXEventFunction) & fn, (wxObject *) NULL ),
-/// \def EVT_ACTIVEX_DISPID(id, eventDispId, fn)
-/// \brief Event handle for events by DISPID (dispath id)
-#define EVT_ACTIVEX_DISPID(id, eventDispId, fn) DECLARE_EVENT_TABLE_ENTRY(RegisterActiveXEvent(eventDispId), id, -1, (wxObjectEventFunction) (wxEventFunction) (wxActiveXEventFunction) & fn, (wxObject *) NULL ),
-
-//util
-bool wxDateTimeToVariant(wxDateTime dt, VARIANTARG& va);
-bool VariantToWxDateTime(VARIANTARG va, wxDateTime& dt);
-/// \relates wxActiveX
-/// \fn bool MSWVariantToVariant(VARIANTARG& va, wxVariant& vx);
-/// \param va VARAIANTARG to convert from
-/// \param vx Destination wxVariant
-/// \return success/failure (true/false)
-/// \brief Convert MSW VARIANTARG to wxVariant.
-/// Handles basic types, need to add:
-/// - VT_ARRAY | VT_*
-/// - better support for VT_UNKNOWN (currently treated as void *)
-/// - better support for VT_DISPATCH (currently treated as void *)
-bool MSWVariantToVariant(VARIANTARG& va, wxVariant& vx);
-/// \relates wxActiveX
-/// \fn bool VariantToMSWVariant(const wxVariant& vx, VARIANTARG& va);
-/// \param vx wxVariant to convert from
-/// \param va Destination VARIANTARG
-/// \return success/failure (true/false)
-/// \brief Convert wxVariant to MSW VARIANTARG.
-/// Handles basic types, need to add:
-/// - VT_ARRAY | VT_*
-/// - better support for VT_UNKNOWN (currently treated as void *)
-/// - better support for VT_DISPATCH (currently treated as void *)
-bool VariantToMSWVariant(const wxVariant& vx, VARIANTARG& va);
-
-#endif /* _IEHTMLWIN_H_ */

wxPython/contrib/activex/wxie/zip.bat

@@ -1,2 +0,0 @@
-del wxie.zip
-pkzip -max -add -dir -recurse -excl=CVS\*.* -excl=CVS\*.* -excl=debug\*.* wxie *.*

wxPython/contrib/dllwidget/dllwidget.cpp

@@ -1,123 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dllwidget.cpp
-// Purpose:     Dynamically loadable C++ widget for wxPython
-// Author:      Vaclav Slavik
-// Created:     2001/12/03
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/defs.h"
-#include "wx/dynlib.h"
-#include "wx/sizer.h"
-
-#include "dllwidget.h"
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxDllWidget, wxPanel)
-
-wxDllWidget::wxDllWidget(wxWindow *parent,
-                         wxWindowID id,
-                         const wxString& dllName, const wxString& className,
-                         const wxPoint& pos, const wxSize& size,
-                         long style)
-    : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER,
-              className + wxT("_container")),
-    m_widget(NULL), m_lib(NULL), m_controlAdded(false)
-{
-    SetBackgroundColour(wxColour(255, 0, 255));
-    if ( !!className )
-        LoadWidget(dllName, className, style);
-}
-
-wxDllWidget::~wxDllWidget()
-{
-    UnloadWidget();
-}
-
-void wxDllWidget::AddChild(wxWindowBase *child)
-{
-    wxASSERT_MSG( !m_controlAdded, wxT("Couldn't load two widgets into one container!") );
-
-    wxPanel::AddChild(child);
-
-    m_controlAdded = true;
-    wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
-    sizer->Add((wxWindow*)child, 1, wxEXPAND);
-    SetSizer(sizer);
-    Layout();
-}
-
-
-wxString wxDllWidget::GetDllExt()
-{
-    return wxDllLoader::GetDllExt();
-}
-
-
-typedef WXDLLEXPORT bool (*DLL_WidgetFactory_t)(const wxString& className,
-                                                wxWindow *parent,
-                                                long style,
-                                                wxWindow **classInst,
-                                                wxSendCommandFunc *cmdFunc);
-
-bool wxDllWidget::LoadWidget(const wxString& dll, const wxString& className,
-                             long style)
-{
-    UnloadWidget();
-
-    // Load the dynamic library
-    m_lib = new wxDynamicLibrary(dll);
-    if ( !m_lib->IsLoaded() )
-    {
-        delete m_lib;
-        m_lib = NULL;
-        return false;
-    }
-
-    DLL_WidgetFactory_t factory;
-    factory = (DLL_WidgetFactory_t) m_lib->GetSymbol(wxT("DLL_WidgetFactory"));
-    if ( factory == NULL)
-    {
-        delete m_lib;
-        m_lib = NULL;
-        return false;
-    }
-
-    if ( !factory(className, this, style, &m_widget, &m_cmdFunc) )
-    {
-        delete m_widget;
-        delete m_lib;
-        m_lib = NULL;
-        m_widget = NULL;
-        return false;
-    }
-
-    return true;
-}
-
-void wxDllWidget::UnloadWidget()
-{
-    if ( m_widget )
-    {
-        DestroyChildren();
-        m_widget = NULL;
-        delete m_lib;
-        m_lib = NULL;
-    }
-}
-
-int wxDllWidget::SendCommand(int cmd, const wxString& param)
-{
-    wxASSERT_MSG( m_widget && m_cmdFunc, wxT("Sending command to not loaded widget!"));
-
-    return m_cmdFunc(m_widget, cmd, param);
-}

wxPython/contrib/dllwidget/dllwidget.h

@@ -1,139 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dllwidget.h
-// Purpose:     Dynamically loadable C++ widget for wxPython
-// Author:      Vaclav Slavik
-// Created:     2001/12/03
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __DLLWIDGET_H__
-#define __DLLWIDGET_H__
-
-#include "wx/panel.h"
-
-/*
-
-wxDllWidget can be used to embed a wxWindow implemented in C++ in your
-wxPython application without the need to write a SWIG interface. Widget's code
-is stored in shared library or DLL that exports DLL_WidgetFactory symbol
-and loaded at runtime. All you have to do is to pass the name of DLL and the class
-to create to wxDllWidget's ctor.
-
-Runtime-loadable widget must have HandleCommand method (see the example) that is
-used to communicate with Python app. You call wxDllWidget.SendCommand(cmd,param) from
-Python and it in turn calls HandleCommand of the loaded widget.
-
-You must use DECLARE_DLL_WIDGET, BEGIN_WIDGET_LIBRARY, END_WIDGET_LIBRARY and
-REGISTER_WIDGET macros in your C++ module in order to provide all the meat
-wxDllWidget needs.
-
-Example of use:
-
-    #define CMD_MAKEWHITE     1
-
-    class MyWindow : public wxWindow
-    {
-    public:
-        MyWindow(wxWindow *parent, long style)
-            : wxWindow(parent, wxID_ANY) {}
-
-        int HandleCommand(int cmd, const wxString& param)
-        {
-            if (cmd == CMD_MAKEWHITE)
-                SetBackgroundColour(*wxWHITE);
-            return 0;
-        }
-    };
-    DECLARE_DLL_WIDGET(MyWindow)
-
-    class MyCanvasWindow : public wxScrolledWindow
-    {
-        ...
-    };
-    DECLARE_DLL_WIDGET(MyCanvasWindow)
-
-    BEGIN_WIDGET_LIBRARY()
-        REGISTER_WIDGET(MyWindow)
-        REGISTER_WIDGET(MyCanvasWindow)
-    END_WIDGET_LIBRARY()
-
-*/
-
-
-
-class WXDLLEXPORT wxDynamicLibrary;
-
-typedef int (*wxSendCommandFunc)(wxWindow *wnd, int cmd, const wxString& param);
-
-class wxDllWidget : public wxPanel
-{
-public:
-    wxDllWidget(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxString& dllName = wxEmptyString,
-                const wxString& className = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0);
-    virtual ~wxDllWidget();
-
-    bool Ok() { return m_widget != NULL; }
-
-    virtual int SendCommand(int cmd, const wxString& param = wxEmptyString);
-    virtual wxWindow* GetWidgetWindow() { return m_widget; }
-
-    virtual void AddChild(wxWindowBase *child);
-
-    static wxString GetDllExt();
-
-
-protected:
-    bool LoadWidget(const wxString& dll, const wxString& className, long style);
-    void UnloadWidget();
-
-protected:
-    wxWindow*           m_widget;
-    wxSendCommandFunc   m_cmdFunc;
-    wxDynamicLibrary*   m_lib;
-    bool                m_controlAdded;
-
-private:
-    DECLARE_ABSTRACT_CLASS(wxDllWidget)
-};
-
-
-#define DECLARE_DLL_WIDGET(widget) \
-    static int SendCommandTo##widget(wxWindow *wnd, int cmd, const wxString& param) \
-    { \
-        return wxStaticCast(wnd, widget)->HandleCommand(cmd, param); \
-    }
-
-
-#define BEGIN_WIDGET_LIBRARY() \
-    extern "C" WXEXPORT bool DLL_WidgetFactory( \
-                const wxString& className, \
-                wxWindow *parent, \
-                long style, \
-                wxWindow **classInst, \
-                wxSendCommandFunc *cmdFunc) \
-    { \
-        wxClassInfo::CleanUpClasses(); \
-        wxClassInfo::InitializeClasses();
-
-
-#define REGISTER_WIDGET(widget) \
-        if ( className == wxT(#widget) ) \
-        { \
-            *classInst = new widget(parent, style); \
-            *cmdFunc = SendCommandTo##widget; \
-            return true; \
-        }
-
-
-#define END_WIDGET_LIBRARY() \
-       return false; \
-    }
-
-#endif // __DLLWIDGET_H__

wxPython/contrib/dllwidget/dllwidget.py

@@ -1,6 +0,0 @@
-# The SWIG module is named dllwidget_ to avoid name clashes, so
-# this stub just imports everything in it so the friendly module
-# name can be used elsewhere.
-
-from dllwidget_ import *
-

wxPython/contrib/dllwidget/dllwidget_.cpp

@@ -1,467 +0,0 @@
-/*
- * FILE : contrib/dllwidget/dllwidget_.cpp
- * 
- * This file was automatically generated by :
- * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Build 883)
- * 
- * Portions Copyright (c) 1995-1998
- * The University of Utah and The Regents of the University of California.
- * Permission is granted to distribute this file in any manner provided
- * this notice remains intact.
- * 
- * Do not make changes to this file--changes will be lost!
- *
- */
-
-
-#define SWIGCODE
-/* Implementation : PYTHON */
-
-#define SWIGPYTHON
-#include "Python.h"
-
-#include <string.h>
-#include <stdlib.h>
-/* Definitions for Windows/Unix exporting */
-#if defined(__WIN32__)
-#   if defined(_MSC_VER)
-#	define SWIGEXPORT(a) __declspec(dllexport) a
-#   else
-#	if defined(__BORLANDC__)
-#	    define SWIGEXPORT(a) a _export
-#	else
-#	    define SWIGEXPORT(a) a
-#	endif
-#   endif
-#else
-#   define SWIGEXPORT(a) a
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern void SWIG_MakePtr(char *, void *, char *);
-extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
-extern char *SWIG_GetPtr(char *, void **, char *);
-extern char *SWIG_GetPtrObj(PyObject *, void **, char *);
-extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
-extern PyObject *SWIG_newvarlink(void);
-#ifdef __cplusplus
-}
-#endif
-#define SWIG_init    initdllwidget_c
-
-#define SWIG_name    "dllwidget_c"
-
-#include "wxPython.h"
-#include "dllwidget.h"
-
-
-static PyObject* t_output_helper(PyObject* target, PyObject* o) {
-    PyObject*   o2;
-    PyObject*   o3;
-
-    if (!target) {
-        target = o;
-    } else if (target == Py_None) {
-        Py_DECREF(Py_None);
-        target = o;
-    } else {
-        if (!PyTuple_Check(target)) {
-            o2 = target;
-            target = PyTuple_New(1);
-            PyTuple_SetItem(target, 0, o2);
-        }
-        o3 = PyTuple_New(1);
-        PyTuple_SetItem(o3, 0, o);
-
-        o2 = target;
-        target = PySequence_Concat(o2, o3);
-        Py_DECREF(o2);
-        Py_DECREF(o3);
-    }
-    return target;
-}
-
-    // Put some wx default wxChar* values into wxStrings.
-    static const wxString wxPyEmptyString(wxT(""));
-#ifdef __cplusplus
-extern "C" {
-#endif
-static void *SwigwxDllWidgetTowxPanel(void *ptr) {
-    wxDllWidget *src;
-    wxPanel *dest;
-    src = (wxDllWidget *) ptr;
-    dest = (wxPanel *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxDllWidgetTowxWindow(void *ptr) {
-    wxDllWidget *src;
-    wxWindow *dest;
-    src = (wxDllWidget *) ptr;
-    dest = (wxWindow *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxDllWidgetTowxEvtHandler(void *ptr) {
-    wxDllWidget *src;
-    wxEvtHandler *dest;
-    src = (wxDllWidget *) ptr;
-    dest = (wxEvtHandler *) src;
-    return (void *) dest;
-}
-
-static void *SwigwxDllWidgetTowxObject(void *ptr) {
-    wxDllWidget *src;
-    wxObject *dest;
-    src = (wxDllWidget *) ptr;
-    dest = (wxObject *) src;
-    return (void *) dest;
-}
-
-#define new_wxDllWidget(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxDllWidget(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxDllWidget(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxDllWidget * _result;
-    wxWindow * _arg0;
-    wxWindowID  _arg1 = (wxWindowID ) -1;
-    wxString * _arg2 = (wxString *) &wxPyEmptyString;
-    wxString * _arg3 = (wxString *) &wxPyEmptyString;
-    wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;
-    wxSize * _arg5 = (wxSize *) &wxDefaultSize;
-    long  _arg6 = (long ) 0;
-    PyObject * _argo0 = 0;
-    PyObject * _obj2 = 0;
-    PyObject * _obj3 = 0;
-    wxPoint  temp;
-    PyObject * _obj4 = 0;
-    wxSize  temp0;
-    PyObject * _obj5 = 0;
-    char *_kwnames[] = { "parent","id","dllName","className","pos","size","style", NULL };
-    char _ptemp[128];
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOOOl:new_wxDllWidget",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_obj4,&_obj5,&_arg6)) 
-        return NULL;
-    if (_argo0) {
-        if (_argo0 == Py_None) { _arg0 = NULL; }
-        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDllWidget. Expected _wxWindow_p.");
-        return NULL;
-        }
-    }
-    if (_obj2)
-{
-    _arg2 = wxString_in_helper(_obj2);
-    if (_arg2 == NULL)
-        return NULL;
-}
-    if (_obj3)
-{
-    _arg3 = wxString_in_helper(_obj3);
-    if (_arg3 == NULL)
-        return NULL;
-}
-    if (_obj4)
-{
-    _arg4 = &temp;
-    if (! wxPoint_helper(_obj4, &_arg4))
-        return NULL;
-}
-    if (_obj5)
-{
-    _arg5 = &temp0;
-    if (! wxSize_helper(_obj5, &_arg5))
-        return NULL;
-}
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (wxDllWidget *)new_wxDllWidget(_arg0,_arg1,*_arg2,*_arg3,*_arg4,*_arg5,_arg6);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    if (_result) {
-        SWIG_MakePtr(_ptemp, (char *) _result,"_wxDllWidget_p");
-        _resultobj = Py_BuildValue("s",_ptemp);
-    } else {
-        Py_INCREF(Py_None);
-        _resultobj = Py_None;
-    }
-{
-    if (_obj2)
-        delete _arg2;
-}
-{
-    if (_obj3)
-        delete _arg3;
-}
-    return _resultobj;
-}
-
-#define wxDllWidget_Ok(_swigobj)  (_swigobj->Ok())
-static PyObject *_wrap_wxDllWidget_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    bool  _result;
-    wxDllWidget * _arg0;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDllWidget_Ok",_kwnames,&_argo0)) 
-        return NULL;
-    if (_argo0) {
-        if (_argo0 == Py_None) { _arg0 = NULL; }
-        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDllWidget_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDllWidget_Ok. Expected _wxDllWidget_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (bool )wxDllWidget_Ok(_arg0);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxDllWidget_SendCommand(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SendCommand(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxDllWidget_SendCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    int  _result;
-    wxDllWidget * _arg0;
-    int  _arg1;
-    wxString * _arg2 = (wxString *) &wxPyEmptyString;
-    PyObject * _argo0 = 0;
-    PyObject * _obj2 = 0;
-    char *_kwnames[] = { "self","cmd","param", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|O:wxDllWidget_SendCommand",_kwnames,&_argo0,&_arg1,&_obj2)) 
-        return NULL;
-    if (_argo0) {
-        if (_argo0 == Py_None) { _arg0 = NULL; }
-        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDllWidget_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDllWidget_SendCommand. Expected _wxDllWidget_p.");
-        return NULL;
-        }
-    }
-    if (_obj2)
-{
-    _arg2 = wxString_in_helper(_obj2);
-    if (_arg2 == NULL)
-        return NULL;
-}
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (int )wxDllWidget_SendCommand(_arg0,_arg1,*_arg2);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}    _resultobj = Py_BuildValue("i",_result);
-{
-    if (_obj2)
-        delete _arg2;
-}
-    return _resultobj;
-}
-
-#define wxDllWidget_GetWidgetWindow(_swigobj)  (_swigobj->GetWidgetWindow())
-static PyObject *_wrap_wxDllWidget_GetWidgetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxWindow * _result;
-    wxDllWidget * _arg0;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDllWidget_GetWidgetWindow",_kwnames,&_argo0)) 
-        return NULL;
-    if (_argo0) {
-        if (_argo0 == Py_None) { _arg0 = NULL; }
-        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDllWidget_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDllWidget_GetWidgetWindow. Expected _wxDllWidget_p.");
-        return NULL;
-        }
-    }
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = (wxWindow *)wxDllWidget_GetWidgetWindow(_arg0);
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}{ _resultobj = wxPyMake_wxObject(_result); }
-    return _resultobj;
-}
-
-static PyObject *_wrap_wxDllWidget_GetDllExt(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxString * _result;
-    char *_kwnames[] = {  NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxDllWidget_GetDllExt",_kwnames)) 
-        return NULL;
-{
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    _result = new wxString (wxDllWidget::GetDllExt());
-
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) return NULL;
-}{
-#if wxUSE_UNICODE
-    _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
-#else
-    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
-#endif
-}
-{
-    delete _result;
-}
-    return _resultobj;
-}
-
-static PyMethodDef dllwidget_cMethods[] = {
-	 { "wxDllWidget_GetDllExt", (PyCFunction) _wrap_wxDllWidget_GetDllExt, METH_VARARGS | METH_KEYWORDS },
-	 { "wxDllWidget_GetWidgetWindow", (PyCFunction) _wrap_wxDllWidget_GetWidgetWindow, METH_VARARGS | METH_KEYWORDS },
-	 { "wxDllWidget_SendCommand", (PyCFunction) _wrap_wxDllWidget_SendCommand, METH_VARARGS | METH_KEYWORDS },
-	 { "wxDllWidget_Ok", (PyCFunction) _wrap_wxDllWidget_Ok, METH_VARARGS | METH_KEYWORDS },
-	 { "new_wxDllWidget", (PyCFunction) _wrap_new_wxDllWidget, METH_VARARGS | METH_KEYWORDS },
-	 { NULL, NULL }
-};
-#ifdef __cplusplus
-}
-#endif
-/*
- * This table is used by the pointer type-checker
- */
-static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
-    { "_signed_long","_long",0},
-    { "_wxPrintQuality","_wxCoord",0},
-    { "_wxPrintQuality","_int",0},
-    { "_wxPrintQuality","_signed_int",0},
-    { "_wxPrintQuality","_unsigned_int",0},
-    { "_wxPrintQuality","_wxWindowID",0},
-    { "_wxPrintQuality","_uint",0},
-    { "_wxPrintQuality","_EBool",0},
-    { "_wxPrintQuality","_size_t",0},
-    { "_wxPrintQuality","_time_t",0},
-    { "_byte","_unsigned_char",0},
-    { "_long","_unsigned_long",0},
-    { "_long","_signed_long",0},
-    { "_size_t","_wxCoord",0},
-    { "_size_t","_wxPrintQuality",0},
-    { "_size_t","_time_t",0},
-    { "_size_t","_unsigned_int",0},
-    { "_size_t","_int",0},
-    { "_size_t","_wxWindowID",0},
-    { "_size_t","_uint",0},
-    { "_wxPanel","_wxDllWidget",SwigwxDllWidgetTowxPanel},
-    { "_uint","_wxCoord",0},
-    { "_uint","_wxPrintQuality",0},
-    { "_uint","_time_t",0},
-    { "_uint","_size_t",0},
-    { "_uint","_unsigned_int",0},
-    { "_uint","_int",0},
-    { "_uint","_wxWindowID",0},
-    { "_wxChar","_char",0},
-    { "_char","_wxChar",0},
-    { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0},
-    { "_EBool","_wxCoord",0},
-    { "_EBool","_wxPrintQuality",0},
-    { "_EBool","_signed_int",0},
-    { "_EBool","_int",0},
-    { "_EBool","_wxWindowID",0},
-    { "_unsigned_long","_long",0},
-    { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0},
-    { "_signed_int","_wxCoord",0},
-    { "_signed_int","_wxPrintQuality",0},
-    { "_signed_int","_EBool",0},
-    { "_signed_int","_wxWindowID",0},
-    { "_signed_int","_int",0},
-    { "_WXTYPE","_wxDateTime_t",0},
-    { "_WXTYPE","_short",0},
-    { "_WXTYPE","_signed_short",0},
-    { "_WXTYPE","_unsigned_short",0},
-    { "_unsigned_short","_wxDateTime_t",0},
-    { "_unsigned_short","_WXTYPE",0},
-    { "_unsigned_short","_short",0},
-    { "_wxObject","_wxDllWidget",SwigwxDllWidgetTowxObject},
-    { "_signed_short","_WXTYPE",0},
-    { "_signed_short","_short",0},
-    { "_unsigned_char","_byte",0},
-    { "_unsigned_int","_wxCoord",0},
-    { "_unsigned_int","_wxPrintQuality",0},
-    { "_unsigned_int","_time_t",0},
-    { "_unsigned_int","_size_t",0},
-    { "_unsigned_int","_uint",0},
-    { "_unsigned_int","_wxWindowID",0},
-    { "_unsigned_int","_int",0},
-    { "_short","_wxDateTime_t",0},
-    { "_short","_WXTYPE",0},
-    { "_short","_unsigned_short",0},
-    { "_short","_signed_short",0},
-    { "_wxWindowID","_wxCoord",0},
-    { "_wxWindowID","_wxPrintQuality",0},
-    { "_wxWindowID","_time_t",0},
-    { "_wxWindowID","_size_t",0},
-    { "_wxWindowID","_EBool",0},
-    { "_wxWindowID","_uint",0},
-    { "_wxWindowID","_int",0},
-    { "_wxWindowID","_signed_int",0},
-    { "_wxWindowID","_unsigned_int",0},
-    { "_int","_wxCoord",0},
-    { "_int","_wxPrintQuality",0},
-    { "_int","_time_t",0},
-    { "_int","_size_t",0},
-    { "_int","_EBool",0},
-    { "_int","_uint",0},
-    { "_int","_wxWindowID",0},
-    { "_int","_unsigned_int",0},
-    { "_int","_signed_int",0},
-    { "_wxDateTime_t","_unsigned_short",0},
-    { "_wxDateTime_t","_short",0},
-    { "_wxDateTime_t","_WXTYPE",0},
-    { "_time_t","_wxCoord",0},
-    { "_time_t","_wxPrintQuality",0},
-    { "_time_t","_unsigned_int",0},
-    { "_time_t","_int",0},
-    { "_time_t","_wxWindowID",0},
-    { "_time_t","_uint",0},
-    { "_time_t","_size_t",0},
-    { "_wxCoord","_int",0},
-    { "_wxCoord","_signed_int",0},
-    { "_wxCoord","_unsigned_int",0},
-    { "_wxCoord","_wxWindowID",0},
-    { "_wxCoord","_uint",0},
-    { "_wxCoord","_EBool",0},
-    { "_wxCoord","_size_t",0},
-    { "_wxCoord","_time_t",0},
-    { "_wxCoord","_wxPrintQuality",0},
-    { "_wxEvtHandler","_wxDllWidget",SwigwxDllWidgetTowxEvtHandler},
-    { "_wxWindow","_wxDllWidget",SwigwxDllWidgetTowxWindow},
-{0,0,0}};
-
-static PyObject *SWIG_globals;
-#ifdef __cplusplus
-extern "C" 
-#endif
-SWIGEXPORT(void) initdllwidget_c() {
-	 PyObject *m, *d;
-	 SWIG_globals = SWIG_newvarlink();
-	 m = Py_InitModule("dllwidget_c", dllwidget_cMethods);
-	 d = PyModule_GetDict(m);
-
-
-    wxClassInfo::CleanUpClasses();
-    wxClassInfo::InitializeClasses();
-
-{
-   int i;
-   for (i = 0; _swig_mapping[i].n1; i++)
-        SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
-}
-}

wxPython/contrib/dllwidget/dllwidget_.i

@@ -1,115 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        dllwidget_.i
-// Purpose:     Load wx widgets from external DLLs
-//
-// Author:      Robin Dunn
-//
-// Created:     04-Dec-2001
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-%module dllwidget_
-
-
-%{
-#include "wxPython.h"
-#include "dllwidget.h"
-%}
-
-//---------------------------------------------------------------------------
-
-%include typemaps.i
-%include my_typemaps.i
-
-%extern wx.i
-%extern windows.i
-%extern _defs.i
-
-//----------------------------------------------------------------------
-
-%{
-    // Put some wx default wxChar* values into wxStrings.
-    static const wxString wxPyEmptyString(wxT(""));
-%}
-
-//---------------------------------------------------------------------------
-
-/*
-
-wxDllWidget can be used to embed a wxWindow implemented in C++ in your
-wxPython application without the need to write a SWIG interface. Widget's code
-is stored in shared library or DLL that exports DLL_WidgetFactory symbol
-and loaded at runtime. All you have to do is to pass the name of DLL and the class
-to create to wxDllWidget's ctor.
-
-Runtime-loadable widget must have HandleCommand method (see the example) that is
-used to communicate with Python app. You call wxDllWidget.SendCommand(cmd,param) from
-Python and it in turn calls HandleCommand of the loaded widget.
-
-You must use DECLARE_DLL_WIDGET, BEGIN_WIDGET_LIBRARY, END_WIDGET_LIBRARY and
-REGISTER_WIDGET macros in your C++ module in order to provide all the meat
-wxDllWidget needs.
-
-Example of use:
-
-    #define CMD_MAKEWHITE     1
-
-    class MyWindow : public wxWindow
-    {
-    public:
-        MyWindow(wxWindow *parent, long style)
-            : wxWindow(parent, -1) {}
-
-        int HandleCommand(int cmd, const wxString& param)
-        {
-            if (cmd == CMD_MAKEWHITE)
-                SetBackgroundColour(*wxWHITE);
-            return 0;
-        }
-    };
-    DECLARE_DLL_WIDGET(MyWindow)
-
-    class MyCanvasWindow : public wxScrolledWindow
-    {
-        ...
-    };
-    DECLARE_DLL_WIDGET(MyCanvasWindow)
-
-    BEGIN_WIDGET_LIBRARY()
-        REGISTER_WIDGET(MyWindow)
-        REGISTER_WIDGET(MyCanvasWindow)
-    END_WIDGET_LIBRARY()
-
-*/
-
-class wxDllWidget : public wxPanel
-{
-public:
-    wxDllWidget(wxWindow *parent,
-                wxWindowID id = -1,
-                const wxString& dllName = wxPyEmptyString,
-                const wxString& className = wxPyEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0);
-
-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
-
-    bool Ok();
-
-    int SendCommand(int cmd, const wxString& param = wxPyEmptyString);
-    wxWindow* GetWidgetWindow();
-
-    static wxString GetDllExt();
-};
-
-//---------------------------------------------------------------------------
-
-%init %{
-
-%}
-
-
-//---------------------------------------------------------------------------

wxPython/contrib/dllwidget/dllwidget_.py

@@ -1,78 +0,0 @@
-# This file was created automatically by SWIG.
-import dllwidget_c
-
-from misc import *
-
-from misc2 import *
-
-from windows import *
-
-from gdi import *
-
-from fonts import *
-
-from clip_dnd import *
-
-from events import *
-
-from streams import *
-
-from utils import *
-
-from mdi import *
-
-from frames import *
-
-from stattool import *
-
-from controls import *
-
-from controls2 import *
-
-from windows2 import *
-
-from cmndlgs import *
-
-from windows3 import *
-
-from image import *
-
-from printfw import *
-
-from sizers import *
-
-from filesys import *
-class wxDllWidgetPtr(wxPanelPtr):
-    def __init__(self,this):
-        self.this = this
-        self.thisown = 0
-    def Ok(self, *_args, **_kwargs):
-        val = dllwidget_c.wxDllWidget_Ok(self, *_args, **_kwargs)
-        return val
-    def SendCommand(self, *_args, **_kwargs):
-        val = dllwidget_c.wxDllWidget_SendCommand(self, *_args, **_kwargs)
-        return val
-    def GetWidgetWindow(self, *_args, **_kwargs):
-        val = dllwidget_c.wxDllWidget_GetWidgetWindow(self, *_args, **_kwargs)
-        return val
-    def __repr__(self):
-        return "<%s.%s instance; proxy of C++ wxDllWidget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
-class wxDllWidget(wxDllWidgetPtr):
-    def __init__(self,*_args,**_kwargs):
-        self.this = dllwidget_c.new_wxDllWidget(*_args,**_kwargs)
-        self.thisown = 1
-        self._setOORInfo(self)
-
-
-
-
-
-
-#-------------- FUNCTION WRAPPERS ------------------
-
-wxDllWidget_GetDllExt = dllwidget_c.wxDllWidget_GetDllExt
-
-
-
-#-------------- VARIABLE WRAPPERS ------------------
-

wxPython/contrib/gizmos/.cvsignore

@@ -1 +0,0 @@
-contrib

wxPython/contrib/gizmos/_treelist.i

@@ -1,710 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        _treelist.i
-// Purpose:     wxTreeListCtrl and helpers
-//
-// Author:      Robin Dunn
-//
-// Created:     12-Sept-2006
-// RCS-ID:      $Id$
-// Copyright:   (c) 2006 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-// Not a %module
-
-
-//---------------------------------------------------------------------------
-
-%{
-#include "wx/treelistctrl.h"
-#include "wx/wxPython/pytree.h"
-
-%}
-
-//---------------------------------------------------------------------------
-%newgroup
-
-
-MAKE_CONST_WXSTRING2(TreeListCtrlNameStr,    wxT("treelistctrl"));
-
-
-//----------------------------------------------------------------------------
-// wxTreeListCtrl - the multicolumn tree control
-//----------------------------------------------------------------------------
-
-
-
-enum {
-    DEFAULT_COL_WIDTH = 100
-};
-
-// modes for navigation
-enum {
-    wxTL_MODE_NAV_FULLTREE,
-    wxTL_MODE_NAV_EXPANDED,
-    wxTL_MODE_NAV_VISIBLE,
-    wxTL_MODE_NAV_LEVEL
-};
-
-// modes for FindItem
-enum {
-    wxTL_MODE_FIND_EXACT,
-    wxTL_MODE_FIND_PARTIAL,
-    wxTL_MODE_FIND_NOCASE
-};
-
-// additional flag for HitTest
-enum {
-    wxTREE_HITTEST_ONITEMCOLUMN
-};
-%pythoncode { wx.TREE_HITTEST_ONITEMCOLUMN = TREE_HITTEST_ONITEMCOLUMN }
-
-
-// additional style flags
-enum {
-    wxTR_COLUMN_LINES, // put border around items
-    wxTR_VIRTUAL      // The application provides items text on demand.
-};
-%pythoncode {
-    wx.TR_COLUMN_LINES = TR_COLUMN_LINES
-    wxTR_VIRTUAL = TR_VIRTUAL    
-}
-
-
-%pythoncode {
-%#// Compatibility aliases for old names/values
-TL_ALIGN_LEFT   = wx.ALIGN_LEFT
-TL_ALIGN_RIGHT  = wx.ALIGN_RIGHT
-TL_ALIGN_CENTER = wx.ALIGN_CENTER
-
-TL_SEARCH_VISIBLE = TL_MODE_NAV_VISIBLE
-TL_SEARCH_LEVEL   = TL_MODE_NAV_LEVEL
-TL_SEARCH_FULL    = TL_MODE_FIND_EXACT
-TL_SEARCH_PARTIAL = TL_MODE_FIND_PARTIAL
-TL_SEARCH_NOCASE  = TL_MODE_FIND_NOCASE
-
-TR_DONT_ADJUST_MAC = 0
-wx.TR_DONT_ADJUST_MAC = TR_DONT_ADJUST_MAC
-}
-
-
-
-
-class wxTreeListColumnInfo: public wxObject {
-public:
-    wxTreeListColumnInfo(const wxString& text = wxPyEmptyString,
-                         int width = DEFAULT_COL_WIDTH,
-                         int flag = wxALIGN_LEFT,
-                         int image = -1,
-                         bool shown = true,
-                         bool edit = false);
-
-    ~wxTreeListColumnInfo();
-
-    int GetAlignment() const;
-    wxString GetText() const;
-    int GetImage() const;
-    int GetSelectedImage() const;
-    size_t GetWidth() const;
-    bool IsEditable() const { return m_edit; }
-    bool IsShown() const { return m_shown; }
-
-    // TODO:  These all actually return wxTreeListColumnInfo&, any problem with doing it for Python too?
-    void SetAlignment(int alignment);
-    void SetText(const wxString& text);
-    void SetImage(int image);
-    void SetSelectedImage(int image);
-    void SetWidth(size_t with);
-    void SetEditable (bool edit);
-    void SetShown(bool shown);
-
-    %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`");
-    %property(Image, GetImage, SetImage, doc="See `GetImage` and `SetImage`");
-    %property(SelectedImage, GetSelectedImage, SetSelectedImage, doc="See `GetSelectedImage` and `SetSelectedImage`");
-    %property(Text, GetText, SetText, doc="See `GetText` and `SetText`");
-    %property(Width, GetWidth, SetWidth, doc="See `GetWidth` and `SetWidth`");
-    %property(Editable, IsEditable, SetEditable);
-    %property(Shown, IsShown, SetShown);
-};
-
-
-
-
-%{ // C++ version of Python aware control
-class wxPyTreeListCtrl : public wxTreeListCtrl {
-    DECLARE_ABSTRACT_CLASS(wxPyTreeListCtrl);
-public:
-    wxPyTreeListCtrl() : wxTreeListCtrl() {}
-    wxPyTreeListCtrl(wxWindow *parent, wxWindowID id,
-                     const wxPoint& pos,
-                     const wxSize& size,
-                     long style,
-                     const wxValidator &validator,
-                     const wxString& name) :
-        wxTreeListCtrl(parent, id, pos, size, style, validator, name) {}
-
-    virtual int OnCompareItems(const wxTreeItemId& item1,
-                               const wxTreeItemId& item2) {
-        int rval = 0;
-        bool found;
-        wxPyBlock_t blocked = wxPyBeginBlockThreads();
-        if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) {
-            PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), 0);
-            PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), 0);
-            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)",o1,o2));
-            Py_DECREF(o1);
-            Py_DECREF(o2);
-        }
-        wxPyEndBlockThreads(blocked);
-        if (! found)
-            rval = wxTreeListCtrl::OnCompareItems(item1, item2);
-        return rval;
-    }
-
-    virtual wxString  OnGetItemText( wxTreeItemData* item, long column ) const {
-        wxString rval;
-        bool found;
-        wxPyBlock_t blocked = wxPyBeginBlockThreads();
-        if ((found = wxPyCBH_findCallback(m_myInst, "OnGetItemText"))) {
-            PyObject* ro;
-            PyObject* itemo = wxPyConstructObject((void*)&item, wxT("wxTreeItemId"), 0);
-            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oi)", itemo, column));
-            Py_DECREF(itemo);
-            if (ro) {
-                rval = Py2wxString(ro);
-                Py_DECREF(ro);
-            }
-        }
-        wxPyEndBlockThreads(blocked);
-        if (! found)
-            rval = wxTreeListCtrl::OnGetItemText(item, column);
-        return rval;
-    }
-
-    PYPRIVATE;
-};
-
-IMPLEMENT_ABSTRACT_CLASS(wxPyTreeListCtrl, wxTreeListCtrl)
-
-%}
-
-
-
-
-
-
-MustHaveApp(wxPyTreeListCtrl);
-
-%rename(TreeListCtrl) wxPyTreeListCtrl;
-class wxPyTreeListCtrl : public wxControl
-{
-public:
-    %pythonAppend wxPyTreeListCtrl         "self._setOORInfo(self);" setCallbackInfo(TreeListCtrl)
-    %pythonAppend wxPyTreeListCtrl()       ""
-
-    wxPyTreeListCtrl(wxWindow *parent, wxWindowID id = -1,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = wxTR_DEFAULT_STYLE,
-                   const wxValidator &validator = wxDefaultValidator,
-                   const wxString& name = wxPyTreeListCtrlNameStr );
-    %RenameCtor(PreTreeListCtrl, wxPyTreeListCtrl());
-
-    bool Create(wxWindow *parent, wxWindowID id = -1,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxTR_DEFAULT_STYLE,
-                const wxValidator &validator = wxDefaultValidator,
-                const wxString& name = wxPyTreeListCtrlNameStr );
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-
-    // get the total number of items in the control
-    size_t GetCount() const;
-
-    // indent is the number of pixels the children are indented relative to
-    // the parents position. SetIndent() also redraws the control
-    // immediately.
-    unsigned int GetIndent() const;
-    void SetIndent(unsigned int indent);
-
-    // line spacing is the space above and below the text on each line
-    unsigned int GetLineSpacing() const;
-    void SetLineSpacing(unsigned int spacing);
-
-    // image list: these functions allow to associate an image list with
-    // the control and retrieve it. Note that when assigned with
-    // SetImageList, the control does _not_ delete
-    // the associated image list when it's deleted in order to allow image
-    // lists to be shared between different controls. If you use
-    // AssignImageList, the control _does_ delete the image list.
-    //
-    // The normal image list is for the icons which correspond to the
-    // normal tree item state (whether it is selected or not).
-    // Additionally, the application might choose to show a state icon
-    // which corresponds to an app-defined item state (for example,
-    // checked/unchecked) which are taken from the state image list.
-    wxImageList *GetImageList() const;
-    wxImageList *GetStateImageList() const;
-    wxImageList *GetButtonsImageList() const;
-
-    void SetImageList(wxImageList *imageList);
-    void SetStateImageList(wxImageList *imageList);
-    void SetButtonsImageList(wxImageList *imageList);
-
-    %disownarg( wxImageList *imageList );
-    void AssignImageList(wxImageList *imageList);
-    void AssignStateImageList(wxImageList *imageList);
-    void AssignButtonsImageList(wxImageList *imageList);
-    %cleardisown( wxImageList *imageList );
-
-
-    // adds a column
-    void AddColumn (const wxString& text,
-                    int width = DEFAULT_COL_WIDTH,
-                    int flag = wxALIGN_LEFT,
-                    int image = -1,
-                    bool shown = true,
-                    bool edit = false);
-    %Rename(AddColumnInfo,  void,  AddColumn(const wxTreeListColumnInfo& col));
-
-    // inserts a column before the given one
-    void InsertColumn (int before,
-                       const wxString& text,
-                       int width = DEFAULT_COL_WIDTH,
-                       int flag = wxALIGN_LEFT,
-                       int image = -1,
-                       bool shown = true,
-                       bool edit = false);
-    %Rename(InsertColumnInfo,  void,  InsertColumn(size_t before, const wxTreeListColumnInfo& col));
-
-    // deletes the given column - does not delete the corresponding column
-    // of each item
-    void RemoveColumn(size_t column);
-
-    // returns the number of columns in the ctrl
-    size_t GetColumnCount() const;
-
-    // tells which column is the "main" one, i.e. the "threaded" one
-    void SetMainColumn(size_t column);
-    size_t GetMainColumn() const;
-
-    void SetColumn (int column, const wxTreeListColumnInfo& colInfo);
-    wxTreeListColumnInfo& GetColumn (int column);
-
-    void SetColumnText (int column, const wxString& text);
-    wxString GetColumnText (int column) const;
-
-    void SetColumnWidth (int column, int width);
-    int GetColumnWidth (int column) const;
-
-    void SetColumnAlignment (int column, int flag);
-    int GetColumnAlignment (int column) const;
-
-    void SetColumnImage (int column, int image);
-    int GetColumnImage (int column) const;
-
-    void SetColumnShown (int column, bool shown = true);
-    bool IsColumnShown (int column) const;
-    %pythoncode { ShowColumn = SetColumnShown }
-
-    void SetColumnEditable (int column, bool edit = true);
-    bool IsColumnEditable (int column) const;
-
-
-
-
-    %extend {
-        // retrieves item's label of the given column (main column by default)
-        wxString GetItemText(const wxTreeItemId& item, int column = -1) {
-            if (column < 0) column = self->GetMainColumn();
-            return self->GetItemText(item, column);
-        }
-
-        // get one of the images associated with the item (normal by default)
-        int GetItemImage(const wxTreeItemId& item, int column = -1,
-                         wxTreeItemIcon which = wxTreeItemIcon_Normal) {
-            if (column < 0) column = self->GetMainColumn();
-            return self->GetItemImage(item, column, which);
-        }
-
-        // set item's label (main column by default)
-        void SetItemText(const wxTreeItemId& item, const wxString& text, int column = -1) {
-            if (column < 0) column = self->GetMainColumn();
-            self->SetItemText(item, column, text);
-        }
-
-        // set one of the images associated with the item (normal by default)
-        // the which parameter is ignored for all columns but the main one
-        void SetItemImage(const wxTreeItemId& item, int image, int column = -1,
-                          wxTreeItemIcon which = wxTreeItemIcon_Normal) {
-            if (column < 0) column = self->GetMainColumn();
-            self->SetItemImage(item, column, image, which);
-        }
-
-
-        // [Get|Set]ItemData substitutes.  Automatically create wxPyTreeItemData
-        // if needed.
-        wxPyTreeItemData* GetItemData(const wxTreeItemId& item) {
-            wxPyTreeItemData* data = (wxPyTreeItemData*)self->GetItemData(item);
-            if (data == NULL) {
-                data = new wxPyTreeItemData();
-                data->SetId(item); // set the id
-                self->SetItemData(item, data);
-            }
-            return data;
-        }
-
-        %disownarg( wxPyTreeItemData* data );
-        void SetItemData(const wxTreeItemId& item, wxPyTreeItemData* data) {
-            data->SetId(item); // set the id
-            self->SetItemData(item, data);
-        }
-        %cleardisown(wxPyTreeItemData* data );
-
-        // [Get|Set]ItemPyData are short-cuts.  Also made somewhat crash-proof by
-        // automatically creating data classes.
-        PyObject* GetItemPyData(const wxTreeItemId& item) {
-            wxPyTreeItemData* data = (wxPyTreeItemData*)self->GetItemData(item);
-            if (data == NULL) {
-                data = new wxPyTreeItemData();
-                data->SetId(item); // set the id
-                self->SetItemData(item, data);
-            }
-            return data->GetData();
-        }
-
-        void SetItemPyData(const wxTreeItemId& item, PyObject* obj) {
-            wxPyTreeItemData* data = (wxPyTreeItemData*)self->GetItemData(item);
-            if (data == NULL) {
-                data = new wxPyTreeItemData(obj);
-                data->SetId(item); // set the id
-                self->SetItemData(item, data);
-            } else
-                data->SetData(obj);
-        }
-    }
-    %pythoncode { GetPyData = GetItemPyData }
-    %pythoncode { SetPyData = SetItemPyData }
-
-
-    bool GetItemBold(const wxTreeItemId& item) const;
-    wxColour GetItemTextColour(const wxTreeItemId& item) const;
-    wxColour GetItemBackgroundColour(const wxTreeItemId& item) const;
-    wxFont GetItemFont(const wxTreeItemId& item) const;
-
-
-    // force appearance of [+] button near the item. This is useful to
-    // allow the user to expand the items which don't have any children now
-    // - but instead add them only when needed, thus minimizing memory
-    // usage and loading time.
-    void SetItemHasChildren(const wxTreeItemId& item, bool has = true);
-
-    // the item will be shown in bold
-    void SetItemBold(const wxTreeItemId& item, bool bold = true);
-
-    // set the item's text colour
-    void SetItemTextColour(const wxTreeItemId& item, const wxColour& colour);
-
-    // set the item's background colour
-    void SetItemBackgroundColour(const wxTreeItemId& item,
-				 const wxColour& colour);
-
-    // set the item's font (should be of the same height for all items)
-    void SetItemFont(const wxTreeItemId& item, const wxFont& font);
-
-
-
-    // is the item visible (it might be outside the view or not expanded)?
-    bool IsVisible(const wxTreeItemId& item) const;
-
-    // does the item has any children?
-    bool HasChildren(const wxTreeItemId& item) const;
-    %pythoncode { ItemHasChildren = HasChildren }
-
-    // is the item expanded (only makes sense if HasChildren())?
-    bool IsExpanded(const wxTreeItemId& item) const;
-
-    // is this item currently selected (the same as has focus)?
-    bool IsSelected(const wxTreeItemId& item) const;
-
-    // is item text in bold font?
-    bool IsBold(const wxTreeItemId& item) const;
-
-
-    // if 'recursively' is False, only immediate children count, otherwise
-    // the returned number is the number of all items in this branch
-    size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = true);
-
-
-    // wxTreeItemId.IsOk() will return False if there is no such item
-
-    // get the root tree item
-    wxTreeItemId GetRootItem() const;
-
-    // get the item currently selected (may return NULL if no selection)
-    wxTreeItemId GetSelection() const;
-
-    // get the items currently selected, return the number of such item
-    //size_t GetSelections(wxArrayTreeItemIds&) const;
-    %extend {
-        PyObject* GetSelections() {
-            wxPyBlock_t blocked = wxPyBeginBlockThreads();
-            PyObject*           rval = PyList_New(0);
-            wxArrayTreeItemIds  array;
-            size_t              num, x;
-            num = self->GetSelections(array);
-            for (x=0; x < num; x++) {
-                wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
-                PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), true);
-                PyList_Append(rval, item);
-                Py_DECREF(item);
-            }
-            wxPyEndBlockThreads(blocked);
-            return rval;
-        }
-    }
-
-
-    // get the parent of this item (may return NULL if root)
-    wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
-
-    // for this enumeration function you must pass in a "cookie" parameter
-    // which is opaque for the application but is necessary for the library
-    // to make these functions reentrant (i.e. allow more than one
-    // enumeration on one and the same object simultaneously). Of course,
-    // the "cookie" passed to GetFirstChild() and GetNextChild() should be
-    // the same!
-
-
-    // NOTE: These are a copy of the same methods in _treectrl.i, be sure to
-    // update both at the same time.  (Or find a good way to refactor!)
-    %extend {
-        // Get the first child of this item.  Returns a wxTreeItemId and an
-        // opaque "cookie" value that should be passed to GetNextChild in
-        // order to continue the search.
-        PyObject* GetFirstChild(const wxTreeItemId& item) {
-            void* cookie = 0;
-            wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie));
-            wxPyBlock_t blocked = wxPyBeginBlockThreads();
-            PyObject* tup = PyTuple_New(2);
-            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
-            PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
-            wxPyEndBlockThreads(blocked);
-            return tup;
-        }
-
-
-        // Get the next child of this item.  The cookie parameter is the 2nd
-        // value returned from GetFirstChild or the previous GetNextChild.
-        // Returns a wxTreeItemId and an opaque "cookie" value that should be
-        // passed to GetNextChild in order to continue the search.
-        PyObject* GetNextChild(const wxTreeItemId& item, void* cookie) {
-            wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie));
-            wxPyBlock_t blocked = wxPyBeginBlockThreads();
-            PyObject* tup = PyTuple_New(2);
-            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
-            PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
-            wxPyEndBlockThreads(blocked);
-            return tup;
-        }
-
-
-        PyObject* GetLastChild(const wxTreeItemId& item) {
-            void* cookie = 0;
-            wxTreeItemId* ritem = new wxTreeItemId(self->GetLastChild(item, cookie));
-            wxPyBlock_t blocked = wxPyBeginBlockThreads();
-            PyObject* tup = PyTuple_New(2);
-            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
-            PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
-            wxPyEndBlockThreads(blocked);
-            return tup;
-        }
-
-
-        PyObject* GetPrevChild(const wxTreeItemId& item, void* cookie) {
-            wxTreeItemId* ritem = new wxTreeItemId(self->GetPrevChild(item, cookie));
-            wxPyBlock_t blocked = wxPyBeginBlockThreads();
-            PyObject* tup = PyTuple_New(2);
-            PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
-            PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
-            wxPyEndBlockThreads(blocked);
-            return tup;
-        }
-    }
-
-
-    // get the next sibling of this item
-    wxTreeItemId GetNextSibling(const wxTreeItemId& item) const;
-
-    // get the previous sibling
-    wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const;
-
-
-    // get item in the full tree (currently only for internal use)
-    wxTreeItemId GetNext(const wxTreeItemId& item) const;
-    wxTreeItemId GetPrev(const wxTreeItemId& item) const;
-
-     // get expanded item, see IsExpanded()
-    wxTreeItemId GetFirstExpandedItem() const;
-    wxTreeItemId GetNextExpanded(const wxTreeItemId& item) const;
-    wxTreeItemId GetPrevExpanded(const wxTreeItemId& item) const;
-
-    // get visible item, see IsVisible()
-    wxTreeItemId GetFirstVisibleItem(bool fullRow = false) const;
-    wxTreeItemId GetNextVisible(const wxTreeItemId& item, bool fullRow = false) const;
-    wxTreeItemId GetPrevVisible(const wxTreeItemId& item, bool fullRow = false) const;
-
-
-
-    %disownarg( wxPyTreeItemData* data );
-
-    // add the root node to the tree
-    wxTreeItemId AddRoot(const wxString& text,
-                         int image = -1, int selectedImage = -1,
-                         wxPyTreeItemData *data = NULL);
-
-    // insert a new item in as the first child of the parent
-    wxTreeItemId PrependItem(const wxTreeItemId& parent,
-                             const wxString& text,
-                             int image = -1, int selectedImage = -1,
-                             wxPyTreeItemData *data = NULL);
-
-    // insert a new item after a given one
-    wxTreeItemId InsertItem(const wxTreeItemId& parent,
-                            const wxTreeItemId& idPrevious,
-                            const wxString& text,
-                            int image = -1, int selectedImage = -1,
-                            wxPyTreeItemData *data = NULL);
-
-    // insert a new item before the one with the given index
-    %Rename(InsertItemBefore,
-        wxTreeItemId,  InsertItem(const wxTreeItemId& parent,
-                                size_t index,
-                                const wxString& text,
-                                int image = -1, int selectedImage = -1,
-                                wxPyTreeItemData *data = NULL));
-
-    // insert a new item in as the last child of the parent
-    wxTreeItemId AppendItem(const wxTreeItemId& parent,
-                            const wxString& text,
-                            int image = -1, int selectedImage = -1,
-                            wxPyTreeItemData *data = NULL);
-
-    %cleardisown(wxPyTreeItemData* data );
-
-    // delete this item and associated data if any
-    void Delete(const wxTreeItemId& item);
-
-    // delete all children (but don't delete the item itself)
-    // NB: this won't send wxEVT_COMMAND_TREE_ITEM_DELETED events
-    void DeleteChildren(const wxTreeItemId& item);
-
-    // delete all items from the tree
-    // NB: this won't send wxEVT_COMMAND_TREE_ITEM_DELETED events
-    void DeleteRoot();
-    %pythoncode { DeleteAllItems = DeleteRoot }
-
-
-
-    // expand this item
-    void Expand(const wxTreeItemId& item);
-
-    // expand this item and all subitems recursively
-    void ExpandAll(const wxTreeItemId& item);
-
-    // collapse the item without removing its children
-    void Collapse(const wxTreeItemId& item);
-
-    // collapse the item and remove all children
-    void CollapseAndReset(const wxTreeItemId& item);
-
-    // toggles the current state
-    void Toggle(const wxTreeItemId& item);
-
-    // remove the selection from currently selected item (if any)
-    void Unselect();
-    void UnselectAll();
-
-    // select this item
-    void SelectItem(const wxTreeItemId& item,
-                    const wxTreeItemId& last = (wxTreeItemId*)NULL,
-                    bool unselect_others=true);
-
-    void SelectAll();
-
-    // make sure this item is visible (expanding the parent item and/or
-    // scrolling to this item if necessary)
-    void EnsureVisible(const wxTreeItemId& item);
-
-    // scroll to this item (but don't expand its parent)
-    void ScrollTo(const wxTreeItemId& item);
-
-    // Returns wxTreeItemId, flags, and column
-    wxTreeItemId HitTest(const wxPoint& point, int& OUTPUT, int& OUTPUT);
-
-    %extend {
-        // get the bounding rectangle of the item (or of its label only)
-        PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = false) {
-            wxRect rect;
-            if (self->GetBoundingRect(item, rect, textOnly)) {
-                wxPyBlock_t blocked = wxPyBeginBlockThreads();
-                wxRect* r = new wxRect(rect);
-                PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1);
-                wxPyEndBlockThreads(blocked);
-                return val;
-            }
-            else {
-                RETURN_NONE();
-            }
-        }
-    }
-
-
-    %extend {
-        // Start editing the item label: this (temporarily) replaces the item
-        // with a one line edit control. The item will be selected if it hadn't
-        // been before.
-        void EditLabel(const wxTreeItemId& item, int column = -1) {
-            if (column < 0) column = self->GetMainColumn();
-            self->EditLabel(item, column);
-        }
-    }
-    %pythoncode { Edit = EditLabel }
-
-    // sort the children of this item using OnCompareItems
-    void SortChildren(const wxTreeItemId& item);
-
-    // searching
-    wxTreeItemId FindItem (const wxTreeItemId& item, const wxString& str, int flags = 0);
-
-    // drop over item
-    void SetDragItem (const wxTreeItemId& item = (wxTreeItemId*)NULL);
-
-    wxWindow* GetHeaderWindow() const;
-    wxScrolledWindow* GetMainWindow() const;
-
-    %property(ButtonsImageList, GetButtonsImageList, SetButtonsImageList, doc="See `GetButtonsImageList` and `SetButtonsImageList`");
-    %property(ColumnCount, GetColumnCount, doc="See `GetColumnCount`");
-    %property(Count, GetCount, doc="See `GetCount`");
-    %property(HeaderWindow, GetHeaderWindow, doc="See `GetHeaderWindow`");
-    %property(ImageList, GetImageList, SetImageList, doc="See `GetImageList` and `SetImageList`");
-    %property(Indent, GetIndent, SetIndent, doc="See `GetIndent` and `SetIndent`");
-    %property(LineSpacing, GetLineSpacing, SetLineSpacing, doc="See `GetLineSpacing` and `SetLineSpacing`");
-    %property(MainColumn, GetMainColumn, SetMainColumn, doc="See `GetMainColumn` and `SetMainColumn`");
-    %property(MainWindow, GetMainWindow, doc="See `GetMainWindow`");
-    %property(Next, GetNext, doc="See `GetNext`");
-    %property(RootItem, GetRootItem, doc="See `GetRootItem`");
-    %property(Selection, GetSelection, doc="See `GetSelection`");
-    %property(Selections, GetSelections, doc="See `GetSelections`");
-    %property(StateImageList, GetStateImageList, SetStateImageList, doc="See `GetStateImageList` and `SetStateImageList`");
-};
-
-//----------------------------------------------------------------------
-
-%init %{
-   wxPyPtrTypeMap_Add("wxTreeListCtrl", "wxPyTreeListCtrl");
-%}
-
-//----------------------------------------------------------------------

wxPython/contrib/gizmos/gizmos.i

@@ -1,505 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        gizmos.i
-// Purpose:     Wrappers for the "gizmo" classes in wx/contrib
-//
-// Author:      Robin Dunn
-//
-// Created:     23-Nov-2001
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-%define DOCSTRING
-"Various *gizmo* classes: `DynamicSashWindow`, `EditableListBox`,
-`LEDNumberCtrl`, `TreeListCtrl`, etc."
-%enddef
-
-%module(package="wx", docstring=DOCSTRING) gizmos
-
-
-%{
-#include "wx/wxPython/wxPython.h"
-#include "wx/wxPython/pyclasses.h"
-
-#include <wx/gizmos/dynamicsash.h>
-#include <wx/gizmos/editlbox.h>
-#include <wx/gizmos/splittree.h>
-#include <wx/gizmos/ledctrl.h>
-#include <wx/gizmos/statpict.h>
-
-#include <wx/listctrl.h>
-#include <wx/treectrl.h>
-#include <wx/imaglist.h>
-
-%}
-
-//---------------------------------------------------------------------------
-
-%import windows.i
-%import controls.i
-%pythoncode { import wx }
-%pythoncode { __docfilter__ = wx._core.__DocFilter(globals()) }
-
-
-MAKE_CONST_WXSTRING2(DynamicSashNameStr,     wxT("dynamicSashWindow"));
-MAKE_CONST_WXSTRING2(EditableListBoxNameStr, wxT("editableListBox"));
-MAKE_CONST_WXSTRING(StaticPictureNameStr);                     
-    
-MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
-
-//---------------------------------------------------------------------------
-
-enum {
-    wxDS_MANAGE_SCROLLBARS,
-    wxDS_DRAG_CORNER,
-};
-
-%constant wxEventType wxEVT_DYNAMIC_SASH_SPLIT;
-%constant wxEventType wxEVT_DYNAMIC_SASH_UNIFY;
-
-
-/*
-    wxDynamicSashSplitEvents are sent to your view by wxDynamicSashWindow
-    whenever your view is being split by the user.  It is your
-    responsibility to handle this event by creating a new view window as
-    a child of the wxDynamicSashWindow.  wxDynamicSashWindow will
-    automatically reparent it to the proper place in its window hierarchy.
-*/
-class wxDynamicSashSplitEvent : public wxCommandEvent {
-public:
-    wxDynamicSashSplitEvent(wxObject *target);
-};
-
-
-/*
-    wxDynamicSashUnifyEvents are sent to your view by wxDynamicSashWindow
-    whenever the sash which splits your view and its sibling is being
-    reunified such that your view is expanding to replace its sibling.
-    You needn't do anything with this event if you are allowing
-    wxDynamicSashWindow to manage your view's scrollbars, but it is useful
-    if you are managing the scrollbars yourself so that you can keep
-    the scrollbars' event handlers connected to your view's event handler
-    class.
-*/
-class wxDynamicSashUnifyEvent : public wxCommandEvent {
-public:
-    wxDynamicSashUnifyEvent(wxObject *target);
-};
-
-
-
-/*
-
-    wxDynamicSashWindow
-
-    wxDynamicSashWindow widgets manages the way other widgets are viewed.
-    When a wxDynamicSashWindow is first shown, it will contain one child
-    view, a viewport for that child, and a pair of scrollbars to allow the
-    user to navigate the child view area.  Next to each scrollbar is a small
-    tab.  By clicking on either tab and dragging to the appropriate spot, a
-    user can split the view area into two smaller views separated by a
-    draggable sash.  Later, when the user wishes to reunify the two subviews,
-    the user simply drags the sash to the side of the window.
-    wxDynamicSashWindow will automatically reparent the appropriate child
-    view back up the window hierarchy, and the wxDynamicSashWindow will have
-    only one child view once again.
-
-    As an application developer, you will simply create a wxDynamicSashWindow
-    using either the Create() function or the more complex constructor
-    provided below, and then create a view window whose parent is the
-    wxDynamicSashWindow.  The child should respond to
-    wxDynamicSashSplitEvents -- perhaps with an OnSplit() event handler -- by
-    constructing a new view window whose parent is also the
-    wxDynamicSashWindow.  That's it!  Now your users can dynamically split
-    and reunify the view you provided.
-
-    If you wish to handle the scrollbar events for your view, rather than
-    allowing wxDynamicSashWindow to do it for you, things are a bit more
-    complex.  (You might want to handle scrollbar events yourself, if,
-    for instance, you wish to scroll a subwindow of the view you add to
-    your wxDynamicSashWindow object, rather than scrolling the whole view.)
-    In this case, you will need to construct your wxDynamicSashWindow without
-    the wxDS_MANAGE_SCROLLBARS style and  you will need to use the
-    GetHScrollBar() and GetVScrollBar() methods to retrieve the scrollbar
-    controls and call SetEventHanler() on them to redirect the scrolling
-    events whenever your window is reparented by wxDyanmicSashWindow.
-    You will need to set the scrollbars' event handler at three times:
-
-        *  When your view is created
-        *  When your view receives a wxDynamicSashSplitEvent
-        *  When your view receives a wxDynamicSashUnifyEvent
-
-    See the dynsash_switch sample application for an example which does this.
-
-*/
-
-MustHaveApp(wxDynamicSashWindow);
-
-class wxDynamicSashWindow : public wxWindow {
-public:
-    %pythonAppend wxDynamicSashWindow         "self._setOORInfo(self)"
-    %pythonAppend wxDynamicSashWindow()       ""
-
-    wxDynamicSashWindow(wxWindow *parent, wxWindowID id=-1,
-                        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                        long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
-                        const wxString& name = wxPyDynamicSashNameStr);
-    %RenameCtor(PreDynamicSashWindow, wxDynamicSashWindow());
-
-    bool Create(wxWindow *parent, wxWindowID id=-1,
-                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                long style = wxCLIP_CHILDREN | wxDS_MANAGE_SCROLLBARS | wxDS_DRAG_CORNER,
-                const wxString& name = wxPyDynamicSashNameStr);
-
-    wxScrollBar *GetHScrollBar(const wxWindow *child) const;
-    wxScrollBar *GetVScrollBar(const wxWindow *child) const;
-};
-
-
-
-%pythoncode {
-EVT_DYNAMIC_SASH_SPLIT = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_SPLIT, 1 )
-EVT_DYNAMIC_SASH_UNIFY = wx.PyEventBinder( wxEVT_DYNAMIC_SASH_UNIFY, 1 )
-}
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-
-enum {
-    wxEL_ALLOW_NEW,
-    wxEL_ALLOW_EDIT,
-    wxEL_ALLOW_DELETE,
-};
-
-
-%typemap(out) wxPyListCtrl*
-{ $result = wxPyMake_wxObject((wxObject*)$1, (bool)$owner); }
-
-
-// This class provides a composite control that lets the
-// user easily enter list of strings
-MustHaveApp(wxEditableListBox);
-class wxEditableListBox : public wxPanel
-{
-public:
-    %pythonAppend wxEditableListBox         "self._setOORInfo(self)"
-    %pythonAppend wxEditableListBox()       ""
-
-    wxEditableListBox(wxWindow *parent, wxWindowID id=-1,
-                      const wxString& label = wxPyEmptyString,
-                      const wxPoint& pos = wxDefaultPosition,
-                      const wxSize& size = wxDefaultSize,
-                      long style = wxEL_ALLOW_NEW | wxEL_ALLOW_EDIT | wxEL_ALLOW_DELETE,
-                      const wxString& name = wxPyEditableListBoxNameStr);
-
-
-    void SetStrings(const wxArrayString& strings);
-
-    //void GetStrings(wxArrayString& strings);
-    %extend {
-        PyObject* GetStrings() {
-            wxArrayString strings;
-            self->GetStrings(strings);
-            return wxArrayString2PyList_helper(strings);
-        }
-    }
-
-    wxPyListCtrl* GetListCtrl();
-    wxBitmapButton* GetDelButton();
-    wxBitmapButton* GetNewButton();
-    wxBitmapButton* GetUpButton();
-    wxBitmapButton* GetDownButton();
-    wxBitmapButton* GetEditButton();
-
-    %property(DelButton, GetDelButton, doc="See `GetDelButton`");
-    %property(DownButton, GetDownButton, doc="See `GetDownButton`");
-    %property(EditButton, GetEditButton, doc="See `GetEditButton`");
-    %property(ListCtrl, GetListCtrl, doc="See `GetListCtrl`");
-    %property(NewButton, GetNewButton, doc="See `GetNewButton`");
-    %property(Strings, GetStrings, SetStrings, doc="See `GetStrings` and `SetStrings`");
-    %property(UpButton, GetUpButton, doc="See `GetUpButton`");
-};
-
-
-
-//---------------------------------------------------------------------------
-
-
-/*
- * wxRemotelyScrolledTreeCtrl
- *
- * This tree control disables its vertical scrollbar and catches scroll
- * events passed by a scrolled window higher in the hierarchy.
- * It also updates the scrolled window vertical scrollbar as appropriate.
- */
-
-%{
-    typedef wxTreeCtrl wxPyTreeCtrl;
-%}
-
-MustHaveApp(wxRemotelyScrolledTreeCtrl);
-
-class wxRemotelyScrolledTreeCtrl: public wxPyTreeCtrl
-{
-public:
-    %pythonAppend wxRemotelyScrolledTreeCtrl         "self._setOORInfo(self)"
-    %pythonAppend wxRemotelyScrolledTreeCtrl()       ""
-
-    wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id,
-                               const wxPoint& pos = wxDefaultPosition,
-                               const wxSize& size = wxDefaultSize,
-                               long style = wxTR_HAS_BUTTONS);
-
-
-    void HideVScrollbar();
-
-    // Adjust the containing wxScrolledWindow's scrollbars appropriately
-    void AdjustRemoteScrollbars();
-
-    // Find the scrolled window that contains this control
-    wxScrolledWindow* GetScrolledWindow() const;
-
-    // Scroll to the given line (in scroll units where each unit is
-    // the height of an item)
-    void ScrollToLine(int posHoriz, int posVert);
-
-    // The companion window is one which will get notified when certain
-    // events happen such as node expansion
-    void SetCompanionWindow(wxWindow* companion);
-    wxWindow* GetCompanionWindow() const;
-
-    %property(CompanionWindow, GetCompanionWindow, SetCompanionWindow, doc="See `GetCompanionWindow` and `SetCompanionWindow`");
-    %property(ScrolledWindow, GetScrolledWindow, doc="See `GetScrolledWindow`");
-};
-
-
-
-/*
- * wxTreeCompanionWindow
- *
- * A window displaying values associated with tree control items.
- */
-
-%{
-class wxPyTreeCompanionWindow: public wxTreeCompanionWindow
-{
-public:
-    wxPyTreeCompanionWindow(wxWindow* parent, wxWindowID id = -1,
-                            const wxPoint& pos = wxDefaultPosition,
-                            const wxSize& size = wxDefaultSize,
-                            long style = 0)
-        : wxTreeCompanionWindow(parent, id, pos, size, style) {}
-
-
-    virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect) {
-        bool found;
-        wxPyBlock_t blocked = wxPyBeginBlockThreads();
-        if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) {
-            PyObject* dcobj = wxPyMake_wxObject(&dc,false);
-            PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), false);
-            PyObject* recobj= wxPyConstructObject((void*)&rect, wxT("wxRect"), false);
-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", dcobj, idobj, recobj));
-            Py_DECREF(dcobj);
-            Py_DECREF(idobj);
-            Py_DECREF(recobj);
-        }
-        wxPyEndBlockThreads(blocked);
-        if (! found)
-            wxTreeCompanionWindow::DrawItem(dc, id, rect);
-    }
-
-    PYPRIVATE;
-};
-%}
-
-
-MustHaveApp(wxPyTreeCompanionWindow);
-
-%rename(TreeCompanionWindow) wxPyTreeCompanionWindow;
-class wxPyTreeCompanionWindow: public wxWindow
-{
-public:
-    %pythonAppend wxPyTreeCompanionWindow         "self._setOORInfo(self);" setCallbackInfo(TreeCompanionWindow)
-    %pythonAppend wxPyTreeCompanionWindow()       ""
-
-    wxPyTreeCompanionWindow(wxWindow* parent, wxWindowID id = -1,
-                            const wxPoint& pos = wxDefaultPosition,
-                            const wxSize& size = wxDefaultSize,
-                            long style = 0);
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    wxRemotelyScrolledTreeCtrl* GetTreeCtrl() const;
-    void SetTreeCtrl(wxRemotelyScrolledTreeCtrl* treeCtrl);
-
-    %property(TreeCtrl, GetTreeCtrl, SetTreeCtrl, doc="See `GetTreeCtrl` and `SetTreeCtrl`");
-};
-
-
-
-/*
- * wxThinSplitterWindow
- *
- * Implements a splitter with a less obvious sash
- * than the usual one.
- */
-
-MustHaveApp(wxThinSplitterWindow);
-
-class wxThinSplitterWindow: public wxSplitterWindow
-{
-public:
-    %pythonAppend wxThinSplitterWindow         "self._setOORInfo(self)"
-    %pythonAppend wxThinSplitterWindow()       ""
-
-    wxThinSplitterWindow(wxWindow* parent, wxWindowID id = -1,
-                         const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& size = wxDefaultSize,
-                         long style = wxSP_3D | wxCLIP_CHILDREN);
-};
-
-
-
-/*
- * wxSplitterScrolledWindow
- *
- * This scrolled window is aware of the fact that one of its
- * children is a splitter window. It passes on its scroll events
- * (after some processing) to both splitter children for them
- * scroll appropriately.
- */
-
-MustHaveApp(wxSplitterScrolledWindow);
-
-class wxSplitterScrolledWindow: public wxScrolledWindow
-{
-public:
-    %pythonAppend wxSplitterScrolledWindow         "self._setOORInfo(self)"
-    %pythonAppend wxSplitterScrolledWindow()       ""
-
-    wxSplitterScrolledWindow(wxWindow* parent, wxWindowID id = -1,
-                             const wxPoint& pos = wxDefaultPosition,
-                             const wxSize& size = wxDefaultSize,
-                             long style = 0);
-};
-
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-
-
-enum wxLEDValueAlign
-{
-    wxLED_ALIGN_LEFT,
-    wxLED_ALIGN_RIGHT,
-    wxLED_ALIGN_CENTER,
-
-    wxLED_ALIGN_MASK,
-
-    wxLED_DRAW_FADED,
-};
-
-
-MustHaveApp(wxLEDNumberCtrl);
-
-class wxLEDNumberCtrl :	public wxControl
-{
-public:
-    %pythonAppend wxLEDNumberCtrl         "self._setOORInfo(self)"
-    %pythonAppend wxLEDNumberCtrl()       ""
-
-    wxLEDNumberCtrl(wxWindow *parent, wxWindowID id = -1,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style =  wxLED_ALIGN_LEFT | wxLED_DRAW_FADED);
-    %RenameCtor(PreLEDNumberCtrl,  wxLEDNumberCtrl());
-
-    bool Create(wxWindow *parent, wxWindowID id = -1,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxLED_ALIGN_LEFT | wxLED_DRAW_FADED);
-
-    wxLEDValueAlign GetAlignment() const;
-    bool GetDrawFaded() const;
-    const wxString &GetValue() const;
-
-    void SetAlignment(wxLEDValueAlign Alignment, bool Redraw = true);
-    void SetDrawFaded(bool DrawFaded, bool Redraw = true);
-    void SetValue(const wxString &Value, bool Redraw = true);
-
-    %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`");
-    %property(DrawFaded, GetDrawFaded, SetDrawFaded, doc="See `GetDrawFaded` and `SetDrawFaded`");
-    %property(Value, GetValue, SetValue, doc="See `GetValue` and `SetValue`");
-};
-
-
-
-//----------------------------------------------------------------------
-
-%include _treelist.i
-
-//----------------------------------------------------------------------
-
-enum
-{
-    wxSCALE_HORIZONTAL,
-    wxSCALE_VERTICAL,
-    wxSCALE_UNIFORM,
-    wxSCALE_CUSTOM    
-};
-
-MustHaveApp(wxStaticPicture);
-
-class wxStaticPicture : public wxControl
-{
-public:
-    %pythonAppend wxStaticPicture         "self._setOORInfo(self)"
-    %pythonAppend wxStaticPicture()       ""
-
-    wxStaticPicture( wxWindow* parent, wxWindowID id=-1,
-                     const wxBitmap& label=wxNullBitmap,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = 0,
-                     const wxString& name = wxPyStaticPictureNameStr );
-
-    %RenameCtor(PreStaticPicture, wxStaticPicture());
-
-    bool Create( wxWindow* parent, wxWindowID id=-1,
-                 const wxBitmap& label=wxNullBitmap,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = 0,
-                 const wxString& name = wxPyStaticPictureNameStr );
-
-    void SetBitmap( const wxBitmap& bmp );
-    wxBitmap GetBitmap() const;
-    void SetIcon( const wxIcon& icon );
-    wxIcon GetIcon() const;
-
-    void SetAlignment( int align );
-    int GetAlignment() const;
-
-    void SetScale( int scale );
-    int GetScale() const; 
-
-    void SetCustomScale( float sx, float sy );
-    void GetCustomScale( float* OUTPUT, float* OUTPUT ) const;
-
-    %property(Alignment, GetAlignment, SetAlignment, doc="See `GetAlignment` and `SetAlignment`");
-    %property(Bitmap, GetBitmap, SetBitmap, doc="See `GetBitmap` and `SetBitmap`");
-    %property(Icon, GetIcon, SetIcon, doc="See `GetIcon` and `SetIcon`");
-    %property(Scale, GetScale, SetScale, doc="See `GetScale` and `SetScale`");
-};
-
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-
-%init %{
-    wxPyPtrTypeMap_Add("wxTreeCompanionWindow", "wxPyTreeCompanionWindow");
-%}
-
-//----------------------------------------------------------------------
-//----------------------------------------------------------------------
-

wxPython/contrib/gizmos/wxCode/include/wx/treelistctrl.h

@@ -1,552 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        treelistctrl.h
-// Purpose:     wxTreeListCtrl class
-// Author:      Robert Roebling
-// Maintainer:  Otto Wyss
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) 2004 Robert Roebling, Julian Smart, Alberto Griggio,
-//              Vadim Zeitlin, Otto Wyss
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef TREELISTCTRL_H
-#define TREELISTCTRL_H
-
-#include <wx/treectrl.h>
-#include <wx/control.h>
-#include <wx/pen.h>
-#include <wx/listctrl.h> // for wxListEvent
-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
-
-class GIZMODLLEXPORT wxTreeListItem;
-class GIZMODLLEXPORT wxTreeListHeaderWindow;
-class GIZMODLLEXPORT wxTreeListMainWindow;
-
-#define wxTR_COLUMN_LINES 0x1000 // put border around items
-#define wxTR_VIRTUAL      0x4000 // The application provides items text on demand.
-
-// Using this typedef removes an ambiguity when calling Remove()
-#ifdef __WXMSW__
-#if !wxCHECK_VERSION(2, 5, 0)
-typedef long wxTreeItemIdValue;
-#else
-typedef void *wxTreeItemIdValue;
-#endif
-#endif
-
-//-----------------------------------------------------------------------------
-// wxTreeListColumnAttrs
-//-----------------------------------------------------------------------------
-
-enum {
-    DEFAULT_COL_WIDTH = 100
-};
-
-class GIZMODLLEXPORT wxTreeListColumnInfo: public wxObject {
-
-public:
-    wxTreeListColumnInfo (const wxString &text = wxEmptyString,
-                          int width = DEFAULT_COL_WIDTH,
-                          int flag = wxALIGN_LEFT,
-                          int image = -1,
-                          bool shown = true,
-                          bool edit = false) {
-        m_text = text;
-        m_width = width;
-        m_flag = flag;
-        m_image = image;
-        m_selected_image = -1;
-        m_shown = shown;
-        m_edit = edit;
-    }
-
-    wxTreeListColumnInfo (const wxTreeListColumnInfo& other) {
-        m_text = other.m_text;
-        m_width = other.m_width;
-        m_flag = other.m_flag;
-        m_image = other.m_image;
-        m_selected_image = other.m_selected_image;
-        m_shown = other.m_shown;
-        m_edit = other.m_edit;
-    }
-
-    ~wxTreeListColumnInfo() {}
-
-    // get/set
-    wxString GetText() const { return m_text; }
-    wxTreeListColumnInfo& SetText (const wxString& text) { m_text = text; return *this; }
-
-    int GetWidth() const { return m_width; }
-    wxTreeListColumnInfo& SetWidth (int width) { m_width = width; return *this; }
-
-    int GetAlignment() const { return m_flag; }
-    wxTreeListColumnInfo& SetAlignment (int flag) { m_flag = flag; return *this; }
-
-    int GetImage() const { return m_image; }
-    wxTreeListColumnInfo& SetImage (int image) { m_image = image; return *this; }
-
-    int GetSelectedImage() const { return m_selected_image; }
-    wxTreeListColumnInfo& SetSelectedImage (int image) { m_selected_image = image; return *this; }
-
-    bool IsEditable() const { return m_edit; }
-    wxTreeListColumnInfo& SetEditable (bool edit)
-        { m_edit = edit; return *this; }
-
-    bool IsShown() const { return m_shown; }
-    wxTreeListColumnInfo& SetShown(bool shown) { m_shown = shown; return *this; }
-
-private:
-    wxString m_text;
-    int m_width;
-    int m_flag;
-    int m_image;
-    int m_selected_image;
-    bool m_shown;
-    bool m_edit;
-};
-
-//----------------------------------------------------------------------------
-// wxTreeListCtrl - the multicolumn tree control
-//----------------------------------------------------------------------------
-
-// modes for navigation
-const int wxTL_MODE_NAV_FULLTREE = 0x0000; // default
-const int wxTL_MODE_NAV_EXPANDED = 0x0001;
-const int wxTL_MODE_NAV_VISIBLE  = 0x0002;
-const int wxTL_MODE_NAV_LEVEL    = 0x0004;
-
-// modes for FindItem
-const int wxTL_MODE_FIND_EXACT   = 0x0000; // default
-const int wxTL_MODE_FIND_PARTIAL = 0x0010;
-const int wxTL_MODE_FIND_NOCASE  = 0x0020;
-
-// additional flag for HitTest
-const int wxTREE_HITTEST_ONITEMCOLUMN = 0x2000;
-extern GIZMODLLEXPORT const wxChar* wxTreeListCtrlNameStr;
-
-
-class GIZMODLLEXPORT wxTreeListCtrl : public wxControl
-{
-public:
-    // creation
-    // --------
-    wxTreeListCtrl()
-        : m_header_win(0), m_main_win(0), m_headerHeight(0)
-    {}
-
-    wxTreeListCtrl(wxWindow *parent, wxWindowID id = -1,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxTR_DEFAULT_STYLE,
-               const wxValidator &validator = wxDefaultValidator,
-               const wxString& name = wxTreeListCtrlNameStr )
-        : m_header_win(0), m_main_win(0), m_headerHeight(0)
-    {
-        Create(parent, id, pos, size, style, validator, name);
-    }
-
-    virtual ~wxTreeListCtrl() {}
-
-    bool Create(wxWindow *parent, wxWindowID id = -1,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxTR_DEFAULT_STYLE,
-                const wxValidator &validator = wxDefaultValidator,
-                const wxString& name = wxTreeListCtrlNameStr );
-
-    void Refresh(bool erase=TRUE, const wxRect* rect=NULL);
-    void SetFocus();
-    // accessors
-    // ---------
-
-    // get the total number of items in the control
-    size_t GetCount() const;
-
-    // indent is the number of pixels the children are indented relative to
-    // the parents position. SetIndent() also redraws the control
-    // immediately.
-    unsigned int GetIndent() const;
-    void SetIndent(unsigned int indent);
-
-    // line spacing is the space above and below the text on each line
-    unsigned int GetLineSpacing() const;
-    void SetLineSpacing(unsigned int spacing);
-
-    // image list: these functions allow to associate an image list with
-    // the control and retrieve it. Note that when assigned with
-    // SetImageList, the control does _not_ delete
-    // the associated image list when it's deleted in order to allow image
-    // lists to be shared between different controls. If you use
-    // AssignImageList, the control _does_ delete the image list.
-    //
-    // The normal image list is for the icons which correspond to the
-    // normal tree item state (whether it is selected or not).
-    // Additionally, the application might choose to show a state icon
-    // which corresponds to an app-defined item state (for example,
-    // checked/unchecked) which are taken from the state image list.
-    wxImageList *GetImageList() const;
-    wxImageList *GetStateImageList() const;
-    wxImageList *GetButtonsImageList() const;
-
-    void SetImageList(wxImageList *imageList);
-    void SetStateImageList(wxImageList *imageList);
-    void SetButtonsImageList(wxImageList *imageList);
-    void AssignImageList(wxImageList *imageList);
-    void AssignStateImageList(wxImageList *imageList);
-    void AssignButtonsImageList(wxImageList *imageList);
-
-
-    // Functions to work with columns
-
-    // adds a column
-    void AddColumn (const wxString& text,
-                    int width = DEFAULT_COL_WIDTH,
-                    int flag = wxALIGN_LEFT,
-                    int image = -1,
-                    bool shown = true,
-                    bool edit = false) {
-        AddColumn (wxTreeListColumnInfo (text, width, flag, image, shown, edit));
-    }
-    void AddColumn (const wxTreeListColumnInfo& colInfo);
-
-    // inserts a column before the given one
-    void InsertColumn (int before,
-                       const wxString& text,
-                       int width = DEFAULT_COL_WIDTH,
-                       int flag = wxALIGN_LEFT,
-                       int image = -1,
-                       bool shown = true,
-                       bool edit = false) {
-        InsertColumn (before,
-                      wxTreeListColumnInfo (text, width, flag, image, shown, edit));
-    }
-    void InsertColumn (int before, const wxTreeListColumnInfo& colInfo);
-
-    // deletes the given column - does not delete the corresponding column
-    void RemoveColumn (int column);
-
-    // returns the number of columns in the ctrl
-    int GetColumnCount() const;
-
-    // tells which column is the "main" one, i.e. the "threaded" one
-    void SetMainColumn (int column);
-    int GetMainColumn() const;
-
-    void SetColumn (int column, const wxTreeListColumnInfo& colInfo);
-    wxTreeListColumnInfo& GetColumn (int column);
-    const wxTreeListColumnInfo& GetColumn (int column) const;
-
-    void SetColumnText (int column, const wxString& text);
-    wxString GetColumnText (int column) const;
-
-    void SetColumnWidth (int column, int width);
-    int GetColumnWidth (int column) const;
-
-    void SetColumnAlignment (int column, int flag);
-    int GetColumnAlignment (int column) const;
-
-    void SetColumnImage (int column, int image);
-    int GetColumnImage (int column) const;
-
-    void SetColumnShown (int column, bool shown = true);
-    bool IsColumnShown (int column) const;
-
-    void SetColumnEditable (int column, bool edit = true);
-    bool IsColumnEditable (int column) const;
-
-    // Functions to work with items.
-
-    // accessors
-    // ---------
-
-    // retrieve item's label (of the main column)
-    wxString GetItemText (const wxTreeItemId& item) const
-        { return GetItemText (item, GetMainColumn()); }
-    // retrieves item's label of the given column
-    wxString GetItemText (const wxTreeItemId& item, int column) const;
-
-    // get one of the images associated with the item (normal by default)
-    int GetItemImage (const wxTreeItemId& item,
-                      wxTreeItemIcon which = wxTreeItemIcon_Normal) const
-    { return GetItemImage (item, GetMainColumn(), which); }
-    int GetItemImage (const wxTreeItemId& item, int column,
-                      wxTreeItemIcon which = wxTreeItemIcon_Normal) const;
-
-    // get the data associated with the item
-    wxTreeItemData *GetItemData (const wxTreeItemId& item) const;
-
-    bool GetItemBold (const wxTreeItemId& item) const;
-    wxColour GetItemTextColour (const wxTreeItemId& item) const;
-    wxColour GetItemBackgroundColour (const wxTreeItemId& item) const;
-    wxFont GetItemFont (const wxTreeItemId& item) const;
-
-    // modifiers
-
-    // set item's label
-    void SetItemText (const wxTreeItemId& item, const wxString& text)
-        { SetItemText (item, GetMainColumn(), text); }
-    void SetItemText (const wxTreeItemId& item, int column, const wxString& text);
-
-    // get one of the images associated with the item (normal by default)
-    void SetItemImage (const wxTreeItemId& item, int image,
-                       wxTreeItemIcon which = wxTreeItemIcon_Normal)
-        { SetItemImage (item, GetMainColumn(), image, which); }
-    // the which parameter is ignored for all columns but the main one
-    void SetItemImage (const wxTreeItemId& item, int column, int image,
-                       wxTreeItemIcon which = wxTreeItemIcon_Normal);
-
-    // associate some data with the item
-    void SetItemData (const wxTreeItemId& item, wxTreeItemData *data);
-
-    // force appearance of [+] button near the item. This is useful to
-    // allow the user to expand the items which don't have any children now
-    // - but instead add them only when needed, thus minimizing memory
-    // usage and loading time.
-    void SetItemHasChildren(const wxTreeItemId& item, bool has = true);
-
-    // the item will be shown in bold
-    void SetItemBold (const wxTreeItemId& item, bool bold = true);
-
-    // set the item's text colour
-    void SetItemTextColour (const wxTreeItemId& item, const wxColour& colour);
-
-    // set the item's background colour
-    void SetItemBackgroundColour (const wxTreeItemId& item, const wxColour& colour);
-
-    // set the item's font (should be of the same height for all items)
-    void SetItemFont (const wxTreeItemId& item, const wxFont& font);
-
-    // set the window font
-    virtual bool SetFont ( const wxFont &font );
-
-    // set the styles.
-    void SetWindowStyle (const long styles);
-    long GetWindowStyle() const;
-    long GetWindowStyleFlag () const { return GetWindowStyle(); }
-
-    // item status inquiries
-    // ---------------------
-
-    // is the item visible (it might be outside the view or not expanded)?
-    bool IsVisible (const wxTreeItemId& item, bool fullRow = false) const;
-    // does the item has any children?
-    bool HasChildren (const wxTreeItemId& item) const;
-    // is the item expanded (only makes sense if HasChildren())?
-    bool IsExpanded (const wxTreeItemId& item) const;
-    // is this item currently selected (the same as has focus)?
-    bool IsSelected (const wxTreeItemId& item) const;
-    // is item text in bold font?
-    bool IsBold (const wxTreeItemId& item) const;
-    // does the layout include space for a button?
-
-    // number of children
-    // ------------------
-
-    // if 'recursively' is FALSE, only immediate children count, otherwise
-    // the returned number is the number of all items in this branch
-    size_t GetChildrenCount (const wxTreeItemId& item, bool recursively = true);
-
-    // navigation
-    // ----------
-
-    // wxTreeItemId.IsOk() will return FALSE if there is no such item
-
-    // get the root tree item
-    wxTreeItemId GetRootItem() const;
-
-    // get the item currently selected (may return NULL if no selection)
-    wxTreeItemId GetSelection() const;
-
-    // get the items currently selected, return the number of such item
-    size_t GetSelections (wxArrayTreeItemIds&) const;
-
-    // get the parent of this item (may return NULL if root)
-    wxTreeItemId GetItemParent (const wxTreeItemId& item) const;
-
-    // for this enumeration function you must pass in a "cookie" parameter
-    // which is opaque for the application but is necessary for the library
-    // to make these functions reentrant (i.e. allow more than one
-    // enumeration on one and the same object simultaneously). Of course,
-    // the "cookie" passed to GetFirstChild() and GetNextChild() should be
-    // the same!
-
-    // get child of this item
-#if !wxCHECK_VERSION(2, 5, 0)
-    wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const;
-    wxTreeItemId GetNextChild(const wxTreeItemId& item, long& cookie) const;
-    wxTreeItemId GetPrevChild(const wxTreeItemId& item, long& cookie) const;
-    wxTreeItemId GetLastChild(const wxTreeItemId& item, long& cookie) const;
-#else
-    wxTreeItemId GetFirstChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const;
-    wxTreeItemId GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const;
-    wxTreeItemId GetPrevChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const;
-    wxTreeItemId GetLastChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) const;
-#endif
-
-    // get sibling of this item
-    wxTreeItemId GetNextSibling(const wxTreeItemId& item) const;
-    wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const;
-
-    // get item in the full tree (currently only for internal use)
-    wxTreeItemId GetNext(const wxTreeItemId& item) const;
-    wxTreeItemId GetPrev(const wxTreeItemId& item) const;
-
-    // get expanded item, see IsExpanded()
-    wxTreeItemId GetFirstExpandedItem() const;
-    wxTreeItemId GetNextExpanded(const wxTreeItemId& item) const;
-    wxTreeItemId GetPrevExpanded(const wxTreeItemId& item) const;
-
-    // get visible item, see IsVisible()
-    wxTreeItemId GetFirstVisibleItem(bool fullRow = false) const;
-    wxTreeItemId GetNextVisible(const wxTreeItemId& item, bool fullRow = false) const;
-    wxTreeItemId GetPrevVisible(const wxTreeItemId& item, bool fullRow = false) const;
-
-    // operations
-    // ----------
-
-    // add the root node to the tree
-    wxTreeItemId AddRoot (const wxString& text,
-                          int image = -1, int selectedImage = -1,
-                          wxTreeItemData *data = NULL);
-
-    // insert a new item in as the first child of the parent
-    wxTreeItemId PrependItem (const wxTreeItemId& parent,
-                              const wxString& text,
-                              int image = -1, int selectedImage = -1,
-                              wxTreeItemData *data = NULL);
-
-    // insert a new item after a given one
-    wxTreeItemId InsertItem (const wxTreeItemId& parent,
-                             const wxTreeItemId& idPrevious,
-                             const wxString& text,
-                             int image = -1, int selectedImage = -1,
-                             wxTreeItemData *data = NULL);
-
-    // insert a new item before the one with the given index
-    wxTreeItemId InsertItem (const wxTreeItemId& parent,
-                             size_t index,
-                             const wxString& text,
-                             int image = -1, int selectedImage = -1,
-                             wxTreeItemData *data = NULL);
-
-    // insert a new item in as the last child of the parent
-    wxTreeItemId AppendItem (const wxTreeItemId& parent,
-                             const wxString& text,
-                             int image = -1, int selectedImage = -1,
-                             wxTreeItemData *data = NULL);
-
-    // delete this item (except root) and associated data if any
-    void Delete (const wxTreeItemId& item);
-    // delete all children (but don't delete the item itself)
-    // NB: this won't send wxEVT_COMMAND_TREE_ITEM_DELETED events
-    void DeleteChildren (const wxTreeItemId& item);
-    // delete the root and all its children from the tree
-    // NB: this won't send wxEVT_COMMAND_TREE_ITEM_DELETED events
-    void DeleteRoot();
-
-    // expand this item
-    void Expand (const wxTreeItemId& item);
-    // expand this item and all subitems recursively
-    void ExpandAll (const wxTreeItemId& item);
-    // collapse the item without removing its children
-    void Collapse (const wxTreeItemId& item);
-    // collapse the item and remove all children
-    void CollapseAndReset(const wxTreeItemId& item); //? TODO ???
-    // toggles the current state
-    void Toggle (const wxTreeItemId& item);
-
-    // remove the selection from currently selected item (if any)
-    void Unselect();
-    void UnselectAll();
-    // select this item
-    void SelectItem (const wxTreeItemId& item,
-                     const wxTreeItemId& last = (wxTreeItemId*)NULL,
-                     bool unselect_others = true);
-    // select all items in the expanded tree
-    void SelectAll();
-    // make sure this item is visible (expanding the parent item and/or
-    // scrolling to this item if necessary)
-    void EnsureVisible (const wxTreeItemId& item);
-    // scroll to this item (but don't expand its parent)
-    void ScrollTo (const wxTreeItemId& item);
-
-    // The first function is more portable (because easier to implement
-    // on other platforms), but the second one returns some extra info.
-    wxTreeItemId HitTest (const wxPoint& point)
-        { int flags; int column; return HitTest (point, flags, column); }
-    wxTreeItemId HitTest (const wxPoint& point, int& flags)
-        { int column; return HitTest (point, flags, column); }
-    wxTreeItemId HitTest (const wxPoint& point, int& flags, int& column);
-
-    // get the bounding rectangle of the item (or of its label only)
-    bool GetBoundingRect (const wxTreeItemId& item, wxRect& rect,
-                          bool textOnly = false) const;
-
-    // Start editing the item label: this (temporarily) replaces the item
-    // with a one line edit control. The item will be selected if it hadn't
-    // been before.
-    void EditLabel (const wxTreeItemId& item)
-        { EditLabel (item, GetMainColumn()); }
-    // edit item's label of the given column
-    void EditLabel (const wxTreeItemId& item, int column);
-
-    // virtual mode
-    virtual wxString OnGetItemText( wxTreeItemData* item, long column ) const;
-
-    // sorting
-    // this function is called to compare 2 items and should return -1, 0
-    // or +1 if the first item is less than, equal to or greater than the
-    // second one. The base class version performs alphabetic comparaison
-    // of item labels (GetText)
-    virtual int OnCompareItems (const wxTreeItemId& item1, const wxTreeItemId& item2);
-    // sort the children of this item using OnCompareItems
-    // NB: this function is not reentrant and not MT-safe (FIXME)!
-    void SortChildren(const wxTreeItemId& item);
-
-    // searching
-    wxTreeItemId FindItem (const wxTreeItemId& item, const wxString& str, int mode = 0);
-
-    // overridden base class virtuals
-    virtual bool SetBackgroundColour (const wxColour& colour);
-    virtual bool SetForegroundColour (const wxColour& colour);
-
-    // drop over item
-    void SetDragItem (const wxTreeItemId& item = (wxTreeItemId*)NULL);
-
-
-    wxTreeListHeaderWindow* GetHeaderWindow() const
-        { return m_header_win; }
-
-    wxTreeListMainWindow* GetMainWindow() const
-        { return m_main_win; }
-
-    virtual wxSize DoGetBestSize() const;
-
-protected:
-    // header window, responsible for column visualization and manipulation
-    wxTreeListHeaderWindow* m_header_win;
-
-    // main window, the "true" tree ctrl
-    wxTreeListMainWindow* m_main_win;
-
-    void CalculateAndSetHeaderHeight();
-    void DoHeaderLayout();
-    void OnSize(wxSizeEvent& event);
-
-private:
-    int m_headerHeight;
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxTreeListCtrl)
-};
-
-#endif // TREELISTCTRL_H
-

wxPython/contrib/glcanvas/.cvsignore

@@ -1,14 +0,0 @@
-
-*.exp
-*.lib
-*.obj
-*.pch
-Makefile
-Makefile.pre
-Setup
-build.local
-config.c
-glcanvas.h
-glcanvasc.ilk
-glcanvasc.pyd
-sedscript

wxPython/contrib/glcanvas/glcanvas.i

@@ -1,162 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        glcanvas.i
-// Purpose:     SWIG definitions for the OpenGL wxWindows classes
-//
-// Author:      Robin Dunn
-//
-// Created:     15-Mar-1999
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-
-%define DOCSTRING
-"`GLCanvas` provides an OpenGL Context on a `wx.Window`."
-%enddef
-
-%module(package="wx", docstring=DOCSTRING) glcanvas
-
-%{
-#include "wx/wxPython/wxPython.h"
-#include "wx/wxPython/pyclasses.h"
-
-#include <wx/glcanvas.h>
-
-%}
-
-//---------------------------------------------------------------------------
-
-%import core.i
-%pythoncode { wx = _core }
-%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
-
-
-MAKE_CONST_WXSTRING2(GLCanvasNameStr, wxT("GLCanvas"));
-MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
-
-//---------------------------------------------------------------------------
-
-class wxPalette;
-
-//---------------------------------------------------------------------------
-
-MustHaveApp(wxGLContext);
-
-class wxGLContext : public wxObject {
-public:
-#ifndef __WXMAC__  
-    wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL);
-#else
-    %extend {
-        wxGLContext(bool isRGB, wxGLCanvas *win,
-                    const wxPalette& palette = wxNullPalette,
-                    const wxGLContext* other = NULL) {
-            AGLPixelFormat fmt;  // TODO: How should this be initialized?
-            return new wxGLContext(fmt, win, palette, other);
-        }
-    }
-
-#endif
-    ~wxGLContext();
-
-#ifndef __WXMAC__  
-    void SetCurrent(const wxGLCanvas& win);
-#endif
-};
-
-//---------------------------------------------------------------------------
-
-enum {
-    WX_GL_RGBA,              // use true color palette
-    WX_GL_BUFFER_SIZE,       // bits for buffer if not WX_GL_RGBA
-    WX_GL_LEVEL,             // 0 for main buffer, >0 for overlay, <0 for underlay
-    WX_GL_DOUBLEBUFFER,      // use doublebuffer
-    WX_GL_STEREO,            // use stereoscopic display
-    WX_GL_AUX_BUFFERS,       // number of auxiliary buffers
-    WX_GL_MIN_RED,           // use red buffer with most bits (> MIN_RED bits)
-    WX_GL_MIN_GREEN,         // use green buffer with most bits (> MIN_GREEN bits)
-    WX_GL_MIN_BLUE,          // use blue buffer with most bits (> MIN_BLUE bits)
-    WX_GL_MIN_ALPHA,         // use blue buffer with most bits (> MIN_ALPHA bits)
-    WX_GL_DEPTH_SIZE,        // bits for Z-buffer (0,16,32)
-    WX_GL_STENCIL_SIZE,      // bits for stencil buffer
-    WX_GL_MIN_ACCUM_RED,     // use red accum buffer with most bits (> MIN_ACCUM_RED bits)
-    WX_GL_MIN_ACCUM_GREEN,   // use green buffer with most bits (> MIN_ACCUM_GREEN bits)
-    WX_GL_MIN_ACCUM_BLUE,    // use blue buffer with most bits (> MIN_ACCUM_BLUE bits)
-    WX_GL_MIN_ACCUM_ALPHA    // use blue buffer with most bits (> MIN_ACCUM_ALPHA bits)
-};
-
-
-%typemap(in) int *attribList (int *temp) {
-    int i;
-    if (PySequence_Check($input)) {
-        int size = PyObject_Length($input);
-        temp = new int[size+1]; // (int*)malloc((size + 1) * sizeof(int));
-        for (i = 0; i < size; i++) {
-            temp[i] = PyInt_AsLong(PySequence_GetItem($input, i));
-        }
-        temp[size] = 0;
-        $1 = temp;
-    }
-}
-
-%typemap(freearg) int *attribList
-{
-    delete [] $1;
-}
-
-
-
-MustHaveApp(wxGLCanvas);
-
-class wxGLCanvas : public wxWindow {
-public:
-    %pythonAppend wxGLCanvas   "self._setOORInfo(self)"
-    wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize, long style = 0,
-               const wxString& name = wxPyGLCanvasNameStr,
-               int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette);
-
-    %pythonAppend wxGLCanvas   "val._setOORInfo(val)"
-    %RenameCtor(GLCanvasWithContext, 
-        wxGLCanvas( wxWindow *parent,
-                    const wxGLContext *shared = NULL,
-                    wxWindowID id = -1,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = 0,
-                    const wxString& name = wxPyGLCanvasNameStr,
-                    int *attribList = NULL,
-                    const wxPalette& palette = wxNullPalette ));
-
-    %nokwargs SetCurrent;
-    void SetCurrent();
-#ifndef __WXMAC__
-    void SetCurrent(const wxGLContext& RC);
-#endif
-    void SetColour(const wxString& colour);
-    void SwapBuffers();
-
-    wxGLContext* GetContext();
-
-#ifdef __WXMSW__
-    void SetupPixelFormat(int *attribList = NULL);
-    void SetupPalette(const wxPalette& palette);
-    wxPalette CreateDefaultPalette();
-    wxPalette* GetPalette();
-#endif
-
-    %property(Context, GetContext, doc="See `GetContext`");
-};
-
-
-//---------------------------------------------------------------------------
-
-%init %{
-
-%}
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------

wxPython/contrib/glcanvas/gtk/.cvsignore

@@ -1,2 +0,0 @@
-*~
-_glcanvas.cpp

wxPython/contrib/glcanvas/gtk/glcanvas.py

@@ -1,141 +0,0 @@
-# This file was created automatically by SWIG 1.3.29.
-# Don't modify this file, modify the SWIG interface instead.
-
-"""
-`GLCanvas` provides an OpenGL Context on a `wx.Window`.
-"""
-
-import _glcanvas
-import new
-new_instancemethod = new.instancemethod
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'PySwigObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static) or hasattr(self,name):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError,name
-
-def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
-import types
-try:
-    _object = types.ObjectType
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
-del types
-
-
-def _swig_setattr_nondynamic_method(set):
-    def set_attr(self,name,value):
-        if (name == "thisown"): return self.this.own(value)
-        if hasattr(self,name) or (name == "this"):
-            set(self,name,value)
-        else:
-            raise AttributeError("You cannot add attributes to %s" % self)
-    return set_attr
-
-
-import _core
-wx = _core 
-__docfilter__ = wx.__DocFilter(globals()) 
-class GLContext(_core.Object):
-    """Proxy of C++ GLContext class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """__init__(self, GLCanvas win, GLContext other=None) -> GLContext"""
-        _glcanvas.GLContext_swiginit(self,_glcanvas.new_GLContext(*args, **kwargs))
-    __swig_destroy__ = _glcanvas.delete_GLContext
-    __del__ = lambda self : None;
-    def SetCurrent(*args, **kwargs):
-        """SetCurrent(self, GLCanvas win)"""
-        return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
-
-_glcanvas.GLContext_swigregister(GLContext)
-cvar = _glcanvas.cvar
-GLCanvasNameStr = cvar.GLCanvasNameStr
-
-WX_GL_RGBA = _glcanvas.WX_GL_RGBA
-WX_GL_BUFFER_SIZE = _glcanvas.WX_GL_BUFFER_SIZE
-WX_GL_LEVEL = _glcanvas.WX_GL_LEVEL
-WX_GL_DOUBLEBUFFER = _glcanvas.WX_GL_DOUBLEBUFFER
-WX_GL_STEREO = _glcanvas.WX_GL_STEREO
-WX_GL_AUX_BUFFERS = _glcanvas.WX_GL_AUX_BUFFERS
-WX_GL_MIN_RED = _glcanvas.WX_GL_MIN_RED
-WX_GL_MIN_GREEN = _glcanvas.WX_GL_MIN_GREEN
-WX_GL_MIN_BLUE = _glcanvas.WX_GL_MIN_BLUE
-WX_GL_MIN_ALPHA = _glcanvas.WX_GL_MIN_ALPHA
-WX_GL_DEPTH_SIZE = _glcanvas.WX_GL_DEPTH_SIZE
-WX_GL_STENCIL_SIZE = _glcanvas.WX_GL_STENCIL_SIZE
-WX_GL_MIN_ACCUM_RED = _glcanvas.WX_GL_MIN_ACCUM_RED
-WX_GL_MIN_ACCUM_GREEN = _glcanvas.WX_GL_MIN_ACCUM_GREEN
-WX_GL_MIN_ACCUM_BLUE = _glcanvas.WX_GL_MIN_ACCUM_BLUE
-WX_GL_MIN_ACCUM_ALPHA = _glcanvas.WX_GL_MIN_ACCUM_ALPHA
-class GLCanvas(_core.Window):
-    """Proxy of C++ GLCanvas class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """
-        __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=0, String name=GLCanvasNameStr, 
-            int attribList=None, Palette palette=wxNullPalette) -> GLCanvas
-        """
-        _glcanvas.GLCanvas_swiginit(self,_glcanvas.new_GLCanvas(*args, **kwargs))
-        self._setOORInfo(self)
-
-    def SetCurrent(*args):
-        """
-        SetCurrent(self)
-        SetCurrent(self, GLContext RC)
-        """
-        return _glcanvas.GLCanvas_SetCurrent(*args)
-
-    def SetColour(*args, **kwargs):
-        """SetColour(self, String colour)"""
-        return _glcanvas.GLCanvas_SetColour(*args, **kwargs)
-
-    def SwapBuffers(*args, **kwargs):
-        """SwapBuffers(self)"""
-        return _glcanvas.GLCanvas_SwapBuffers(*args, **kwargs)
-
-    def GetContext(*args, **kwargs):
-        """GetContext(self) -> GLContext"""
-        return _glcanvas.GLCanvas_GetContext(*args, **kwargs)
-
-    Context = property(GetContext,doc="See `GetContext`") 
-_glcanvas.GLCanvas_swigregister(GLCanvas)
-
-def GLCanvasWithContext(*args, **kwargs):
-    """
-    GLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
-        Size size=DefaultSize, 
-        long style=0, String name=GLCanvasNameStr, 
-        int attribList=None, Palette palette=wxNullPalette) -> GLCanvas
-    """
-    val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs)
-    val._setOORInfo(val)
-    return val
-
-
-

wxPython/contrib/glcanvas/mac/glcanvas.py

@@ -1,137 +0,0 @@
-# This file was created automatically by SWIG 1.3.29.
-# Don't modify this file, modify the SWIG interface instead.
-
-"""
-`GLCanvas` provides an OpenGL Context on a `wx.Window`.
-"""
-
-import _glcanvas
-import new
-new_instancemethod = new.instancemethod
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'PySwigObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static) or hasattr(self,name):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError,name
-
-def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
-import types
-try:
-    _object = types.ObjectType
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
-del types
-
-
-def _swig_setattr_nondynamic_method(set):
-    def set_attr(self,name,value):
-        if (name == "thisown"): return self.this.own(value)
-        if hasattr(self,name) or (name == "this"):
-            set(self,name,value)
-        else:
-            raise AttributeError("You cannot add attributes to %s" % self)
-    return set_attr
-
-
-import _core
-wx = _core 
-__docfilter__ = wx.__DocFilter(globals()) 
-class GLContext(_core.Object):
-    """Proxy of C++ GLContext class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """
-        __init__(self, bool isRGB, GLCanvas win, Palette palette=wxNullPalette, 
-            GLContext other=None) -> GLContext
-        """
-        _glcanvas.GLContext_swiginit(self,_glcanvas.new_GLContext(*args, **kwargs))
-    __swig_destroy__ = _glcanvas.delete_GLContext
-    __del__ = lambda self : None;
-_glcanvas.GLContext_swigregister(GLContext)
-cvar = _glcanvas.cvar
-GLCanvasNameStr = cvar.GLCanvasNameStr
-
-WX_GL_RGBA = _glcanvas.WX_GL_RGBA
-WX_GL_BUFFER_SIZE = _glcanvas.WX_GL_BUFFER_SIZE
-WX_GL_LEVEL = _glcanvas.WX_GL_LEVEL
-WX_GL_DOUBLEBUFFER = _glcanvas.WX_GL_DOUBLEBUFFER
-WX_GL_STEREO = _glcanvas.WX_GL_STEREO
-WX_GL_AUX_BUFFERS = _glcanvas.WX_GL_AUX_BUFFERS
-WX_GL_MIN_RED = _glcanvas.WX_GL_MIN_RED
-WX_GL_MIN_GREEN = _glcanvas.WX_GL_MIN_GREEN
-WX_GL_MIN_BLUE = _glcanvas.WX_GL_MIN_BLUE
-WX_GL_MIN_ALPHA = _glcanvas.WX_GL_MIN_ALPHA
-WX_GL_DEPTH_SIZE = _glcanvas.WX_GL_DEPTH_SIZE
-WX_GL_STENCIL_SIZE = _glcanvas.WX_GL_STENCIL_SIZE
-WX_GL_MIN_ACCUM_RED = _glcanvas.WX_GL_MIN_ACCUM_RED
-WX_GL_MIN_ACCUM_GREEN = _glcanvas.WX_GL_MIN_ACCUM_GREEN
-WX_GL_MIN_ACCUM_BLUE = _glcanvas.WX_GL_MIN_ACCUM_BLUE
-WX_GL_MIN_ACCUM_ALPHA = _glcanvas.WX_GL_MIN_ACCUM_ALPHA
-class GLCanvas(_core.Window):
-    """Proxy of C++ GLCanvas class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """
-        __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=0, String name=GLCanvasNameStr, 
-            int attribList=None, Palette palette=wxNullPalette) -> GLCanvas
-        """
-        _glcanvas.GLCanvas_swiginit(self,_glcanvas.new_GLCanvas(*args, **kwargs))
-        self._setOORInfo(self)
-
-    def SetCurrent(*args):
-        """SetCurrent(self)"""
-        return _glcanvas.GLCanvas_SetCurrent(*args)
-
-    def SetColour(*args, **kwargs):
-        """SetColour(self, String colour)"""
-        return _glcanvas.GLCanvas_SetColour(*args, **kwargs)
-
-    def SwapBuffers(*args, **kwargs):
-        """SwapBuffers(self)"""
-        return _glcanvas.GLCanvas_SwapBuffers(*args, **kwargs)
-
-    def GetContext(*args, **kwargs):
-        """GetContext(self) -> GLContext"""
-        return _glcanvas.GLCanvas_GetContext(*args, **kwargs)
-
-    Context = property(GetContext,doc="See `GetContext`") 
-_glcanvas.GLCanvas_swigregister(GLCanvas)
-
-def GLCanvasWithContext(*args, **kwargs):
-    """
-    GLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
-        Size size=DefaultSize, 
-        long style=0, String name=GLCanvasNameStr, 
-        int attribList=None, Palette palette=wxNullPalette) -> GLCanvas
-    """
-    val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs)
-    val._setOORInfo(val)
-    return val
-
-
-

wxPython/contrib/glcanvas/msw/.cvsignore

@@ -1 +0,0 @@
-*~

wxPython/contrib/glcanvas/msw/glcanvas.py

@@ -1,157 +0,0 @@
-# This file was created automatically by SWIG 1.3.29.
-# Don't modify this file, modify the SWIG interface instead.
-
-"""
-`GLCanvas` provides an OpenGL Context on a `wx.Window`.
-"""
-
-import _glcanvas
-import new
-new_instancemethod = new.instancemethod
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'PySwigObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static) or hasattr(self,name):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError,name
-
-def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
-import types
-try:
-    _object = types.ObjectType
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
-del types
-
-
-def _swig_setattr_nondynamic_method(set):
-    def set_attr(self,name,value):
-        if (name == "thisown"): return self.this.own(value)
-        if hasattr(self,name) or (name == "this"):
-            set(self,name,value)
-        else:
-            raise AttributeError("You cannot add attributes to %s" % self)
-    return set_attr
-
-
-import _core
-wx = _core 
-__docfilter__ = wx.__DocFilter(globals()) 
-class GLContext(_core.Object):
-    """Proxy of C++ GLContext class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """__init__(self, GLCanvas win, GLContext other=None) -> GLContext"""
-        _glcanvas.GLContext_swiginit(self,_glcanvas.new_GLContext(*args, **kwargs))
-    __swig_destroy__ = _glcanvas.delete_GLContext
-    __del__ = lambda self : None;
-    def SetCurrent(*args, **kwargs):
-        """SetCurrent(self, GLCanvas win)"""
-        return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
-
-_glcanvas.GLContext_swigregister(GLContext)
-cvar = _glcanvas.cvar
-GLCanvasNameStr = cvar.GLCanvasNameStr
-
-WX_GL_RGBA = _glcanvas.WX_GL_RGBA
-WX_GL_BUFFER_SIZE = _glcanvas.WX_GL_BUFFER_SIZE
-WX_GL_LEVEL = _glcanvas.WX_GL_LEVEL
-WX_GL_DOUBLEBUFFER = _glcanvas.WX_GL_DOUBLEBUFFER
-WX_GL_STEREO = _glcanvas.WX_GL_STEREO
-WX_GL_AUX_BUFFERS = _glcanvas.WX_GL_AUX_BUFFERS
-WX_GL_MIN_RED = _glcanvas.WX_GL_MIN_RED
-WX_GL_MIN_GREEN = _glcanvas.WX_GL_MIN_GREEN
-WX_GL_MIN_BLUE = _glcanvas.WX_GL_MIN_BLUE
-WX_GL_MIN_ALPHA = _glcanvas.WX_GL_MIN_ALPHA
-WX_GL_DEPTH_SIZE = _glcanvas.WX_GL_DEPTH_SIZE
-WX_GL_STENCIL_SIZE = _glcanvas.WX_GL_STENCIL_SIZE
-WX_GL_MIN_ACCUM_RED = _glcanvas.WX_GL_MIN_ACCUM_RED
-WX_GL_MIN_ACCUM_GREEN = _glcanvas.WX_GL_MIN_ACCUM_GREEN
-WX_GL_MIN_ACCUM_BLUE = _glcanvas.WX_GL_MIN_ACCUM_BLUE
-WX_GL_MIN_ACCUM_ALPHA = _glcanvas.WX_GL_MIN_ACCUM_ALPHA
-class GLCanvas(_core.Window):
-    """Proxy of C++ GLCanvas class"""
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
-    __repr__ = _swig_repr
-    def __init__(self, *args, **kwargs): 
-        """
-        __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
-            Size size=DefaultSize, long style=0, String name=GLCanvasNameStr, 
-            int attribList=None, Palette palette=wxNullPalette) -> GLCanvas
-        """
-        _glcanvas.GLCanvas_swiginit(self,_glcanvas.new_GLCanvas(*args, **kwargs))
-        self._setOORInfo(self)
-
-    def SetCurrent(*args):
-        """
-        SetCurrent(self)
-        SetCurrent(self, GLContext RC)
-        """
-        return _glcanvas.GLCanvas_SetCurrent(*args)
-
-    def SetColour(*args, **kwargs):
-        """SetColour(self, String colour)"""
-        return _glcanvas.GLCanvas_SetColour(*args, **kwargs)
-
-    def SwapBuffers(*args, **kwargs):
-        """SwapBuffers(self)"""
-        return _glcanvas.GLCanvas_SwapBuffers(*args, **kwargs)
-
-    def GetContext(*args, **kwargs):
-        """GetContext(self) -> GLContext"""
-        return _glcanvas.GLCanvas_GetContext(*args, **kwargs)
-
-    def SetupPixelFormat(*args, **kwargs):
-        """SetupPixelFormat(self, int attribList=None)"""
-        return _glcanvas.GLCanvas_SetupPixelFormat(*args, **kwargs)
-
-    def SetupPalette(*args, **kwargs):
-        """SetupPalette(self, Palette palette)"""
-        return _glcanvas.GLCanvas_SetupPalette(*args, **kwargs)
-
-    def CreateDefaultPalette(*args, **kwargs):
-        """CreateDefaultPalette(self) -> Palette"""
-        return _glcanvas.GLCanvas_CreateDefaultPalette(*args, **kwargs)
-
-    def GetPalette(*args, **kwargs):
-        """GetPalette(self) -> Palette"""
-        return _glcanvas.GLCanvas_GetPalette(*args, **kwargs)
-
-    Context = property(GetContext,doc="See `GetContext`") 
-_glcanvas.GLCanvas_swigregister(GLCanvas)
-
-def GLCanvasWithContext(*args, **kwargs):
-    """
-    GLCanvasWithContext(Window parent, GLContext shared=None, int id=-1, Point pos=DefaultPosition, 
-        Size size=DefaultSize, 
-        long style=0, String name=GLCanvasNameStr, 
-        int attribList=None, Palette palette=wxNullPalette) -> GLCanvas
-    """
-    val = _glcanvas.new_GLCanvasWithContext(*args, **kwargs)
-    val._setOORInfo(val)
-    return val
-
-
-

wxPython/contrib/ogl/.cvsignore

@@ -1,6 +0,0 @@
-Makefile
-contrib
-oglc.exp
-oglc.ilk
-oglc.pch
-oglc.pyd

wxPython/contrib/ogl/_oglbasic.i

@@ -1,410 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        oglbasic.i
-// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
-//
-// Author:      Robin Dunn
-//
-// Created:     3-Sept-1999
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-
-// Not a %module
-
-
-//---------------------------------------------------------------------------
-%newgroup;
-
-
-class wxShapeRegion : public wxObject {
-public:
-    wxShapeRegion();
-    //~wxShapeRegion();
-
-    void SetText(const wxString& s);
-    void SetFont(wxFont *f);
-    void SetMinSize(double w, double h);
-    void SetSize(double w, double h);
-    void SetPosition(double x, double y);
-    void SetProportions(double x, double y);
-    void SetFormatMode(int mode);
-    void SetName(const wxString& s);
-    void SetColour(const wxString& col);
-
-    wxString GetText();
-    wxFont *GetFont();
-    void GetMinSize(double *OUTPUT, double *OUTPUT);
-    void GetProportion(double *OUTPUT, double *OUTPUT);
-    void GetSize(double *OUTPUT, double *OUTPUT);
-    void GetPosition(double *OUTPUT, double *OUTPUT);
-    int GetFormatMode();
-    wxString GetName();
-    wxString GetColour();
-    wxColour GetActualColourObject();
-    wxList& GetFormattedText();
-    wxString GetPenColour();
-    int GetPenStyle();
-    void SetPenStyle(int style);
-    void SetPenColour(const wxString& col);
-    wxPen *GetActualPen();
-    double GetWidth();
-    double GetHeight();
-
-    void ClearText();
-};
-
-
-//---------------------------------------------------------------------------
-
-/*
- * User-defined attachment point
- */
-
-class wxAttachmentPoint: public wxObject
-{
-public:
-    wxAttachmentPoint(int id=0, double x=0.0, double y=0.0);
-    int            m_id;           // Identifier
-    double         m_x;            // x offset from centre of object
-    double         m_y;            // y offset from centre of object
-};
-
-
-//---------------------------------------------------------------------------
-
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyShapeEvtHandler,wxShapeEvtHandler);
-%}
-
-
-class wxPyShapeEvtHandler : public wxObject {
-public:
-    %pythonAppend wxPyShapeEvtHandler "self._setOORandCallbackInfo(PyShapeEvtHandler)"
-     %typemap(out) wxPyShapeEvtHandler*;    // turn off this typemap
-   
-    wxPyShapeEvtHandler(wxPyShapeEvtHandler *prev = NULL,
-                        wxPyShape *shape = NULL);
-
-    %typemap(out) wxPyShapeEvtHandler*      { $result = wxPyMake_wxShapeEvtHandler($1, $owner); }
-
-    
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-    %extend {
-        void _setOORInfo(PyObject* _self) {
-            self->SetClientObject(new wxPyOORClientData(_self));
-        }
-    }
-    %pythoncode {
-    def _setOORandCallbackInfo(self, _class):
-        self._setOORInfo(self)
-        self._setCallbackInfo(self, _class)
-    }
-
-    
-    void SetShape(wxPyShape *sh);
-    wxPyShape *GetShape();
-    void SetPreviousHandler(wxPyShapeEvtHandler* handler);
-    wxPyShapeEvtHandler* GetPreviousHandler();
-    wxPyShapeEvtHandler* CreateNewCopy();
-
-    void base_OnDelete();
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = false);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-};
-
-//---------------------------------------------------------------------------
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape);
-%}
-
-
-class wxPyShape : public wxPyShapeEvtHandler {
-public:
-    %pythonAppend wxPyShape "self._setOORandCallbackInfo(PyShape)"
-    %typemap(out) wxPyShape*;    // turn off this typemap
-
-    wxPyShape(wxPyShapeCanvas *can = NULL);  
-
-    %typemap(out) wxPyShape*                { $result = wxPyMake_wxShapeEvtHandler($1, $owner); }
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    void GetBoundingBoxMax(double *OUTPUT, double *OUTPUT);
-    void GetBoundingBoxMin(double *OUTPUT, double *OUTPUT);
-    bool GetPerimeterPoint(double x1, double y1,
-                           double x2, double y2,
-                           double *OUTPUT, double *OUTPUT);
-    wxPyShapeCanvas *GetCanvas();
-    void SetCanvas(wxPyShapeCanvas *the_canvas);
-    void AddToCanvas(wxPyShapeCanvas *the_canvas, wxPyShape *addAfter = NULL);
-    void InsertInCanvas(wxPyShapeCanvas *the_canvas);
-    void RemoveFromCanvas(wxPyShapeCanvas *the_canvas);
-    double GetX();
-    double GetY();
-    void SetX(double x);
-    void SetY(double y);
-    wxPyShape *GetParent();
-    void SetParent(wxPyShape *p);
-    wxPyShape *GetTopAncestor();
-
-
-    // wxList& GetChildren();
-    %extend {
-        PyObject* GetChildren() {
-            wxList& list = self->GetChildren();
-            return wxPy_ConvertShapeList(&list);
-        }
-    }
-
-
-    void Unlink();
-    void SetDrawHandles(bool drawH);
-    bool GetDrawHandles();
-    void MakeControlPoints();
-    void DeleteControlPoints(wxDC *dc = NULL);
-    void ResetControlPoints();
-    wxPyShapeEvtHandler *GetEventHandler();
-    void SetEventHandler(wxPyShapeEvtHandler *handler);
-    void MakeMandatoryControlPoints();
-    void ResetMandatoryControlPoints();
-    bool Recompute();
-    void CalculateSize();
-    void Select(bool select = true, wxDC* dc = NULL);
-    void SetHighlight(bool hi = true, bool recurse = false);
-    bool IsHighlighted() ;
-    bool Selected();
-    bool AncestorSelected();
-    void SetSensitivityFilter(int sens = OP_ALL, bool recursive = false);
-    int GetSensitivityFilter();
-    void SetDraggable(bool drag, bool recursive = false);
-    void SetFixedSize(bool x, bool y);
-    void GetFixedSize(bool *OUTPUT, bool *OUTPUT) ;
-    bool GetFixedWidth();
-    bool GetFixedHeight();
-    void SetSpaceAttachments(bool sp);
-    bool GetSpaceAttachments() ;
-    void SetShadowMode(int mode, bool redraw = false);
-    int GetShadowMode();
-    bool HitTest(double x, double y, int *OUTPUT, double *OUTPUT);
-    void SetCentreResize(bool cr);
-    bool GetCentreResize();
-    void SetMaintainAspectRatio(bool ar);
-    bool GetMaintainAspectRatio();
-
-
-    // wxList& GetLines();
-    %extend {
-        PyObject* GetLines() {
-            wxList& list = self->GetLines();
-            return wxPy_ConvertShapeList(&list);
-        }
-    }
-
-    void SetDisableLabel(bool flag);
-    bool GetDisableLabel();
-    void SetAttachmentMode(int mode);
-    int GetAttachmentMode();
-    void SetId(long i);
-    long GetId();
-
-    void SetPen(wxPen *pen);
-    void SetBrush(wxBrush *brush);
-
-
-    // void SetClientData(wxObject *client_data);
-    // wxObject *GetClientData();
-
-    // The real client data methods are being used for OOR, so just fake it.
-    %pythoncode {
-    def SetClientData(self, data):
-        self.clientData = data
-    def GetClientData(self):
-        if hasattr(self, 'clientData'):
-            return self.clientData
-        else:
-            return None
-    }
-
-    void Show(bool show);
-    bool IsShown();
-    void Move(wxDC& dc, double x1, double y1, bool display = true);
-    void Erase(wxDC& dc);
-    void EraseContents(wxDC& dc);
-    void Draw(wxDC& dc);
-    void Flash();
-    void MoveLinks(wxDC& dc);
-    void DrawContents(wxDC& dc);
-    void SetSize(double x, double y, bool recursive = true);
-    void SetAttachmentSize(double x, double y);
-    void Attach(wxPyShapeCanvas *can);
-    void Detach();
-    bool Constrain();
-    void AddLine(wxPyLineShape *line, wxPyShape *other,
-                 int attachFrom = 0, int attachTo = 0,
-                 int positionFrom = -1, int positionTo = -1);
-    int GetLinePosition(wxPyLineShape* line);
-    void AddText(const wxString& string);
-    wxPen *GetPen();
-    wxBrush *GetBrush();
-    void SetDefaultRegionSize();
-    void FormatText(wxDC& dc, const wxString& s, int regionId = 0);
-    void SetFormatMode(int mode, int regionId = 0);
-    int GetFormatMode(int regionId = 0);
-    void SetFont(wxFont *font, int regionId = 0);
-    wxFont *GetFont(int regionId = 0);
-    void SetTextColour(const wxString& colour, int regionId = 0);
-    wxString GetTextColour(int regionId = 0);
-    int GetNumberOfTextRegions();
-    void SetRegionName(const wxString& name, int regionId = 0);
-    wxString GetRegionName(int regionId);
-    int GetRegionId(const wxString& name);
-    void NameRegions(const wxString& parentName = wxPyEmptyString);
-
-    // wxList& GetRegions();
-    %extend {
-        PyObject* GetRegions() {
-            wxList& list = self->GetRegions();
-            return wxPy_ConvertList(&list);
-        }
-    }
-
-    void AddRegion(wxShapeRegion *region);
-    void ClearRegions();
-    void AssignNewIds();
-    wxPyShape *FindRegion(const wxString& regionName, int *OUTPUT);
-    void FindRegionNames(wxStringList& list);
-    void ClearText(int regionId = 0);
-    void RemoveLine(wxPyLineShape *line);
-
-#ifdef wxUSE_PROLOGIO
-    void WriteAttributes(wxExpr *clause);
-    void ReadAttributes(wxExpr *clause);
-    void ReadConstraints(wxExpr *clause, wxExprDatabase *database);
-    void WriteRegions(wxExpr *clause);
-    void ReadRegions(wxExpr *clause);
-#endif
-
-    bool GetAttachmentPosition(int attachment, double *OUTPUT, double *OUTPUT,
-                               int nth = 0, int no_arcs = 1, wxPyLineShape *line = NULL);
-    int GetNumberOfAttachments();
-    bool AttachmentIsValid(int attachment);
-
-    %extend {
-        PyObject* GetAttachments() {
-            wxList& list = self->GetAttachments();
-            return wxPy_ConvertList(&list);            
-        }
-    }
-    
-    bool GetAttachmentPositionEdge(int attachment, double *OUTPUT, double *OUTPUT,
-                                   int nth = 0, int no_arcs = 1, wxPyLineShape *line = NULL);
-    wxRealPoint CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPoint& pt2,
-                                     int nth, int noArcs, wxPyLineShape* line);
-    bool AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, const wxRealPoint& pt2);
-    void EraseLinks(wxDC& dc, int attachment = -1, bool recurse = false);
-    void DrawLinks(wxDC& dc, int attachment = -1, bool recurse = false);
-    bool MoveLineToNewAttachment(wxDC& dc, wxPyLineShape *to_move,
-                                 double x, double y);
-
-    //void ApplyAttachmentOrdering(wxList& linesToSort);
-    %extend {
-        void ApplyAttachmentOrdering(PyObject* linesToSort) {
-            wxList* list = wxPy_wxListHelper(linesToSort, wxT("wxPyLineShape"));
-            self->ApplyAttachmentOrdering(*list);
-            delete list;
-        }
-    }
-
-    wxRealPoint GetBranchingAttachmentRoot(int attachment);
-    bool GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRealPoint& neck,
-                                    wxRealPoint& shoulder1, wxRealPoint& shoulder2);
-    bool GetBranchingAttachmentPoint(int attachment, int n, wxRealPoint& attachmentPoint,
-                                     wxRealPoint& stemPoint);
-    int GetAttachmentLineCount(int attachment);
-    void SetBranchNeckLength(int len);
-    int GetBranchNeckLength();
-    void SetBranchStemLength(int len);
-    int GetBranchStemLength();
-    void SetBranchSpacing(int len);
-    int GetBranchSpacing();
-    void SetBranchStyle(long style);
-    long GetBranchStyle();
-    int PhysicalToLogicalAttachment(int physicalAttachment);
-    int LogicalToPhysicalAttachment(int logicalAttachment);
-    bool Draggable();
-    bool HasDescendant(wxPyShape *image);
-    wxPyShape *CreateNewCopy(bool resetMapping = true, bool recompute = true);
-    void Copy(wxPyShape& copy);
-    void CopyWithHandler(wxPyShape& copy);
-    void Rotate(double x, double y, double theta);
-    double GetRotation();
-    void SetRotation(double rotation);
-    void ClearAttachments();
-    void Recentre(wxDC& dc);
-    void ClearPointList(wxList& list);
-    wxPen GetBackgroundPen();
-    wxBrush GetBackgroundBrush();
-
-    void base_OnDelete();
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = false);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-};
-
-//---------------------------------------------------------------------------
-

wxPython/contrib/ogl/_oglcanvas.i

@@ -1,161 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        oglcanvas.i
-// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
-//
-// Author:      Robin Dunn
-//
-// Created:     7-Sept-1999
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-
-// not a %module
-
-
-//---------------------------------------------------------------------------
-%{
-    // Put some wx default wxChar* values into wxStrings.
-    DECLARE_DEF_STRING(ShapeCanvasNameStr);
-%}
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-
-class wxDiagram : public wxObject {
-public:
-    wxDiagram();
-    //~wxDiagram();
-
-    void AddShape(wxPyShape* shape, wxPyShape *addAfter = NULL);
-    void Clear(wxDC& dc);
-    void DeleteAllShapes();
-    void DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2);
-    wxPyShape* FindShape(long id);
-    wxPyShapeCanvas* GetCanvas();
-    int GetCount();
-    double GetGridSpacing();
-    int GetMouseTolerance();
-
-    // wxList* GetShapeList();
-    %extend {
-        PyObject* GetShapeList() {
-            wxList* list = self->GetShapeList();
-            return wxPy_ConvertShapeList(list);
-        }
-    }
-
-    bool GetQuickEditMode();
-    bool GetSnapToGrid();
-    void InsertShape(wxPyShape *shape);
-
-#ifdef wxUSE_PROLOGIO
-    bool LoadFile(const wxString& filename);
-    bool SaveFile(const wxString& filename);
-#endif
-
-#ifdef wxUSE_PROLOGIO
-    // **** Have to deal with wxExpr and wxExprDatabase first...
-    //void OnDatabaseLoad(wxExprDatabase& database);
-    //void OnDatabaseSave(wxExprDatabase& database);
-    //bool OnHeaderLoad(wxExprDatabase& database, wxExpr& expr);
-    //bool OnHeaderSave(wxExprDatabase& database, wxExpr& expr);
-    //bool OnShapeLoad(wxExprDatabase& database, wxPyShape& shape, wxExpr& expr);
-    //bool OnShapeSave(wxExprDatabase& database, wxPyShape& shape, wxExpr& expr);
-#endif
-
-#ifdef wxUSE_PROLOGIO
-    void ReadContainerGeometry(wxExprDatabase& database);
-    void ReadLines(wxExprDatabase& database);
-    void ReadNodes(wxExprDatabase& database);
-#endif
-
-    void RecentreAll(wxDC& dc);
-    void Redraw(wxDC& dc);
-    void RemoveAllShapes();
-    void RemoveShape(wxPyShape* shape);
-    void SetCanvas(wxPyShapeCanvas* canvas);
-    void SetGridSpacing(double spacing);
-    void SetMouseTolerance(int tolerance);
-    void SetQuickEditMode(bool mode);
-    void SetSnapToGrid(bool snap);
-    void ShowAll(bool show);
-    void Snap(double *INOUT, double *INOUT);
-
-};
-
-//---------------------------------------------------------------------------
-
-%{
-    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnBeginDragLeft);
-    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnBeginDragRight);
-    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnEndDragLeft);
-    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnEndDragRight);
-    IMP_PYCALLBACK__BOOL2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnDragLeft);
-    IMP_PYCALLBACK__BOOL2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnDragRight);
-    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnLeftClick);
-    IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnRightClick);
-%}
-
-
-MustHaveApp(wxPyShapeCanvas);
-
-class wxPyShapeCanvas : public wxScrolledWindow {
-public:
-    %pythonAppend wxPyShapeCanvas "self._setOORandCallbackInfo(PyShapeCanvas)"
-    %typemap(out) wxPyShapeCanvas*;    // turn off this typemap
-
-    wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxBORDER,
-                    const wxString& name = wxPyShapeCanvasNameStr);
-
-    %typemap(out) wxPyShapeCanvas*          { $result = wxPyMake_wxObject($1, $owner); }
-    
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-    %pythoncode {
-    def _setOORandCallbackInfo(self, _class):
-        self._setOORInfo(self)
-        self._setCallbackInfo(self, _class)
-    }
-
-    void AddShape(wxPyShape *shape, wxPyShape *addAfter = NULL);
-
-    // ****  Need a typemap for wxClassInfo, or fully implement wxObject, etc.....
-    wxPyShape* FindShape(double x1, double y, int *OUTPUT,
-                       wxClassInfo *info = NULL, wxPyShape* notImage = NULL);
-
-    wxPyShape * FindFirstSensitiveShape(double x1, double y, int *OUTPUT, int op);
-    wxDiagram* GetDiagram();
-
-    bool GetQuickEditMode();
-    void InsertShape(wxPyShape* shape);
-
-
-    void base_OnBeginDragLeft(double x, double y, int keys = 0);
-    void base_OnBeginDragRight(double x, double y, int keys = 0);
-    void base_OnEndDragLeft(double x, double y, int keys = 0);
-    void base_OnEndDragRight(double x, double y, int keys = 0);
-    void base_OnDragLeft(bool draw, double x, double y, int keys = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys = 0);
-    void base_OnLeftClick(double x, double y, int keys = 0);
-    void base_OnRightClick(double x, double y, int keys = 0);
-
-    void Redraw(wxDC& dc);
-    void RemoveShape(wxPyShape *shape);
-    void SetDiagram(wxDiagram *diagram);
-    void Snap(double *INOUT, double *INOUT);
-
-
-    %pythoncode {
-    def GetShapeList(self):
-        return self.GetDiagram().GetShapeList()
-    }
-};
-
-
-//---------------------------------------------------------------------------
-
-

wxPython/contrib/ogl/_ogldefs.i

@@ -1,96 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        _ogldefs.i
-// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
-//
-// Author:      Robin Dunn
-//
-// Created:     27-Aug-1999
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-
-//---------------------------------------------------------------------------
-// Typemaps just for OGL
-
-
-// OOR Support
-%typemap(out) wxPyShape*                { $result = wxPyMake_wxShapeEvtHandler($1, $owner); }
-%typemap(out) wxPyShapeEvtHandler*      { $result = wxPyMake_wxShapeEvtHandler($1, $owner); }
-%typemap(out) wxPyDivisionShape*        { $result = wxPyMake_wxShapeEvtHandler($1, $owner); }
-
-%typemap(out) wxPyShapeCanvas*          { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxDiagram*                { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxOGLConstraint*          { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxPseudoMetaFile*         { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxArrowHead*              { $result = wxPyMake_wxObject($1, $owner); }
-
-
-
-
-// wxOGL doesn't use a ref-counted copy of pens and brushes, so we'll
-// use the pen and brush lists to simulate that...
-
-%typemap(in) wxPen* {
-    wxPen* temp;
-    if ($input) {
-        if ($input == Py_None) { temp = NULL; }
-        else if (! wxPyConvertSwigPtr($input, (void **) &temp, wxT("wxPen"))) {
-            PyErr_SetString(PyExc_TypeError, "Type error, expected wxPen.");
-        return NULL;
-        }
-    }
-    if (temp)
-        $1 = wxThePenList->FindOrCreatePen(temp->GetColour(),
-                                           temp->GetWidth(),
-                                           temp->GetStyle());
-    else
-        $1 = NULL;
-}
-
-%typemap(in) wxBrush* {
-    wxBrush* temp;
-    if ($input) {
-        if ($input == Py_None) { temp = NULL; }
-        else if (! wxPyConvertSwigPtr($input, (void **) &temp, wxT("wxBrush"))) {
-            PyErr_SetString(PyExc_TypeError, "Type error, expected wxBrush.");
-        return NULL;
-        }
-    }
-    if (temp)
-        $1 = wxTheBrushList->FindOrCreateBrush(temp->GetColour(), temp->GetStyle());
-    else
-        $1 = NULL;
-}
-
-
-%typemap(in) wxFont* {
-    wxFont* temp;
-    if ($input) {
-        if ($input == Py_None) { temp = NULL; }
-        else if (! wxPyConvertSwigPtr($input, (void **) &temp, wxT("wxFont"))) {
-            PyErr_SetString(PyExc_TypeError, "Type error, expected wxFont.");
-        return NULL;
-        }
-    }
-    if (temp)
-        $1 = wxTheFontList->FindOrCreateFont(temp->GetPointSize(),
-                                             temp->GetFamily(),
-                                             temp->GetStyle(),
-                                             temp->GetWeight(),
-                                             temp->GetUnderlined(),
-                                             temp->GetFaceName(),
-                                             temp->GetEncoding());
-    else
-        $1 = NULL;
-}
-
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-
-
-
-
-

wxPython/contrib/ogl/_oglshapes.i

@@ -1,613 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        oglshapes.i
-// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
-//
-// Author:      Robin Dunn
-//
-// Created:     3-Sept-1999
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-
-// not a %module
-
-
-//---------------------------------------------------------------------------
-
-enum {
-    oglMETAFLAGS_OUTLINE,
-    oglMETAFLAGS_ATTACHMENTS
-};
-
-//---------------------------------------------------------------------------
-
-%typemap(in) (int points, wxPoint* points_array ) {
-    $2 = wxPoint_LIST_helper($input, &$1);
-    if ($2 == NULL) SWIG_fail;
-}
-%typemap(freearg) (int points, wxPoint* points_array ) {
-    if ($2) delete [] $2;
-}
-
-//---------------------------------------------------------------------------
-
-class wxPseudoMetaFile : public wxObject {
-public:
-  wxPseudoMetaFile();
-  ~wxPseudoMetaFile();
-
-    void Draw(wxDC& dc, double xoffset, double yoffset);
-#ifdef wxUSE_PROLOGIO
-    void WriteAttributes(wxExpr *clause, int whichAngle);
-    void ReadAttributes(wxExpr *clause, int whichAngle);
-#endif
-    void Clear();
-    void Copy(wxPseudoMetaFile& copy);
-    void Scale(double sx, double sy);
-    void ScaleTo(double w, double h);
-    void Translate(double x, double y);
-    void Rotate(double x, double y, double theta);
-    bool LoadFromMetaFile(const wxString& filename, double *width, double *height);
-    void GetBounds(double *minX, double *minY, double *maxX, double *maxY);
-    void CalculateSize(wxPyDrawnShape* shape);
-
-    // ****  fix these...  is it even possible?  these are lists of various GDI opperations (not the objects...)
-    // wxList& GetOutlineColours();
-    // wxList& GetFillColours();
-    // wxList& GetOps();
-
-    void SetRotateable(bool rot);
-    bool GetRotateable();
-    void SetSize(double w, double h);
-    void SetFillBrush(wxBrush* brush);
-    wxBrush* GetFillBrush();
-    void SetOutlinePen(wxPen* pen);
-    wxPen* GetOutlinePen();
-    void SetOutlineOp(int op);
-    int GetOutlineOp();
-
-
-    bool IsValid();
-    void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
-    void DrawRectangle(const wxRect& rect);
-    void DrawRoundedRectangle(const wxRect& rect, double radius);
-    void DrawArc(const wxPoint& centrePt, const wxPoint& startPt, const wxPoint& endPt);
-    void DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle);
-    void DrawEllipse(const wxRect& rect);
-    void DrawPoint(const wxPoint& pt);
-    void DrawText(const wxString& text, const wxPoint& pt);
-    void DrawLines(int points, wxPoint* points_array);
-    void DrawPolygon(int points, wxPoint* points_array, int flags = 0);
-    void DrawSpline(int points, wxPoint* points_array);
-    void SetClippingRect(const wxRect& rect);
-    void DestroyClippingRect();
-    void SetPen(wxPen* pen, bool isOutline = FALSE);
-    void SetBrush(wxBrush* brush, bool isFill = FALSE);
-    void SetFont(wxFont* font);
-    void SetTextColour(const wxColour& colour);
-    void SetBackgroundColour(const wxColour& colour);
-    void SetBackgroundMode(int mode);
-};
-
-
-//---------------------------------------------------------------------------
-
-%{
-// Using this macro can sometimes provoke an Internal Compiler Error in MSVC
-// 6, so instead I'l just expand it out by hand...
-//    WXSHAPE_IMP_CALLBACKS(wxPyRectangleShape, wxRectangleShape);
-
-    IMP_PYCALLBACK__                (wxPyRectangleShape, wxRectangleShape,  OnDelete);
-    IMP_PYCALLBACK__DC              (wxPyRectangleShape, wxRectangleShape,  OnDraw);
-    IMP_PYCALLBACK__DC              (wxPyRectangleShape, wxRectangleShape,  OnDrawContents);
-    IMP_PYCALLBACK__DCBOOL          (wxPyRectangleShape, wxRectangleShape,  OnDrawBranches);
-    IMP_PYCALLBACK__DC              (wxPyRectangleShape, wxRectangleShape,  OnMoveLinks);
-    IMP_PYCALLBACK__DC              (wxPyRectangleShape, wxRectangleShape,  OnErase);
-    IMP_PYCALLBACK__DC              (wxPyRectangleShape, wxRectangleShape,  OnEraseContents);
-    IMP_PYCALLBACK__DC              (wxPyRectangleShape, wxRectangleShape,  OnHighlight);
-    IMP_PYCALLBACK__2DBL2INT        (wxPyRectangleShape, wxRectangleShape,  OnLeftClick);
-    IMP_PYCALLBACK__2DBL2INT        (wxPyRectangleShape, wxRectangleShape,  OnLeftDoubleClick);
-    IMP_PYCALLBACK__2DBL2INT        (wxPyRectangleShape, wxRectangleShape,  OnRightClick);
-    IMP_PYCALLBACK__2DBL            (wxPyRectangleShape, wxRectangleShape,  OnSize);
-    IMP_PYCALLBACK_BOOL_DC4DBLBOOL  (wxPyRectangleShape, wxRectangleShape,  OnMovePre);
-    IMP_PYCALLBACK__DC4DBLBOOL      (wxPyRectangleShape, wxRectangleShape,  OnMovePost);
-    IMP_PYCALLBACK__BOOL2DBL2INT    (wxPyRectangleShape, wxRectangleShape,  OnDragLeft);
-    IMP_PYCALLBACK__2DBL2INT        (wxPyRectangleShape, wxRectangleShape,  OnBeginDragLeft);
-    IMP_PYCALLBACK__2DBL2INT        (wxPyRectangleShape, wxRectangleShape,  OnEndDragLeft);
-    IMP_PYCALLBACK__BOOL2DBL2INT    (wxPyRectangleShape, wxRectangleShape,  OnDragRight);
-    IMP_PYCALLBACK__2DBL2INT        (wxPyRectangleShape, wxRectangleShape,  OnBeginDragRight);
-    IMP_PYCALLBACK__2DBL2INT        (wxPyRectangleShape, wxRectangleShape,  OnEndDragRight);
-    IMP_PYCALLBACK__DC4DBL          (wxPyRectangleShape, wxRectangleShape,  OnDrawOutline);
-    IMP_PYCALLBACK__DC              (wxPyRectangleShape, wxRectangleShape,  OnDrawControlPoints);
-    IMP_PYCALLBACK__DC              (wxPyRectangleShape, wxRectangleShape,  OnEraseControlPoints);
-    IMP_PYCALLBACK__DCBOOL          (wxPyRectangleShape, wxRectangleShape,  OnMoveLink);
-    IMP_PYCALLBACK__WXCPBOOL2DBL2INT(wxPyRectangleShape, wxRectangleShape,  OnSizingDragLeft);
-    IMP_PYCALLBACK__WXCP2DBL2INT    (wxPyRectangleShape, wxRectangleShape,  OnSizingBeginDragLeft);
-    IMP_PYCALLBACK__WXCP2DBL2INT    (wxPyRectangleShape, wxRectangleShape,  OnSizingEndDragLeft);
-    IMP_PYCALLBACK__2DBL            (wxPyRectangleShape, wxRectangleShape,  OnBeginSize);
-    IMP_PYCALLBACK__2DBL            (wxPyRectangleShape, wxRectangleShape,  OnEndSize)
-        
-%}
-
-class wxPyRectangleShape : public wxPyShape {
-public:
-    %pythonAppend wxPyRectangleShape "self._setOORandCallbackInfo(PyRectangleShape)"
-    
-    wxPyRectangleShape(double width = 0.0, double height = 0.0);
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    void SetCornerRadius(double radius);
-    double GetCornerRadius();
-    
-    void base_OnDelete();
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-};
-
-//---------------------------------------------------------------------------
-
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyControlPoint, wxControlPoint);
-%}
-
-class wxPyControlPoint : public wxPyRectangleShape {
-public:
-    %pythonAppend wxPyControlPoint "self._setOORandCallbackInfo(PyControlPoint)"
-    
-    wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
-                     wxPyShape *object = NULL,
-                     double size = 0.0, double the_xoffset = 0.0,
-                     double the_yoffset = 0.0, int the_type = 0);
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    void SetCornerRadius(double radius);
-
-    void base_OnDelete();
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-};
-
-//---------------------------------------------------------------------------
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyBitmapShape, wxBitmapShape);
-%}
-
-
-class wxPyBitmapShape : public wxPyRectangleShape {
-public:
-    %pythonAppend wxPyBitmapShape "self._setOORandCallbackInfo(PyBitmapShape)"
-    
-    wxPyBitmapShape();
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    wxBitmap& GetBitmap();
-    wxString GetFilename();
-    void SetBitmap(const wxBitmap& bitmap);
-    void SetFilename(const wxString& filename);
-
-    void base_OnDelete();
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-};
-
-//---------------------------------------------------------------------------
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyDrawnShape, wxDrawnShape);
-%}
-
-class wxPyDrawnShape : public wxPyRectangleShape {
-public:
-    %pythonAppend wxPyDrawnShape "self._setOORandCallbackInfo(PyDrawnShape)"
-    
-    wxPyDrawnShape();
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    void CalculateSize();
-    void DestroyClippingRect();
-    void DrawArc(const wxPoint& centrePoint, const wxPoint& startPoint,
-                 const wxPoint& endPoint);
-    void DrawAtAngle(int angle);
-    void DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle);
-    void DrawLine(const wxPoint& point1, const wxPoint& point2);
-    void DrawLines(int points, wxPoint* points_array);
-    void DrawPoint(const wxPoint& point);
-    
-    void DrawPolygon(int points, wxPoint* points_array, int flags = 0);
-    
-    void DrawRectangle(const wxRect& rect);
-    void DrawRoundedRectangle(const wxRect& rect, double radius);
-    void DrawSpline(int points, wxPoint* points_array);
-    void DrawText(const wxString& text, const wxPoint& point);
-    int GetAngle();
-
-    wxPseudoMetaFile& GetMetaFile();
-
-    double GetRotation();
-    bool LoadFromMetaFile(const wxString& filename);
-    void Rotate(double x, double y, double theta);
-    void SetClippingRect(const wxRect& rect);
-    void SetDrawnBackgroundColour(const wxColour& colour);
-    void SetDrawnBackgroundMode(int mode);
-    void SetDrawnBrush(wxBrush* pen, bool isOutline = FALSE);
-    void SetDrawnFont(wxFont* font);
-    void SetDrawnPen(wxPen* pen, bool isOutline = FALSE);
-    void SetDrawnTextColour(const wxColour& colour);
-    void Scale(double sx, double sy);
-    void SetSaveToFile(bool save);
-    void Translate(double x, double y);
-
-
-    void base_OnDelete();
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-
-};
-
-
-//---------------------------------------------------------------------------
-
-class wxOGLConstraint : public wxObject {
-public:
-    //wxOGLConstraint(int type, wxPyShape *constraining, wxList& constrained);
-    %extend {
-        wxOGLConstraint(int type, wxPyShape *constraining, PyObject* constrained) {
-            wxList* list = wxPy_wxListHelper(constrained, wxT("wxPyShape"));
-            wxOGLConstraint* rv = new wxOGLConstraint(type, constraining, *list);
-            delete list;
-            return rv;
-        }
-    }
-
-    //~wxOGLConstraint();  The wxCompositShape takes ownership of the constraint
-
-    bool Evaluate();
-    void SetSpacing(double x, double y);
-    bool Equals(double a, double b);
-
-};
-
-
-
-//---------------------------------------------------------------------------
-
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyCompositeShape, wxCompositeShape);
-%}
-
-class wxPyCompositeShape : public wxPyRectangleShape {
-public:
-    %pythonAppend wxPyCompositeShape "self._setOORandCallbackInfo(PyCompositeShape)"
-    
-    wxPyCompositeShape();
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-    
-    void AddChild(wxPyShape *child, wxPyShape *addAfter = NULL);
-    wxOGLConstraint * AddConstraint(wxOGLConstraint *constraint);
-
-
-    //wxOGLConstraint * AddConstraint(int type,
-    //                                wxPyShape *constraining,
-    //                                wxList& constrained);
-    %extend {
-        wxOGLConstraint * AddConstrainedShapes(int type, wxPyShape *constraining,
-                                               PyObject* constrained) {
-            wxList* list = wxPy_wxListHelper(constrained, wxT("wxPyShape"));
-            wxOGLConstraint* rv = self->AddConstraint(type, constraining, *list);
-            delete list;
-            return rv;
-        }
-    }
-
-    %Rename(AddSimpleConstraint, wxOGLConstraint*,  AddConstraint(int type,
-                                                             wxPyShape *constraining,
-                                                             wxPyShape *constrained));
-
-    void CalculateSize();
-    bool ContainsDivision(wxPyDivisionShape *division);
-    void DeleteConstraint(wxOGLConstraint *constraint);
-    void DeleteConstraintsInvolvingChild(wxPyShape *child);
-
-    // ****  Needs an output typemap
-    //wxOGLConstraint * FindConstraint(long id, wxPyCompositeShape **actualComposite);
-
-    wxPyShape * FindContainerImage();
-
-    // wxList& GetConstraints();
-    // wxList& GetDivisions();
-    %extend {
-        PyObject* GetConstraints() {
-            wxList& list = self->GetConstraints();
-            return wxPy_ConvertList(&list);
-        }
-
-        PyObject* GetDivisions() {
-            wxList& list = self->GetDivisions();
-            return wxPy_ConvertShapeList(&list);
-        }
-    }
-
-    void MakeContainer();
-    bool Recompute();
-    void RemoveChild(wxPyShape *child);
-
-
-    void base_OnDelete();
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-
-};
-
-
-//---------------------------------------------------------------------------
-
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyDividedShape, wxDividedShape);
-%}
-
-class wxPyDividedShape : public wxPyRectangleShape {
-public:
-    %pythonAppend wxPyDividedShape "self._setOORandCallbackInfo(PyDividedShape)"
-    
-    wxPyDividedShape(double width = 0.0, double height = 0.0);
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    void EditRegions();
-    void SetRegionSizes();
-
-    void base_OnDelete();
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-
-};
-
-
-//---------------------------------------------------------------------------
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyDivisionShape, wxDivisionShape);
-%}
-
-class wxPyDivisionShape : public wxPyCompositeShape {
-public:
-    %pythonAppend wxPyDivisionShape "self._setOORandCallbackInfo(PyDivisionShape)"
-    %typemap(out) wxPyDivisionShape*;    // turn off this typemap
-    
-    wxPyDivisionShape();
-
-    %typemap(out) wxPyDivisionShape*        { $result = wxPyMake_wxShapeEvtHandler($1, $owner); }
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    void AdjustBottom(double bottom, bool test);
-    void AdjustLeft(double left, bool test);
-    void AdjustRight(double right, bool test);
-    void AdjustTop(double top, bool test);
-    void Divide(int direction);
-    void EditEdge(int side);
-    wxPyDivisionShape * GetBottomSide();
-    int GetHandleSide();
-    wxPyDivisionShape * GetLeftSide();
-    wxString GetLeftSideColour();
-    wxPen * GetLeftSidePen();
-    wxPyDivisionShape * GetRightSide();
-    wxPyDivisionShape * GetTopSide();
-    wxPen * GetTopSidePen();
-    void ResizeAdjoining(int side, double newPos, bool test);
-    void PopupMenu(double x, double y);
-    void SetBottomSide(wxPyDivisionShape *shape);
-    void SetHandleSide(int side);
-    void SetLeftSide(wxPyDivisionShape *shape);
-    void SetLeftSideColour(const wxString& colour);
-    void SetLeftSidePen(wxPen *pen);
-    void SetRightSide(wxPyDivisionShape *shape);
-    void SetTopSide(wxPyDivisionShape *shape);
-    void SetTopSideColour(const wxString& colour);
-    void SetTopSidePen(wxPen *pen);
-
-
-
-    void base_OnDelete();
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-
-};
-
-
-
-//---------------------------------------------------------------------------
-

wxPython/contrib/ogl/_oglshapes2.i

@@ -1,411 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        oglshapes2.i
-// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
-//
-// Author:      Robin Dunn
-//
-// Created:     3-Sept-1999
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-
-// not a %module
-
-
-//---------------------------------------------------------------------------
-
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyEllipseShape, wxEllipseShape);
-%}
-
-class wxPyEllipseShape : public wxPyShape {
-public:
-    %pythonAppend wxPyEllipseShape "self._setOORandCallbackInfo(PyEllipseShape)"
-    
-    wxPyEllipseShape(double width = 0.0, double height = 0.0);
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-};
-
-//---------------------------------------------------------------------------
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyCircleShape, wxCircleShape);
-%}
-
-class wxPyCircleShape : public wxPyEllipseShape {
-public:
-    %pythonAppend wxPyCircleShape "self._setOORandCallbackInfo(PyCircleShape)"
-    
-    wxPyCircleShape(double width = 0.0);
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-};
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-
-class wxArrowHead : public wxObject {
-public:
-    wxArrowHead(int type = 0,
-                int end = 0,
-                double size = 0.0,
-                double dist = 0.0,
-                const wxString& name = wxPyEmptyString,
-                wxPseudoMetaFile *mf = NULL,
-                long arrowId = -1);
-    ~wxArrowHead();
-
-    int _GetType();
-    int GetPosition();
-    void SetPosition(int pos);
-    double GetXOffset();
-    double GetYOffset();
-    double GetSpacing();
-    double GetSize();
-    wxString GetName();
-    void SetXOffset(double x);
-    void SetYOffset(double y);
-    wxPseudoMetaFile *GetMetaFile();
-    long GetId();
-    int GetArrowEnd();
-    double GetArrowSize();
-    void SetSize(double size);
-    void SetSpacing(double sp);
-};
-//---------------------------------------------------------------------------
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyLineShape, wxLineShape);
-%}
-
-class wxPyLineShape : public wxPyShape {
-public:
-    %pythonAppend wxPyLineShape "self._setOORandCallbackInfo(PyLineShape)"
-    
-    wxPyLineShape();
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    void AddArrow(int type, int end = ARROW_POSITION_END,
-                  double arrowSize = 10.0, double xOffset = 0.0,
-                  const wxString& name = wxPyEmptyString, wxPseudoMetaFile *mf = NULL,
-                  long arrowId = -1);
-
-    //void AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int end);
-    %extend {
-        void AddArrowOrdered(wxArrowHead *arrow, PyObject* referenceList, int end) {
-            wxList* list = wxPy_wxListHelper(referenceList, wxT("wxArrowHead"));
-            self->AddArrowOrdered(arrow, *list, end);
-            delete list;
-        }
-    }
-    bool ClearArrow(const wxString& name);
-    void ClearArrowsAtPosition(int position = -1);
-    void DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool proportionalOffset);
-    %Rename(DeleteArrowHeadId, bool,  DeleteArrowHead(long arrowId));
-    bool DeleteArrowHead(int position, const wxString& name);
-    bool DeleteLineControlPoint();
-    void DrawArrows(wxDC& dc);
-    void DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
-    void EraseRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
-    %Rename(FindArrowHeadId, wxArrowHead *,  FindArrowHead(long arrowId));
-    wxArrowHead * FindArrowHead(int position, const wxString& name);
-    void FindLineEndPoints(double *OUTPUT, double *OUTPUT,
-                           double *OUTPUT, double *OUTPUT);
-    int FindLinePosition(double x, double y);
-    double FindMinimumWidth();
-    void FindNth(wxPyShape *image, int *OUTPUT, int *OUTPUT, bool incoming);
-    int GetAttachmentFrom();
-    int GetAttachmentTo();
-    void GetEnds(double *OUTPUT, double *OUTPUT, double *OUTPUT, double *OUTPUT);
-    wxPyShape * GetFrom();
-    void GetLabelPosition(int position, double *OUTPUT, double *OUTPUT);
-    wxRealPoint * GetNextControlPoint(wxPyShape *shape);
-    wxPyShape * GetTo();
-    void Initialise();
-    void InsertLineControlPoint(wxDC* dc);
-    bool IsEnd(wxPyShape *shape);
-    bool IsSpline();
-    void MakeLineControlPoints(int n);
-
-    //   inline wxList *GetLineControlPoints() { return m_lineControlPoints; }
-    %extend {
-        PyObject* GetLineControlPoints() {
-            wxList* list = self->GetLineControlPoints();
-            return wxPy_ConvertRealPointList(list);
-        }
-
-        // part of Patch# 893337
-        void SetLineControlPoints(PyObject* list) {
-            wxList* real_point_list = wxPy_wxRealPoint_ListHelper(list);
-            self->MakeLineControlPoints((int)(real_point_list->GetCount()));
-            wxList* old_control_points = self->GetLineControlPoints();
-            wxNode* old_node = old_control_points->GetFirst();
-            wxNode* real_node = real_point_list->GetFirst();
-            while(old_node)
-            {
-                wxRealPoint* old_point = (wxRealPoint*)old_node->GetData();
-                wxRealPoint* new_point = (wxRealPoint*)real_node->GetData();
-                old_point->x = new_point->x;
-                old_point->y = new_point->y;
-                old_node = old_node->GetNext();
-                real_node = real_node->GetNext();
-            }
-            self->ClearPointList(*real_point_list);
-            delete real_point_list;
-        }
-    }
-
-    void SetAttachmentFrom(int fromAttach);
-    void SetAttachments(int fromAttach, int toAttach);
-    void SetAttachmentTo(int toAttach);
-    void SetEnds(double x1, double y1, double x2, double y2);
-    void SetFrom(wxPyShape *object);
-    void SetIgnoreOffsets(bool ignore);
-    void SetSpline(bool spline);
-    void SetTo(wxPyShape *object);
-    void Straighten(wxDC* dc = NULL);
-    void Unlink();
-
-
-    void SetAlignmentOrientation(bool isEnd, bool isHoriz);
-    void SetAlignmentType(bool isEnd, int alignType);
-    bool GetAlignmentOrientation(bool isEnd);
-    int GetAlignmentType(bool isEnd);
-    int GetAlignmentStart() const;
-    int GetAlignmentEnd() const;
-
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-};
-
-//---------------------------------------------------------------------------
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyPolygonShape, wxPolygonShape);
-%}
-
-class wxPyPolygonShape : public wxPyShape {
-public:
-    %pythonAppend wxPyPolygonShape "self._setOORandCallbackInfo(PyPolygonShape)"
-    
-    wxPyPolygonShape();
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-
-    // void Create(wxList* points);
-    %extend {
-        PyObject* Create(PyObject* points) {
-            wxList* list = wxPy_wxRealPoint_ListHelper(points);
-            if (list) {
-                self->Create(list);
-                Py_INCREF(Py_None);
-                return Py_None;
-            }
-            else return NULL;
-        }
-    }
-
-    void AddPolygonPoint(int pos = 0);
-    void CalculatePolygonCentre();
-    void DeletePolygonPoint(int pos = 0);
-
-    // wxList* GetPoints();
-    %extend {
-        PyObject* GetPoints() {
-            wxList* list = self->GetPoints();
-            return wxPy_ConvertRealPointList(list);
-        }
-
-        PyObject* GetOriginalPoints() {
-            wxList* list = self->GetOriginalPoints();
-            PyObject*   pyList;
-            PyObject*   pyObj;
-            wxObject*   wxObj;
-            wxNode*     node = list->GetFirst();
-
-            wxPyBlock_t blocked = wxPyBeginBlockThreads();
-            pyList = PyList_New(0);
-            while (node) {
-                wxObj = node->GetData();
-                pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0);
-                PyList_Append(pyList, pyObj);
-                node = node->GetNext();
-            }
-            wxPyEndBlockThreads(blocked);
-            return pyList;
-        }        
-    }
-
-    double GetOriginalWidth() const;
-    double GetOriginalHeight() const;
-
-    void SetOriginalWidth(double w);
-    void SetOriginalHeight(double h);
-
-    void UpdateOriginalPoints();
-
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-};
-//---------------------------------------------------------------------------
-%{
-    WXSHAPE_IMP_CALLBACKS(wxPyTextShape, wxTextShape);
-%}
-
-class wxPyTextShape : public wxPyRectangleShape {
-public:
-    %pythonAppend wxPyTextShape "self._setOORandCallbackInfo(PyTextShape)"
-    
-    wxPyTextShape(double width = 0.0, double height = 0.0);
-
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
-
-    void base_OnDelete();
-    void base_OnDraw(wxDC& dc);
-    void base_OnDrawContents(wxDC& dc);
-    void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
-    void base_OnMoveLinks(wxDC& dc);
-    void base_OnErase(wxDC& dc);
-    void base_OnEraseContents(wxDC& dc);
-    void base_OnHighlight(wxDC& dc);
-    void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
-    void base_OnSize(double x, double y);
-    bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = true);
-    void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
-    void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
-    void base_OnDrawControlPoints(wxDC& dc);
-    void base_OnEraseControlPoints(wxDC& dc);
-    void base_OnMoveLink(wxDC& dc, bool moveControlPoints = true);
-    void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
-    void base_OnBeginSize(double w, double h);
-    void base_OnEndSize(double w, double h);
-//    void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
-
-};
-//---------------------------------------------------------------------------

wxPython/contrib/ogl/ogl.i

@@ -1,364 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        ogl.i
-// Purpose:     SWIG definitions for the wxWindows Object Graphics Library
-//
-// Author:      Robin Dunn
-//
-// Created:     30-June-1999
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-%define DOCSTRING
-"The Object Graphics Library provides for simple drawing and manipulation
-of 2D objects.  (This version is deprecated, please use wx.lib.ogl instead.)"
-%enddef
-
-%module(package="wx", docstring=DOCSTRING) ogl
-
-%{
-#include "wx/wxPython/wxPython.h"
-#include "wx/wxPython/pyclasses.h"
-#include "oglhelpers.h"
-
-%}
-
-//---------------------------------------------------------------------------
-
-%import windows.i
-%pythoncode { wx = _core }
-%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
-
-%pythoncode {
-    import warnings
-    warnings.warn("This module is deprecated.  Please use the wx.lib.ogl package instead.",    
-                  DeprecationWarning, stacklevel=2)
-}
-
-
-MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
-
-%include _ogldefs.i
-%include _oglbasic.i
-%include _oglshapes.i
-%include _oglshapes2.i
-%include _oglcanvas.i
-
-%pythoncode {
-%# Aliases    
-ShapeCanvas =       PyShapeCanvas
-ShapeEvtHandler =   PyShapeEvtHandler
-Shape =             PyShape
-RectangleShape =    PyRectangleShape
-BitmapShape =       PyBitmapShape
-DrawnShape =        PyDrawnShape
-CompositeShape =    PyCompositeShape
-DividedShape =      PyDividedShape
-DivisionShape =     PyDivisionShape
-EllipseShape =      PyEllipseShape
-CircleShape =       PyCircleShape
-LineShape =         PyLineShape
-PolygonShape =      PyPolygonShape
-TextShape =         PyTextShape
-ControlPoint =      PyControlPoint
-}    
-
-
-//---------------------------------------------------------------------------
-
-
-enum {
-    KEY_SHIFT,
-    KEY_CTRL,
-    ARROW_NONE,
-    ARROW_END,
-    ARROW_BOTH,
-    ARROW_MIDDLE,
-    ARROW_START,
-    ARROW_HOLLOW_CIRCLE,
-    ARROW_FILLED_CIRCLE,
-    ARROW_ARROW,
-    ARROW_SINGLE_OBLIQUE,
-    ARROW_DOUBLE_OBLIQUE,
-    ARROW_METAFILE,
-    ARROW_POSITION_END,
-    ARROW_POSITION_START,
-    CONTROL_POINT_VERTICAL,
-    CONTROL_POINT_HORIZONTAL,
-    CONTROL_POINT_DIAGONAL,
-    CONTROL_POINT_ENDPOINT_TO,
-    CONTROL_POINT_ENDPOINT_FROM,
-    CONTROL_POINT_LINE,
-    FORMAT_NONE,
-    FORMAT_CENTRE_HORIZ,
-    FORMAT_CENTRE_VERT,
-    FORMAT_SIZE_TO_CONTENTS,
-    LINE_ALIGNMENT_HORIZ,
-    LINE_ALIGNMENT_VERT,
-    LINE_ALIGNMENT_TO_NEXT_HANDLE,
-    LINE_ALIGNMENT_NONE,
-    SHADOW_NONE,
-    SHADOW_LEFT,
-    SHADOW_RIGHT,
-//      SHAPE_BASIC,
-//      SHAPE_RECTANGLE,
-//      SHAPE_ELLIPSE,
-//      SHAPE_POLYGON,
-//      SHAPE_CIRCLE,
-//      SHAPE_LINE,
-//      SHAPE_DIVIDED_RECTANGLE,
-//      SHAPE_COMPOSITE,
-//      SHAPE_CONTROL_POINT,
-//      SHAPE_DRAWN,
-//      SHAPE_DIVISION,
-//      SHAPE_LABEL_OBJECT,
-//      SHAPE_BITMAP,
-//      SHAPE_DIVIDED_OBJECT_CONTROL_POINT,
-//      OBJECT_REGION,
-    OP_CLICK_LEFT,
-    OP_CLICK_RIGHT,
-    OP_DRAG_LEFT,
-    OP_DRAG_RIGHT,
-    OP_ALL,
-    ATTACHMENT_MODE_NONE,
-    ATTACHMENT_MODE_EDGE,
-    ATTACHMENT_MODE_BRANCHING,
-    BRANCHING_ATTACHMENT_NORMAL,
-    BRANCHING_ATTACHMENT_BLOB,
-
-    gyCONSTRAINT_CENTRED_VERTICALLY,
-    gyCONSTRAINT_CENTRED_HORIZONTALLY,
-    gyCONSTRAINT_CENTRED_BOTH,
-    gyCONSTRAINT_LEFT_OF,
-    gyCONSTRAINT_RIGHT_OF,
-    gyCONSTRAINT_ABOVE,
-    gyCONSTRAINT_BELOW,
-    gyCONSTRAINT_ALIGNED_TOP,
-    gyCONSTRAINT_ALIGNED_BOTTOM,
-    gyCONSTRAINT_ALIGNED_LEFT,
-    gyCONSTRAINT_ALIGNED_RIGHT,
-    gyCONSTRAINT_MIDALIGNED_TOP,
-    gyCONSTRAINT_MIDALIGNED_BOTTOM,
-    gyCONSTRAINT_MIDALIGNED_LEFT,
-    gyCONSTRAINT_MIDALIGNED_RIGHT,
-
-    DIVISION_SIDE_NONE,
-    DIVISION_SIDE_LEFT,
-    DIVISION_SIDE_TOP,
-    DIVISION_SIDE_RIGHT,
-    DIVISION_SIDE_BOTTOM,
-
-};
-
-
-
-//---------------------------------------------------------------------------
-
-MustHaveApp(wxOGLInitialize);
-void wxOGLInitialize();
-
-MustHaveApp(wxOGLCleanUp);
-void wxOGLCleanUp();
-
-
-%{
-//---------------------------------------------------------------------------
-
-// Convert from a Python list to a list of className objects.  This one will
-// work for any class for the VERY generic cases, but beyond that the helper
-// needs to know more about the type.
-wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
-    wxPyBlock_t blocked = wxPyBeginBlockThreads();
-    if (!PyList_Check(pyList)) {
-        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        wxPyEndBlockThreads(blocked);
-        return NULL;
-    }
-    int count = PyList_Size(pyList);
-    wxList* list = new wxList;
-    if (! list) {
-        PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
-        wxPyEndBlockThreads(blocked);
-        return NULL;
-    }
-    for (int x=0; x<count; x++) {
-        PyObject* pyo = PyList_GetItem(pyList, x);
-        wxObject* wxo = NULL;
-
-        if ( !wxPyConvertSwigPtr(pyo, (void **)&wxo, className) ) {
-            wxString errmsg;
-            errmsg.Printf(wxT("Type error, expected list of %s objects"), className);
-            PyErr_SetString(PyExc_TypeError, errmsg.mb_str());
-            wxPyEndBlockThreads(blocked);
-            return NULL;
-        }
-        list->Append(wxo);
-    }
-    wxPyEndBlockThreads(blocked);
-    return list;
-}
-
-//---------------------------------------------------------------------------
-
-wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
-    wxPyBlock_t blocked = wxPyBeginBlockThreads();
-    if (!PyList_Check(pyList)) {
-        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
-        wxPyEndBlockThreads(blocked);
-        return NULL;
-    }
-    int count = PyList_Size(pyList);
-    wxList* list = new wxList;
-    if (! list) {
-        PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
-        wxPyEndBlockThreads(blocked);
-        return NULL;
-    }
-    for (int x=0; x<count; x++) {
-        PyObject* pyo = PyList_GetItem(pyList, x);
-
-        if (PyTuple_Check(pyo)) {
-            PyObject* o1 = PyNumber_Float(PyTuple_GetItem(pyo, 0));
-            PyObject* o2 = PyNumber_Float(PyTuple_GetItem(pyo, 1));
-
-            double val1 = (o1 ? PyFloat_AsDouble(o1) : 0.0);
-            double val2 = (o2 ? PyFloat_AsDouble(o2) : 0.0);
-
-            list->Append((wxObject*) new wxRealPoint(val1, val2));
-
-        } else {
-            wxRealPoint* wxo = NULL;
-            if (wxPyConvertSwigPtr(pyo, (void **)&wxo, wxT("wxRealPoint"))) {
-                PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");
-                wxPyEndBlockThreads(blocked);
-                return NULL;
-            }
-            list->Append((wxObject*) new wxRealPoint(*wxo));
-        }
-    }
-    wxPyEndBlockThreads(blocked);
-    return list;
-}
-
-//---------------------------------------------------------------------------
-
-PyObject*  wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source, bool setThisOwn) {
-    PyObject* target = NULL;
-
-    if (source && wxIsKindOf(source, wxShapeEvtHandler)) {
-        // If it's derived from wxShapeEvtHandler then there may
-        // already be a pointer to a Python object that we can use
-        // in the OOR data.
-        wxShapeEvtHandler* seh = (wxShapeEvtHandler*)source;
-        wxPyOORClientData* data = (wxPyOORClientData*)seh->GetClientObject();
-        if (data) {
-            target = data->m_obj;
-            Py_INCREF(target);
-        }
-    }
-    if (! target) {
-        target = wxPyMake_wxObject2(source, setThisOwn, false);
-        if (target != Py_None)
-            ((wxShapeEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target));
-    }
-    return target;
-}
-
-//---------------------------------------------------------------------------
-
-PyObject* wxPy_ConvertRealPointList(wxListBase* listbase) {
-    wxList*     list = (wxList*)listbase;
-    PyObject*   pyList;
-    PyObject*   pyObj;
-    wxObject*   wxObj;
-    wxNode*     node = list->GetFirst();
-    
-    wxPyBlock_t blocked = wxPyBeginBlockThreads();
-    pyList = PyList_New(0);
-    while (node) {
-        wxObj = node->GetData();
-        pyObj = wxPyConstructObject(wxObj, wxT("wxRealPoint"), 0);
-        PyList_Append(pyList, pyObj);
-        node = node->GetNext();
-    } 
-    wxPyEndBlockThreads(blocked);
-    return pyList;
-}
-
-//---------------------------------------------------------------------------
-
-PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
-    wxList*     list = (wxList*)listbase;
-    PyObject*   pyList;
-    PyObject*   pyObj;
-    wxObject*   wxObj;
-    wxNode*     node = list->GetFirst();
-
-    wxPyBlock_t blocked = wxPyBeginBlockThreads();
-    pyList = PyList_New(0);
-    while (node) {
-        wxObj = node->GetData();
-        pyObj = wxPyMake_wxShapeEvtHandler((wxShapeEvtHandler*)wxObj, false);
-        PyList_Append(pyList, pyObj);
-        node = node->GetNext();
-    }
-    wxPyEndBlockThreads(blocked);
-    return pyList;
-}
-
-
-//---------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPyShapeCanvas, wxShapeCanvas);
-IMPLEMENT_DYNAMIC_CLASS(wxPyShapeEvtHandler, wxShapeEvtHandler);
-IMPLEMENT_ABSTRACT_CLASS(wxPyShape, wxShape);
-IMPLEMENT_DYNAMIC_CLASS(wxPyRectangleShape, wxRectangleShape);
-IMPLEMENT_DYNAMIC_CLASS(wxPyControlPoint, wxControlPoint);
-IMPLEMENT_DYNAMIC_CLASS(wxPyBitmapShape, wxBitmapShape);
-IMPLEMENT_DYNAMIC_CLASS(wxPyDrawnShape, wxDrawnShape);
-IMPLEMENT_DYNAMIC_CLASS(wxPyCompositeShape, wxCompositeShape);
-IMPLEMENT_DYNAMIC_CLASS(wxPyDividedShape, wxDividedShape);
-IMPLEMENT_DYNAMIC_CLASS(wxPyDivisionShape, wxDivisionShape);
-IMPLEMENT_DYNAMIC_CLASS(wxPyEllipseShape, wxEllipseShape);
-IMPLEMENT_DYNAMIC_CLASS(wxPyCircleShape, wxCircleShape);
-IMPLEMENT_DYNAMIC_CLASS(wxPyLineShape, wxLineShape);
-IMPLEMENT_DYNAMIC_CLASS(wxPyPolygonShape, wxPolygonShape);
-IMPLEMENT_DYNAMIC_CLASS(wxPyTextShape, wxTextShape);
-
-//---------------------------------------------------------------------------
-
-// extern "C" SWIGEXPORT(void) initoglbasicc();
-// extern "C" SWIGEXPORT(void) initoglshapesc();
-// extern "C" SWIGEXPORT(void) initoglshapes2c();
-// extern "C" SWIGEXPORT(void) initoglcanvasc();
-%}
-
-
-%init %{
-
-//     initoglbasicc();
-//     initoglshapesc();
-//     initoglshapes2c();
-//     initoglcanvasc();
-
-
-    wxPyPtrTypeMap_Add("wxControlPoint", "wxPyControlPoint");
-    wxPyPtrTypeMap_Add("wxShapeCanvas", "wxPyShapeCanvas");
-    wxPyPtrTypeMap_Add("wxShapeEvtHandler", "wxPyShapeEvtHandler");
-    wxPyPtrTypeMap_Add("wxShape", "wxPyShape");
-    wxPyPtrTypeMap_Add("wxRectangleShape", "wxPyRectangleShape");
-    wxPyPtrTypeMap_Add("wxDrawnShape", "wxPyDrawnShape");
-    wxPyPtrTypeMap_Add("wxCompositeShape", "wxPyCompositeShape");
-    wxPyPtrTypeMap_Add("wxDividedShape", "wxPyDividedShape");
-    wxPyPtrTypeMap_Add("wxDivisionShape", "wxPyDivisionShape");
-    wxPyPtrTypeMap_Add("wxEllipseShape", "wxPyEllipseShape");
-    wxPyPtrTypeMap_Add("wxCircleShape", "wxPyCircleShape");
-    wxPyPtrTypeMap_Add("wxLineShape", "wxPyLineShape");
-    wxPyPtrTypeMap_Add("wxPolygonShape", "wxPyPolygonShape");
-    wxPyPtrTypeMap_Add("wxTextShape", "wxPyTextShape");
-
-%}
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------

wxPython/contrib/ogl/oglhelpers.h

@@ -1,286 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        oglhelpers.h
-// Purpose:     Some Helper functions to help in data conversions in OGL
-//
-// Author:      Robin Dunn
-//
-// Created:     9-Sept-1999
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __wxp_ogl_helpers__
-#define __wxp_ogl_helpers__
-
-
-#include <wx/ogl/ogl.h>
-#include <wx/ogl/basicp.h>
-#include <wx/ogl/constrnt.h>
-#include <wx/ogl/bmpshape.h>
-#include <wx/ogl/drawn.h>
-
-
-//---------------------------------------------------------------------------
-// Define a macro that will be used in the class definintions below
-
-#define WXSHAPE_DEC_CALLBACKS()       \
-    DEC_PYCALLBACK__                (OnDelete);             \
-    DEC_PYCALLBACK__DC              (OnDraw);               \
-    DEC_PYCALLBACK__DC              (OnDrawContents);       \
-    DEC_PYCALLBACK__DCBOOL          (OnDrawBranches);       \
-    DEC_PYCALLBACK__DC              (OnMoveLinks);          \
-    DEC_PYCALLBACK__DC              (OnErase);              \
-    DEC_PYCALLBACK__DC              (OnEraseContents);      \
-    DEC_PYCALLBACK__DC              (OnHighlight);          \
-    DEC_PYCALLBACK__2DBL2INT        (OnLeftClick);          \
-    DEC_PYCALLBACK__2DBL2INT        (OnLeftDoubleClick);    \
-    DEC_PYCALLBACK__2DBL2INT        (OnRightClick);         \
-    DEC_PYCALLBACK__2DBL            (OnSize);               \
-    DEC_PYCALLBACK_BOOL_DC4DBLBOOL  (OnMovePre);            \
-    DEC_PYCALLBACK__DC4DBLBOOL      (OnMovePost);           \
-    DEC_PYCALLBACK__BOOL2DBL2INT    (OnDragLeft);           \
-    DEC_PYCALLBACK__2DBL2INT        (OnBeginDragLeft);      \
-    DEC_PYCALLBACK__2DBL2INT        (OnEndDragLeft);        \
-    DEC_PYCALLBACK__BOOL2DBL2INT    (OnDragRight);          \
-    DEC_PYCALLBACK__2DBL2INT        (OnBeginDragRight);     \
-    DEC_PYCALLBACK__2DBL2INT        (OnEndDragRight);       \
-    DEC_PYCALLBACK__DC4DBL          (OnDrawOutline);        \
-    DEC_PYCALLBACK__DC              (OnDrawControlPoints);  \
-    DEC_PYCALLBACK__DC              (OnEraseControlPoints); \
-    DEC_PYCALLBACK__DCBOOL          (OnMoveLink);           \
-    DEC_PYCALLBACK__WXCPBOOL2DBL2INT(OnSizingDragLeft);     \
-    DEC_PYCALLBACK__WXCP2DBL2INT    (OnSizingBeginDragLeft);\
-    DEC_PYCALLBACK__WXCP2DBL2INT    (OnSizingEndDragLeft);  \
-    DEC_PYCALLBACK__2DBL            (OnBeginSize);          \
-    DEC_PYCALLBACK__2DBL            (OnEndSize);            \
-    PYPRIVATE
-
-
-#define WXSHAPE_IMP_CALLBACKS(CLASS, PARENT)       \
-    IMP_PYCALLBACK__                (CLASS, PARENT,  OnDelete);             \
-    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnDraw);               \
-    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnDrawContents);       \
-    IMP_PYCALLBACK__DCBOOL          (CLASS, PARENT,  OnDrawBranches);       \
-    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnMoveLinks);          \
-    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnErase);              \
-    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnEraseContents);      \
-    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnHighlight);          \
-    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnLeftClick);          \
-    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnLeftDoubleClick);    \
-    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnRightClick);         \
-    IMP_PYCALLBACK__2DBL            (CLASS, PARENT,  OnSize);               \
-    IMP_PYCALLBACK_BOOL_DC4DBLBOOL  (CLASS, PARENT,  OnMovePre);            \
-    IMP_PYCALLBACK__DC4DBLBOOL      (CLASS, PARENT,  OnMovePost);           \
-    IMP_PYCALLBACK__BOOL2DBL2INT    (CLASS, PARENT,  OnDragLeft);           \
-    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnBeginDragLeft);      \
-    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnEndDragLeft);        \
-    IMP_PYCALLBACK__BOOL2DBL2INT    (CLASS, PARENT,  OnDragRight);          \
-    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnBeginDragRight);     \
-    IMP_PYCALLBACK__2DBL2INT        (CLASS, PARENT,  OnEndDragRight);       \
-    IMP_PYCALLBACK__DC4DBL          (CLASS, PARENT,  OnDrawOutline);        \
-    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnDrawControlPoints);  \
-    IMP_PYCALLBACK__DC              (CLASS, PARENT,  OnEraseControlPoints); \
-    IMP_PYCALLBACK__DCBOOL          (CLASS, PARENT,  OnMoveLink);           \
-    IMP_PYCALLBACK__WXCPBOOL2DBL2INT(CLASS, PARENT,  OnSizingDragLeft);     \
-    IMP_PYCALLBACK__WXCP2DBL2INT    (CLASS, PARENT,  OnSizingBeginDragLeft);\
-    IMP_PYCALLBACK__WXCP2DBL2INT    (CLASS, PARENT,  OnSizingEndDragLeft);  \
-    IMP_PYCALLBACK__2DBL            (CLASS, PARENT,  OnBeginSize);          \
-    IMP_PYCALLBACK__2DBL            (CLASS, PARENT,  OnEndSize)
-
-
-    //  This one may be difficult...
-    //PYCALLBACK__???????       (PARENT,  OnChangeAttachment);
-
-
-
-//---------------------------------------------------------------------------
-// These are prototypes of some helper functions found in ogl.i
-
-wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className);
-wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList);
-PyObject* wxPyMake_wxShapeEvtHandler(wxShapeEvtHandler* source);
-PyObject* wxPy_ConvertShapeList(wxListBase* list);
-PyObject* wxPy_ConvertRealPointList(wxListBase* list);
-
-
-//---------------------------------------------------------------------------
-// Classes that derive from the shapes and such, but which know how to turn
-// virtual callbacks into Python callbacks.
-
-class wxPyShapeCanvas : public wxShapeCanvas {
-    DECLARE_DYNAMIC_CLASS(wxPyShapeCanvas);
-public:
-    wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxBORDER,
-                    const wxString& name = wxT("shapeCanvas"))
-        : wxShapeCanvas(parent, id, pos, size, style, name) {}
-
-    DEC_PYCALLBACK__2DBLINT(OnBeginDragLeft);
-    DEC_PYCALLBACK__2DBLINT(OnBeginDragRight);
-    DEC_PYCALLBACK__2DBLINT(OnEndDragLeft);
-    DEC_PYCALLBACK__2DBLINT(OnEndDragRight);
-    DEC_PYCALLBACK__BOOL2DBLINT(OnDragLeft);
-    DEC_PYCALLBACK__BOOL2DBLINT(OnDragRight);
-    DEC_PYCALLBACK__2DBLINT(OnLeftClick);
-    DEC_PYCALLBACK__2DBLINT(OnRightClick);
-
-    PYPRIVATE;
-};
-
-
-
-class wxPyShapeEvtHandler : public wxShapeEvtHandler {
-    DECLARE_DYNAMIC_CLASS(wxPyShapeEvtHandler);
-public:
-    wxPyShapeEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL)
-        : wxShapeEvtHandler(prev, shape) {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-class wxPyShape : public wxShape {
-    DECLARE_ABSTRACT_CLASS(wxPyShape);
-public:
-    wxPyShape(wxPyShapeCanvas *can = NULL)
-        : wxShape(can) {}
-
-    virtual void GetBoundingBoxMin(double *width, double *height)
-    {
-        if (width) *width = 0.0;
-        if (height) *height = 0.0;
-    }
-
-    WXSHAPE_DEC_CALLBACKS();
-
-};
-
-
-class wxPyRectangleShape : public wxRectangleShape {
-    DECLARE_DYNAMIC_CLASS(wxPyRectangleShape);
-public:
-    wxPyRectangleShape(double width = 0.0, double height = 0.0)
-        : wxRectangleShape(width, height) {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-class wxPyControlPoint : public wxControlPoint {
-    DECLARE_DYNAMIC_CLASS(wxPyControlPoint);
-public:
-    wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
-                     wxPyShape *object = NULL,
-                     double size = 0.0, double the_xoffset = 0.0,
-                     double the_yoffset = 0.0, int the_type = 0)
-        : wxControlPoint(the_canvas, object, size,
-                         the_xoffset, the_yoffset, the_type) {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-
-class wxPyBitmapShape : public wxBitmapShape {
-    DECLARE_DYNAMIC_CLASS(wxPyBitmapShape);
-public:
-    wxPyBitmapShape() : wxBitmapShape() {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-
-class wxPyDrawnShape : public wxDrawnShape {
-    DECLARE_DYNAMIC_CLASS(wxPyDrawnShape);
-public:
-    wxPyDrawnShape() : wxDrawnShape() {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-class wxPyCompositeShape : public wxCompositeShape {
-    DECLARE_DYNAMIC_CLASS(wxPyCompositeShape);
-public:
-    wxPyCompositeShape() : wxCompositeShape() {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-class wxPyDividedShape : public wxDividedShape {
-    DECLARE_DYNAMIC_CLASS(wxPyDividedShape);
-public:
-    wxPyDividedShape(double width = 0.0, double height = 0.0)
-        : wxDividedShape(width, height) {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-class wxPyDivisionShape : public wxDivisionShape {
-    DECLARE_DYNAMIC_CLASS(wxPyDivisionShape);
-public:
-    wxPyDivisionShape() : wxDivisionShape() {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-class wxPyEllipseShape : public wxEllipseShape {
-    DECLARE_DYNAMIC_CLASS(wxPyEllipseShape);
-public:
-    wxPyEllipseShape(double width = 0.0, double height = 0.0)
-        : wxEllipseShape(width, height) {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-class wxPyCircleShape : public wxCircleShape {
-    DECLARE_DYNAMIC_CLASS(wxPyCircleShape);
-public:
-    wxPyCircleShape(double width = 0.0)
-        : wxCircleShape(width) {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-class wxPyLineShape : public wxLineShape {
-    DECLARE_DYNAMIC_CLASS(wxPyLineShape);
-public:
-    wxPyLineShape() : wxLineShape() {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-class wxPyPolygonShape : public wxPolygonShape {
-    DECLARE_DYNAMIC_CLASS(wxPyPolygonShape);
-public:
-    wxPyPolygonShape() : wxPolygonShape() {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-class wxPyTextShape : public wxTextShape {
-    DECLARE_DYNAMIC_CLASS(wxPyTextShape);
-public:
-    wxPyTextShape(double width = 0.0, double height = 0.0)
-        : wxTextShape(width, height) {}
-
-    WXSHAPE_DEC_CALLBACKS();
-};
-
-
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-#endif
-
-

wxPython/contrib/stc/.cvsignore

@@ -1,6 +0,0 @@
-Makefile
-Makefile
-contrib
-stc_c.exp
-stc_c.ilk
-stc_c.pch

wxPython/contrib/stc/_stc_docstrings.i

@@ -1,218 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        _stc_docstrings.i
-// Purpose:     Docstrings for the wxStyledTextCtrl.  The ones in this file
-//              are maintained by hand for those methods that are not
-//              auto-generated by gen_iface.py
-//
-// Author:      Robin Dunn
-//
-// Created:     16-April-2005
-// RCS-ID:      $Id$
-// Copyright:   (c) 2005 by Total Control Software
-// Licence:     wxWindows license
-/////////////////////////////////////////////////////////////////////////////
-
-
-// First include the autogenerated docstrings so if any of them need
-// tweaked they can be overridden below
-%include _stc_gendocs.i
-
-
-// TODO:  Class docstring
-DocStr(wxStyledTextCtrl,
-"", "");
-
-// TODO:  Main constructor
-DocStr(wxStyledTextCtrl::wxStyledTextCtrl,
-"", "");
-
-// TODO:  "Pre" constructor
-DocStr(wxStyledTextCtrl::wxStyledTextCtrl(),
-"", "");
-
-
-
-DocStr(wxStyledTextCtrl::GetCurrentLine,
-"Returns the line number of the line with the caret.", "");
-
-DocStr(wxStyledTextCtrl::StyleSetSpec,
-"Extract style settings from a spec-string which is composed of one or
-more of the following comma separated elements::
-
-     bold                    turns on bold
-     italic                  turns on italics
-     fore:[name or #RRGGBB]  sets the foreground colour
-     back:[name or #RRGGBB]  sets the background colour
-     face:[facename]         sets the font face name to use
-     size:[num]              sets the font size in points
-     eol                     turns on eol filling
-     underline               turns on underlining
-", "");
-
-DocStr(wxStyledTextCtrl::StyleSetFont,
-"Set style size, face, bold, italic, and underline attributes from the
-attributes of a `wx.Font`.", "");
-
-DocStr(wxStyledTextCtrl::StyleSetFontAttr,
-"Set all font style attributes at once.", "");
-
-DocStr(wxStyledTextCtrl::StyleSetCharacterSet,
-       "Set the character set of the font in a style.  Converts the Scintilla
-wx.stc.STC_CHARSET_* set values to a wxFontEncoding.", "");
-
-DocStr(wxStyledTextCtrl::StyleSetFontEncoding,
-       "Set the font encoding to be used by a style.", "");
-
-DocStr(wxStyledTextCtrl::CmdKeyExecute,
-"Perform one of the operations defined by the wx.stc.STC_CMD_* constants.", "");
-
-DocStr(wxStyledTextCtrl::SetMargins,
-"Set the left and right margin in the edit area, measured in pixels.", "");
-
-DocAStr(wxStyledTextCtrl::GetSelection,
-"GetSelection(self) -> (startPos, endPos)",        
-"Retrieve the start and end positions of the current selection.", "");
-
-DocStr(wxStyledTextCtrl::PointFromPosition,
-"Retrieve the point in the window where a position is displayed.", "");
-
-DocStr(wxStyledTextCtrl::ScrollToLine,
-"Scroll enough to make the given line visible.", "");
-
-DocStr(wxStyledTextCtrl::ScrollToColumn,
-"Scroll enough to make the given column visible", "");
-
-DocStr(wxStyledTextCtrl::SendMsg,
-"Send a message to Scintilla.", "");
-
-DocStr(wxStyledTextCtrl::SetVScrollBar,
-"Set the vertical scrollbar to use instead of the one that's built-in.", "");
-
-DocStr(wxStyledTextCtrl::SetHScrollBar,
-"Set the horizontal scrollbar to use instead of the ont that's built-in.", "");
-
-DocStr(wxStyledTextCtrl::SaveFile,
-"Write the contents of the editor to filename", "");
-
-DocStr(wxStyledTextCtrl::LoadFile,
-"Load the contents of filename into the editor", "");
-
-DocStr(wxStyledTextCtrl::DoDragOver,
-"Allow for simulating a DnD DragOver.", "");
-
-DocStr(wxStyledTextCtrl::DoDropText,
-"Allow for simulating a DnD DropText.", "");
-
-DocStr(wxStyledTextCtrl::SetUseAntiAliasing,
-"Specify whether anti-aliased fonts should be used.  Will have no
-effect on some platforms, but on some (wxMac for example) can greatly
-improve performance.", "");
-
-DocStr(wxStyledTextCtrl::GetUseAntiAliasing,
-"Returns the current UseAntiAliasing setting.", "");
-
-
-
-DocStr(wxStyledTextCtrl::AddTextRaw,
-"Add text to the document at current position.  The text should be
-utf-8 encoded on unicode builds of wxPython, or can be any 8-bit text
-in ansi builds.", "");
-
-DocStr(wxStyledTextCtrl::InsertTextRaw,
-"Insert string at a position.  The text should be utf-8 encoded on
-unicode builds of wxPython, or can be any 8-bit text in ansi builds.", "");
-
-DocAStr(wxStyledTextCtrl::GetCurLineRaw,
-        "GetCurLineRaw() -> (text, index)",
-"Retrieve the text of the line containing the caret, and also the index
-of the caret on the line.  The returned value is a utf-8 encoded
-string in unicode builds of wxPython, or raw 8-bit text otherwise.", "");
-
-DocStr(wxStyledTextCtrl::GetLineRaw,
-"Retrieve the contents of a line.  The returned value is a utf-8
-encoded string in unicode builds of wxPython, or raw 8-bit text
-otherwise.", "");
-
-DocStr(wxStyledTextCtrl::GetSelectedTextRaw,
-"Retrieve the selected text.  The returned value is a utf-8 encoded
-string in unicode builds of wxPython, or raw 8-bit text otherwise.", "");
-
-DocStr(wxStyledTextCtrl::GetTextRangeRaw,
-"Retrieve a range of text.    The returned value is a utf-8 encoded
-string in unicode builds of wxPython, or raw 8-bit text otherwise.", "");
-
-DocStr(wxStyledTextCtrl::SetTextRaw,
-"Replace the contents of the document with the argument text.  The text
-should be utf-8 encoded on unicode builds of wxPython, or can be any
-8-bit text in ansi builds.", "");
-
-DocStr(wxStyledTextCtrl::GetTextRaw,
-"Retrieve all the text in the document.  The returned value is a utf-8
-encoded string in unicode builds of wxPython, or raw 8-bit text
-otherwise.", "");
-
-DocStr(wxStyledTextCtrl::AppendTextRaw,
-"Append a string to the end of the document without changing the
-selection.  The text should be utf-8 encoded on unicode builds of
-wxPython, or can be any 8-bit text in ansi builds.", "");
-
-
-
-
-// Overrides for some of the generated docstrings
-
-DocAStr(wxStyledTextCtrl::GetCurLine,
-        "GetCurLine(self) -> (text, pos)",
-"Retrieve the text of the line containing the caret, and also theindex
-of the caret on the line.", "");
-
-
-
-// For some reason these are not getting the right docstrings, but are
-// inheriting the docstrings from wxWindow instead.  So we'll have to
-// replace the whole proxy method instead.
-%feature("shadow") wxStyledTextCtrl::LineDown
-%{
-    def LineDown(*args, **kwargs):
-        """
-        LineDown(self)
-
-        Move caret down one line.
-        """
-        return _stc.StyledTextCtrl_LineDown(*args, **kwargs)
-%}
-
-%feature("shadow") wxStyledTextCtrl::LineUp
-%{
-    def LineUp(*args, **kwargs):
-        """
-        LineUp(self)
-
-        Move caret up one line.
-        """
-        return _stc.StyledTextCtrl_LineUp(*args, **kwargs)
-%}
-
-%feature("shadow") wxStyledTextCtrl::PageDown
-%{
-    def PageDown(*args, **kwargs):
-        """
-        PageDown(self)
-
-        Move caret one page down.
-        """
-        return _stc.StyledTextCtrl_PageDown(*args, **kwargs)
-%}
-
-%feature("shadow") wxStyledTextCtrl::PageUp
-%{
-    def PageUp(*args, **kwargs):
-        """
-        PageUp(self)
-
-        Move caret one page up.
-        """
-        return _stc.StyledTextCtrl_PageUp(*args, **kwargs)
-%}    
-
-

wxPython/contrib/stc/_stc_utf8_methods.py

@@ -1,117 +0,0 @@
- 
-def AddTextUTF8(self, text):
-    """
-    Add UTF8 encoded text to the document at the current position.
-    Works 'natively' in a unicode build of wxPython, and will also work
-    in an ansi build if the UTF8 text is compatible with the current
-    encoding.
-    """
-    if not wx.USE_UNICODE:
-        u = text.decode('utf-8')
-        text = u.encode(wx.GetDefaultPyEncoding())
-    self.AddTextRaw(text)
-
-    
-def InsertTextUTF8(self, pos, text):
-    """
-    Insert UTF8 encoded text at a position.  Works 'natively' in a
-    unicode build of wxPython, and will also work in an ansi build if
-    the UTF8 text is compatible with the current encoding.
-    """
-    if not wx.USE_UNICODE:
-        u = text.decode('utf-8')
-        text = u.encode(wx.GetDefaultPyEncoding())
-    self.InsertTextRaw(pos, text)
-
-    
-def GetCurLineUTF8(self):
-    """
-    Retrieve the UTF8 text of the line containing the caret, and also
-    the index of the caret on the line.  In an ansi build of wxPython
-    the text retrieved from the document is assumed to be in the
-    current default encoding.
-    """
-    text, pos = self.GetCurLineRaw()
-    if not wx.USE_UNICODE:
-        u = text.decode(wx.GetDefaultPyEncoding())
-        text = u.encode('utf-8')
-    return text, pos
-
-    
-def GetLineUTF8(self, line):
-    """
-    Retrieve the contents of a line as UTF8.  In an ansi build of wxPython
-    the text retrieved from the document is assumed to be in the
-    current default encoding.
-    """
-    text = self.GetLineRaw(line)
-    if not wx.USE_UNICODE:
-        u = text.decode(wx.GetDefaultPyEncoding())
-        text = u.encode('utf-8')
-    return text
-
-
-def GetSelectedTextUTF8(self):
-    """
-    Retrieve the selected text as UTF8.  In an ansi build of wxPython
-    the text retrieved from the document is assumed to be in the
-    current default encoding.
-    """
-    text = self.GetSelectedTextRaw()
-    if not wx.USE_UNICODE:
-        u = text.decode(wx.GetDefaultPyEncoding())
-        text = u.encode('utf-8')
-    return text
-
-
-def GetTextRangeUTF8(self, startPos, endPos):
-    """
-    Retrieve a range of text as UTF8.  In an ansi build of wxPython
-    the text retrieved from the document is assumed to be in the
-    current default encoding.
-    """
-    text = self.GetTextRangeRaw(startPos, endPos)
-    if not wx.USE_UNICODE:
-        u = text.decode(wx.GetDefaultPyEncoding())
-        text = u.encode('utf-8')
-    return text
-
-
-def SetTextUTF8(self, text):
-    """
-    Replace the contents of the document with the UTF8 text given.
-    Works 'natively' in a unicode build of wxPython, and will also
-    work in an ansi build if the UTF8 text is compatible with the
-    current encoding.
-    """
-    if not wx.USE_UNICODE:
-        u = text.decode('utf-8')
-        text = u.encode(wx.GetDefaultPyEncoding())
-    self.SetTextRaw(text)
-
-
-def GetTextUTF8(self):
-    """
-    Retrieve all the text in the document as UTF8.  In an ansi build
-    of wxPython the text retrieved from the document is assumed to be
-    in the current default encoding.
-    """
-    text = self.GetTextRaw()
-    if not wx.USE_UNICODE:
-        u = text.decode(wx.GetDefaultPyEncoding())
-        text = u.encode('utf-8')
-    return text
-
-
-def AppendTextUTF8(self, text):
-    """
-    Append a UTF8 string to the end of the document without changing
-    the selection.  Works 'natively' in a unicode build of wxPython,
-    and will also work in an ansi build if the UTF8 text is compatible
-    with the current encoding.
-    """
-    if not wx.USE_UNICODE:
-        u = text.decode('utf-8')
-        text = u.encode(wx.GetDefaultPyEncoding())
-    self.AppendTextRaw(text)
-