From 57a67daf9a8a97941b61a30c989e38bd8dffd871 Mon Sep 17 00:00:00 2001
From: David Surovell <davids@osafoundation.org>
Date: Mon, 6 Feb 2006 22:09:19 +0000
Subject: [PATCH] fix compilation problem, pass 2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/textctrl.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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