]> git.saurik.com Git - wxWidgets.git/commit - include/wx/richtext/richtextbuffer.h
Merge of SOC2010_RTC_IMAGES branch.
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 30 Sep 2010 10:27:07 +0000 (10:27 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 30 Sep 2010 10:27:07 +0000 (10:27 +0000)
commitcdaed652d7d2b20bc9f508d45f77a280f88279d9
tree458a1a2dd1184082d12b236da4e758b1b39ed34d
parent9bc95da04ca5541783c9aead91769fcde0651d97
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
build/bakefiles/files.bkl
build/msw/makefile.bcc
build/msw/makefile.gcc
build/msw/makefile.vc
build/msw/makefile.wat
build/msw/wx_core.dsp
build/msw/wx_richtext.dsp
build/msw/wx_vc7_core.vcproj
build/msw/wx_vc7_richtext.vcproj
build/msw/wx_vc8_core.vcproj
build/msw/wx_vc8_richtext.vcproj
build/msw/wx_vc9_core.vcproj
build/msw/wx_vc9_richtext.vcproj
include/wx/richtext/richtextbuffer.h
include/wx/richtext/richtextctrl.h
include/wx/richtext/richtextimagedlg.h [new file with mode: 0644]
samples/richtext/richtext.cpp
src/richtext/readme [new file with mode: 0644]
src/richtext/richtextbuffer.cpp
src/richtext/richtextctrl.cpp
src/richtext/richtextdialogs.pjd
src/richtext/richtexthtml.cpp
src/richtext/richtextimagedlg.cpp [new file with mode: 0644]
src/richtext/richtextxml.cpp