git.saurik.com Git - wxWidgets.git/commit

]> git.saurik.com Git - wxWidgets.git/commit

author	Vadim Zeitlin <vadim@wxwidgets.org>
	Thu, 30 Sep 2010 10:27:07 +0000 (10:27 +0000)
committer	Vadim Zeitlin <vadim@wxwidgets.org>
	Thu, 30 Sep 2010 10:27:07 +0000 (10:27 +0000)
commit	cdaed652d7d2b20bc9f508d45f77a280f88279d9
tree	458a1a2dd1184082d12b236da4e758b1b39ed34d	tree \| snapshot
parent	9bc95da04ca5541783c9aead91769fcde0651d97	commit \| diff

Merge of SOC2010_RTC_IMAGES branch.

Added floating images and image property dialog to wxRichTextCtrl, by Mingquan
Yang as part of GSOC 2010. Also changed image block creation to use a memory
stream instead of creating a temporary file.

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

25 files changed:

Makefile.in		diff \| blob \| blame \| history
build/bakefiles/files.bkl		diff \| blob \| blame \| history
build/msw/makefile.bcc		diff \| blob \| blame \| history
build/msw/makefile.gcc		diff \| blob \| blame \| history
build/msw/makefile.vc		diff \| blob \| blame \| history
build/msw/makefile.wat		diff \| blob \| blame \| history
build/msw/wx_core.dsp		diff \| blob \| blame \| history
build/msw/wx_richtext.dsp		diff \| blob \| blame \| history
build/msw/wx_vc7_core.vcproj		diff \| blob \| blame \| history
build/msw/wx_vc7_richtext.vcproj		diff \| blob \| blame \| history
build/msw/wx_vc8_core.vcproj		diff \| blob \| blame \| history
build/msw/wx_vc8_richtext.vcproj		diff \| blob \| blame \| history
build/msw/wx_vc9_core.vcproj		diff \| blob \| blame \| history
build/msw/wx_vc9_richtext.vcproj		diff \| blob \| blame \| history
include/wx/richtext/richtextbuffer.h		diff \| blob \| blame \| history
include/wx/richtext/richtextctrl.h		diff \| blob \| blame \| history
include/wx/richtext/richtextimagedlg.h	[new file with mode: 0644]	blob
samples/richtext/richtext.cpp		diff \| blob \| blame \| history
src/richtext/readme	[new file with mode: 0644]	blob
src/richtext/richtextbuffer.cpp		diff \| blob \| blame \| history
src/richtext/richtextctrl.cpp		diff \| blob \| blame \| history
src/richtext/richtextdialogs.pjd		diff \| blob \| blame \| history
src/richtext/richtexthtml.cpp		diff \| blob \| blame \| history
src/richtext/richtextimagedlg.cpp	[new file with mode: 0644]	blob
src/richtext/richtextxml.cpp		diff \| blob \| blame \| history

wxWidgets (Impactor)

RSS Atom