vetoing item collapse works again

[wxWidgets.git] / src / motif / textctrl.cpp

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 224bd0200cdded248c2a8c362361bc9685ae651b..6a2c7a0cb5ecab26b818e5b69b460f5154c2f0de 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -168,8 +168,21 @@ bool wxTextCtrl::Create(wxWindow *parent,
     }
 
     if ( !!value )
     }
 
     if ( !!value )

+    {
+#if 0
+        // don't do this because it is just linking the text to a source
+        // string which is unsafe. MB
+        //

         XmTextSetString ((Widget) m_mainWidget, (char*)value.c_str());
         XmTextSetString ((Widget) m_mainWidget, (char*)value.c_str());

-
+#else
+        // do this instead... MB
+        //
+        XtVaSetValues( (Widget) m_mainWidget,
+                       XmNvalue, (char *)value.c_str(),
+                       NULL);
+#endif
+    }
+    

     // install callbacks
     XtAddCallback((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc)wxTextWindowChangedProc, (XtPointer)this);
 
     // install callbacks
     XtAddCallback((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc)wxTextWindowChangedProc, (XtPointer)this);
 


@@ -234,7 +247,18 @@ void wxTextCtrl::SetValue(const wxString& value)
 {
     m_inSetValue = TRUE;
 
 {
     m_inSetValue = TRUE;
 

+#if 0
+    // don't do this because it is just linking the text to a source
+    // string which is unsafe. MB
+    //

     XmTextSetString ((Widget) m_mainWidget, (char*)value.c_str());
     XmTextSetString ((Widget) m_mainWidget, (char*)value.c_str());

+#else
+    // do this instead... MB
+    //
+    XtVaSetValues( (Widget) m_mainWidget,
+                   XmNvalue, (char *)value.c_str(),
+                   NULL);
+#endif

 
     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }