Fix for always failing assert in GetValue. Save the same value that

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

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index ef011a5056cb6e140e087dc82b23b38a477a35a8..8213b6b8cdaf4134a9cab96fee6fde91cbfb67be 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -24,16 +24,18 @@
 #define XtParent XTPARENT
 #endif
 
 #define XtParent XTPARENT
 #endif
 

-#include "wx/defs.h"
-

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
 #include "wx/textctrl.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
 #include "wx/textctrl.h"

-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+#endif
+

 #include "wx/filefn.h"
 #include "wx/filefn.h"

-#include "wx/utils.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -61,9 +63,9 @@ static void wxTextWindowGainFocusProc(Widget w, XtPointer clientData, XmAnyCallb
 static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
 
 static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
 

-    IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)

 
 

-    BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+    BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)

         EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
         EVT_CHAR(wxTextCtrl::OnChar)
 
         EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
         EVT_CHAR(wxTextCtrl::OnChar)
 


@@ -165,8 +167,8 @@ bool wxTextCtrl::Create(wxWindow *parent,
 #if 0
         // TODO: Is this relevant? What does it do?
         int noCols = 2;
 #if 0
         // TODO: Is this relevant? What does it do?
         int noCols = 2;

-        if (!value.IsNull() && (value.Length() > (unsigned int) noCols))
-            noCols = value.Length();
+        if (!value.IsNull() && (value.length() > (unsigned int) noCols))
+            noCols = value.length();

         XtVaSetValues((Widget) m_mainWidget,
                       XmNcolumns, noCols,
                       NULL);
         XtVaSetValues((Widget) m_mainWidget,
                       XmNcolumns, noCols,
                       NULL);


@@ -238,7 +240,7 @@ wxString wxTextCtrl::GetValue() const
     return str;
 }
 
     return str;
 }
 

-void wxTextCtrl::SetValue(const wxString& text)
+void wxTextCtrl::DoSetValue(const wxString& text, int flags)

 {
     m_inSetValue = true;
 
 {
     m_inSetValue = true;
 


@@ -252,6 +254,9 @@ void wxTextCtrl::SetValue(const wxString& text)
     m_modified = true;
 
     m_inSetValue = false;
     m_modified = true;
 
     m_inSetValue = false;

+
+    if ( flags & SetValue_SendEvent )
+        SendTextUpdatedEvent();

 }
 
 // Clipboard operations
 }
 
 // Clipboard operations


@@ -488,7 +493,7 @@ void wxTextCtrl::ShowPosition(long pos)
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     wxString str = GetLineText (lineNo);
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     wxString str = GetLineText (lineNo);

-    return (int) str.Length();
+    return (int) str.length();

 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const