fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index d8816f8974c3566a829f92a84aed9a5e5f857336..9417dc76334ffd50d74d0d490cda9ca733d1a481 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -790,21 +790,23 @@ wxTextCtrl::~wxTextCtrl()
 
 void wxTextCtrl::DoSetValue(const wxString& value, int flags)
 {
 
 void wxTextCtrl::DoSetValue(const wxString& value, int flags)
 {

-    if ( IsSingleLine() && (value == GetValue()) )
+    if ( value != GetValue() )

     {
     {

-        // nothing changed
-        return;
-    }
+        EventsSuppressor noeventsIf(this, !(flags & SetValue_SendEvent));

 
 

-    Replace(0, GetLastPosition(), value);
+        Replace(0, GetLastPosition(), value);

 
 

-    if ( IsSingleLine() )
+        if ( IsSingleLine() )
+        {
+            SetInsertionPoint(0);
+        }
+    }
+    else // nothing changed

     {
     {

-        SetInsertionPoint(0);
+        // still send event for consistency
+        if ( flags & SetValue_SendEvent )
+            SendTextUpdatedEvent();

     }
     }

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

 }
 
 const wxArrayString& wxTextCtrl::GetLines() const
 }
 
 const wxArrayString& wxTextCtrl::GetLines() const


@@ -1264,6 +1266,9 @@ void wxTextCtrl::Replace(wxTextPos from, wxTextPos to, const wxString& text)
 
     // now call it to do the rest (not related to refreshing)
     ClearSelection();
 
     // now call it to do the rest (not related to refreshing)
     ClearSelection();

+
+    if ( EventsAllowed() )
+        SendTextUpdatedEvent();

 }
 
 void wxTextCtrl::Remove(wxTextPos from, wxTextPos to)
 }
 
 void wxTextCtrl::Remove(wxTextPos from, wxTextPos to)


@@ -3615,8 +3620,12 @@ void wxTextCtrl::UpdateScrollbars()
 
         if ( scrollRangeXOld )
         {
 
         if ( scrollRangeXOld )
         {

-            x *= scrollRangeX - m_rectText.width / charWidth;
-            x /= scrollRangeXOld - m_rectText.width / charWidth;
+            const int w = m_rectText.width / charWidth;
+            if ( w != scrollRangeXOld )
+            {
+                x *= scrollRangeX - w;
+                x /= scrollRangeXOld - w;
+            }

             Scroll(x, y);
         }
 
             Scroll(x, y);
         }
 


@@ -4305,7 +4314,7 @@ void wxTextCtrl::CreateCaret()
     else
     {
         // read only controls don't have the caret
     else
     {
         // read only controls don't have the caret

-        caret = (wxCaret *)NULL;
+        caret = NULL;

     }
 
     // SetCaret() will delete the old caret if any
     }
 
     // SetCaret() will delete the old caret if any


@@ -4424,7 +4433,7 @@ bool wxTextCtrl::PerformAction(const wxControlAction& actionOrig,
 
     // the command this action corresponds to or NULL if this action doesn't
     // change text at all or can't be undone
 
     // the command this action corresponds to or NULL if this action doesn't
     // change text at all or can't be undone

-    wxTextCtrlCommand *command = (wxTextCtrlCommand *)NULL;
+    wxTextCtrlCommand *command = NULL;

 
     wxString action;
     bool del = false,
 
     wxString action;
     bool del = false,


@@ -4780,7 +4789,7 @@ wxInputHandler *wxTextCtrl::GetStdInputHandler(wxInputHandler *handlerDef)
 wxStdTextCtrlInputHandler::wxStdTextCtrlInputHandler(wxInputHandler *inphand)
                          : wxStdInputHandler(inphand)
 {
 wxStdTextCtrlInputHandler::wxStdTextCtrlInputHandler(wxInputHandler *inphand)
                          : wxStdInputHandler(inphand)
 {

-    m_winCapture = (wxTextCtrl *)NULL;
+    m_winCapture = NULL;

 }
 
 /* static */
 }
 
 /* static */


@@ -4957,7 +4966,7 @@ bool wxStdTextCtrlInputHandler::HandleMouse(wxInputConsumer *consumer,
             m_winCapture->ShowCaret();
 
             m_winCapture->ReleaseMouse();
             m_winCapture->ShowCaret();
 
             m_winCapture->ReleaseMouse();

-            m_winCapture = (wxTextCtrl *)NULL;
+            m_winCapture = NULL;

         }
     }
 
         }
     }