OpenVMS update

[wxWidgets.git] / src / richtext / richtextctrl.cpp

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 14b77e9b1d8b73883d1b14a646c2880b92961fde..c2df7e6062398794f1a5391226050e40b26922af 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -129,9 +129,9 @@ wxRichTextCtrl::wxRichTextCtrl(wxWindow* parent,
 bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style,
                              const wxValidator& validator, const wxString& name)
 {
 bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style,
                              const wxValidator& validator, const wxString& name)
 {

-    if (!wxTextCtrlBase::Create(parent, id, pos, size,
-                                style|wxFULL_REPAINT_ON_RESIZE,
-                                validator, name))
+    if (!wxControl::Create(parent, id, pos, size,
+                           style|wxFULL_REPAINT_ON_RESIZE,
+                           validator, name))

         return false;
 
     if (!GetFont().Ok())
         return false;
 
     if (!GetFont().Ok())


@@ -252,7 +252,8 @@ void wxRichTextCtrl::Clear()
         LayoutContent();
         Refresh(false);
     }
         LayoutContent();
         Refresh(false);
     }

-    SendTextUpdatedEvent();
+
+    wxTextCtrl::SendTextUpdatedEvent(this);

 }
 
 /// Painting
 }
 
 /// Painting


@@ -1879,7 +1880,7 @@ bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
     PositionCaret();
     SetupScrollbars(true);
     Refresh(false);
     PositionCaret();
     SetupScrollbars(true);
     Refresh(false);

-    SendTextUpdatedEvent();
+    wxTextCtrl::SendTextUpdatedEvent(this);

 
     if (success)
         return true;
 
     if (success)
         return true;


@@ -2078,7 +2079,7 @@ void wxRichTextCtrl::DoSetValue(const wxString& value, int flags)
     {
         // still send an event for consistency
         if (flags & SetValue_SendEvent)
     {
         // still send an event for consistency
         if (flags & SetValue_SendEvent)

-            SendTextUpdatedEvent();
+            wxTextCtrl::SendTextUpdatedEvent(this);

     }
     DiscardEdits();
 }
     }
     DiscardEdits();
 }


@@ -2095,7 +2096,7 @@ void wxRichTextCtrl::DoWriteText(const wxString& value, int flags)
     GetBuffer().InsertTextWithUndo(m_caretPosition+1, valueUnix, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
 
     if ( flags & SetValue_SendEvent )
     GetBuffer().InsertTextWithUndo(m_caretPosition+1, valueUnix, this, wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE);
 
     if ( flags & SetValue_SendEvent )

-        SendTextUpdatedEvent();
+        wxTextCtrl::SendTextUpdatedEvent(this);

 }
 
 void wxRichTextCtrl::AppendText(const wxString& text)
 }
 
 void wxRichTextCtrl::AppendText(const wxString& text)