Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compilation problem, pass 2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-02-06 22:09:19 +00:00
parent 122d1d563a
commit 57a67daf9a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/msw/textctrl.cpp
View File

@@ -351,14 +351,17 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
// found (or if msw.inkedit != 0 and the InkEd.dll is present). // found (or if msw.inkedit != 0 and the InkEd.dll is present).
// However, an application can veto ink edit controls by either specifying // However, an application can veto ink edit controls by either specifying
// msw.inkedit = 0 or by removing wxTE_RICH[2] from the style. // msw.inkedit = 0 or by removing wxTE_RICH[2] from the style.
//
if ((wxSystemSettings::HasFeature(wxSYS_TABLET_PRESENT) || wxSystemOptions::GetOptionInt(wxT("msw.inkedit")) != 0) && if ((wxSystemSettings::HasFeature(wxSYS_TABLET_PRESENT) || wxSystemOptions::GetOptionInt(wxT("msw.inkedit")) != 0) &&
!(wxSystemOptions::HasOption(wxT("msw.inkedit")) && wxSystemOptions::GetOptionInt(wxT("msw.inkedit")) == 0)) !(wxSystemOptions::HasOption(wxT("msw.inkedit")) && wxSystemOptions::GetOptionInt(wxT("msw.inkedit")) == 0))
{ {
if (wxRichEditModule::LoadInkEdit()) if (wxRichEditModule::LoadInkEdit())
{ {
windowClass = INKEDIT_CLASS; windowClass = INKEDIT_CLASS;
#if wxUSE_INKEDIT && wxUSE_RICHEDIT
m_isInkEdit = 1; m_isInkEdit = 1;
#endif
// Fake rich text version for other calls // Fake rich text version for other calls
m_verRichEdit = 2; m_verRichEdit = 2;