wxGTK2: No need to check for __WXGTK20__ here

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index b2c74d0b398b8eb991a9eb6df0e2e4ca5efebb2d..36a885aa2b7832cd18b6f9aeda66c7ea45016f30 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        richtext/richeditctrl.cpp
+// Name:        src/richtext/richeditctrl.cpp

 // Purpose:     A rich edit control
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     A rich edit control
 // Author:      Julian Smart
 // Modified by:


@@ -429,8 +429,6 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
         event.GetKeyCode() == WXK_HOME ||
         event.GetKeyCode() == WXK_PAGEUP ||
         event.GetKeyCode() == WXK_PAGEDOWN ||
         event.GetKeyCode() == WXK_HOME ||
         event.GetKeyCode() == WXK_PAGEUP ||
         event.GetKeyCode() == WXK_PAGEDOWN ||

-        event.GetKeyCode() == WXK_PRIOR ||
-        event.GetKeyCode() == WXK_NEXT ||

         event.GetKeyCode() == WXK_END)
     {
         KeyboardNavigate(event.GetKeyCode(), flags);
         event.GetKeyCode() == WXK_END)
     {
         KeyboardNavigate(event.GetKeyCode(), flags);


@@ -454,6 +452,8 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
 
         EndBatchUndo();
         SetDefaultStyleToCursorStyle();
 
         EndBatchUndo();
         SetDefaultStyleToCursorStyle();

+
+        ScrollIntoView(m_caretPosition, WXK_RIGHT);

     }
     else if (event.GetKeyCode() == WXK_BACK)
     {
     }
     else if (event.GetKeyCode() == WXK_BACK)
     {


@@ -483,6 +483,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
             SetDefaultStyleToCursorStyle();
         }
 
             SetDefaultStyleToCursorStyle();
         }
 

+        ScrollIntoView(m_caretPosition, WXK_LEFT);

     }
     else if (event.GetKeyCode() == WXK_DELETE)
     {
     }
     else if (event.GetKeyCode() == WXK_DELETE)
     {


@@ -524,6 +525,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
         EndBatchUndo();
 
         SetDefaultStyleToCursorStyle();
         EndBatchUndo();
 
         SetDefaultStyleToCursorStyle();

+        ScrollIntoView(m_caretPosition, WXK_RIGHT);

     }
 #if 0
     else
     }
 #if 0
     else


@@ -614,11 +616,11 @@ bool wxRichTextCtrl::KeyboardNavigate(int keyCode, int flags)
         else
             success = MoveDown(1, flags);
     }
         else
             success = MoveDown(1, flags);
     }

-    else if (keyCode == WXK_PAGEUP || keyCode == WXK_PRIOR)
+    else if (keyCode == WXK_PAGEUP)

     {
         success = PageUp(1, flags);
     }
     {
         success = PageUp(1, flags);
     }

-    else if (keyCode == WXK_PAGEDOWN || keyCode == WXK_NEXT)
+    else if (keyCode == WXK_PAGEDOWN)

     {
         success = PageDown(1, flags);
     }
     {
         success = PageDown(1, flags);
     }


@@ -699,7 +701,7 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
     startX = 0;
     startY = startY * ppuY;
 
     startX = 0;
     startY = startY * ppuY;
 

-    int sx, sy;
+    int sx = 0, sy = 0;

     GetVirtualSize(& sx, & sy);
     sx = 0;
     if (ppuY != 0)
     GetVirtualSize(& sx, & sy);
     sx = 0;
     if (ppuY != 0)


@@ -712,7 +714,7 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
     wxSize clientSize = GetClientSize();
 
     // Going down
     wxSize clientSize = GetClientSize();
 
     // Going down

-    if (keyCode == WXK_DOWN || keyCode == WXK_RIGHT || keyCode == WXK_END || keyCode == WXK_NEXT || keyCode == WXK_PAGEDOWN)
+    if (keyCode == WXK_DOWN || keyCode == WXK_RIGHT || keyCode == WXK_END || keyCode == WXK_PAGEDOWN)

     {
         if ((rect.y + rect.height) > (clientSize.y + startY))
         {
     {
         if ((rect.y + rect.height) > (clientSize.y + startY))
         {


@@ -742,7 +744,7 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
         }
     }
     // Going up
         }
     }
     // Going up

-    else if (keyCode == WXK_UP || keyCode == WXK_LEFT || keyCode == WXK_HOME || keyCode == WXK_PRIOR || keyCode == WXK_PAGEUP)
+    else if (keyCode == WXK_UP || keyCode == WXK_LEFT || keyCode == WXK_HOME || keyCode == WXK_PAGEUP )

     {
         if (rect.y < startY)
         {
     {
         if (rect.y < startY)
         {


@@ -792,7 +794,7 @@ bool wxRichTextCtrl::IsPositionVisible(long pos) const
     startX = 0;
     startY = startY * ppuY;
 
     startX = 0;
     startY = startY * ppuY;
 

-    int sx, sy;
+    int sx = 0, sy = 0;

     GetVirtualSize(& sx, & sy);
     sx = 0;
     if (ppuY != 0)
     GetVirtualSize(& sx, & sy);
     sx = 0;
     if (ppuY != 0)


@@ -1577,17 +1579,20 @@ wxString wxRichTextCtrl::GetStringSelection() const
 }
 
 // do the window-specific processing after processing the update event
 }
 
 // do the window-specific processing after processing the update event

+#if !wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE

 void wxRichTextCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event)
 {
 void wxRichTextCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event)
 {

-    if ( event.GetSetEnabled() )
-        Enable(event.GetEnabled());
+    // call inherited
+    wxWindowBase::DoUpdateWindowUI(event);

 
 

+    // update text

     if ( event.GetSetText() )
     {
         if ( event.GetText() != GetValue() )
             SetValue(event.GetText());
     }
 }
     if ( event.GetSetText() )
     {
         if ( event.GetText() != GetValue() )
             SetValue(event.GetText());
     }
 }

+#endif // !wxRICHTEXT_DERIVES_FROM_TEXTCTRLBASE

 
 // ----------------------------------------------------------------------------
 // hit testing
 
 // ----------------------------------------------------------------------------
 // hit testing


@@ -2526,4 +2531,3 @@ long wxRichTextCtrl::GetFirstVisiblePosition() const
 
 #endif
     // wxUSE_RICHTEXT
 
 #endif
     // wxUSE_RICHTEXT

-