Removed comment

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index c75c4bfd4067b2a176301e5120035b7337b9cb78..622a4ef50271e3e6f78c4cdf5db4bebf3b5f9a15 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -26,6 +26,7 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

+#include "wx/timer.h"

 #include "wx/textfile.h"
 #include "wx/ffile.h"
 #include "wx/filename.h"
 #include "wx/textfile.h"
 #include "wx/ffile.h"
 #include "wx/filename.h"


@@ -38,24 +39,24 @@
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxRichTextCtrl")
 
 #include "wx/app.h"
 WX_CHECK_BUILD_OPTIONS("wxRichTextCtrl")
 

-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RETURN, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CHARACTER, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_DELETE, wxRichTextEvent )
-
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED, wxRichTextEvent )
-
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED, wxRichTextEvent )
-wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, wxRichTextEvent )
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_CLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_RETURN, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CHARACTER, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_DELETE, wxRichTextEvent );
+
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED, wxRichTextEvent );
+
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED, wxRichTextEvent );
+wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, wxRichTextEvent );

 
 #if wxRICHTEXT_USE_OWN_CARET
 
 
 #if wxRICHTEXT_USE_OWN_CARET
 


@@ -67,18 +68,30 @@ wxDEFINE_EVENT( wxEVT_COMMAND_RICHTEXT_BUFFER_RESET, wxRichTextEvent )
  * wxRICHTEXT_USE_OWN_CARET is set in richtextbuffer.h.
  */
 
  * wxRICHTEXT_USE_OWN_CARET is set in richtextbuffer.h.
  */
 

+class wxRichTextCaret;
+class wxRichTextCaretTimer: public wxTimer
+{
+  public:
+    wxRichTextCaretTimer(wxRichTextCaret* caret)
+    {
+        m_caret = caret;
+    }
+    virtual void Notify();
+    wxRichTextCaret* m_caret;
+};
+

 class wxRichTextCaret: public wxCaret
 {
 public:
     // ctors
     // -----
         // default - use Create()
 class wxRichTextCaret: public wxCaret
 {
 public:
     // ctors
     // -----
         // default - use Create()

-    wxRichTextCaret() { Init(); }
+    wxRichTextCaret(): m_timer(this)  { Init(); }

         // creates a block caret associated with the given window
     wxRichTextCaret(wxRichTextCtrl *window, int width, int height)
         // creates a block caret associated with the given window
     wxRichTextCaret(wxRichTextCtrl *window, int width, int height)

-        : wxCaret(window, width, height) { Init(); m_richTextCtrl = window; }
+        : wxCaret(window, width, height), m_timer(this) { Init(); m_richTextCtrl = window; }

     wxRichTextCaret(wxRichTextCtrl *window, const wxSize& size)
     wxRichTextCaret(wxRichTextCtrl *window, const wxSize& size)

-        : wxCaret(window, size) { Init(); m_richTextCtrl = window; }
+        : wxCaret(window, size), m_timer(this) { Init(); m_richTextCtrl = window; }

 
     virtual ~wxRichTextCaret();
 
 
     virtual ~wxRichTextCaret();
 


@@ -99,6 +112,8 @@ public:
     bool GetNeedsUpdate() const { return m_needsUpdate; }
     void SetNeedsUpdate(bool needsUpdate = true ) { m_needsUpdate = needsUpdate; }
 
     bool GetNeedsUpdate() const { return m_needsUpdate; }
     void SetNeedsUpdate(bool needsUpdate = true ) { m_needsUpdate = needsUpdate; }
 

+    void Notify();
+

 protected:
     virtual void DoShow();
     virtual void DoHide();
 protected:
     virtual void DoShow();
     virtual void DoHide();


@@ -115,16 +130,17 @@ private:
                   m_yOld;
     bool          m_hasFocus;       // true => our window has focus
     bool          m_needsUpdate;    // must be repositioned
                   m_yOld;
     bool          m_hasFocus;       // true => our window has focus
     bool          m_needsUpdate;    // must be repositioned

-
+    bool          m_flashOn;
+    wxRichTextCaretTimer m_timer;

     wxRichTextCtrl* m_richTextCtrl;
 };
 #endif
 
     wxRichTextCtrl* m_richTextCtrl;
 };
 #endif
 

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

 
 IMPLEMENT_DYNAMIC_CLASS( wxRichTextEvent, wxNotifyEvent )
 
 
 IMPLEMENT_DYNAMIC_CLASS( wxRichTextEvent, wxNotifyEvent )
 

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

     EVT_PAINT(wxRichTextCtrl::OnPaint)
     EVT_ERASE_BACKGROUND(wxRichTextCtrl::OnEraseBackground)
     EVT_IDLE(wxRichTextCtrl::OnIdle)
     EVT_PAINT(wxRichTextCtrl::OnPaint)
     EVT_ERASE_BACKGROUND(wxRichTextCtrl::OnEraseBackground)
     EVT_IDLE(wxRichTextCtrl::OnIdle)


@@ -196,7 +212,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 (!wxControl::Create(parent, id, pos, size,
+    style |= wxVSCROLL;
+
+    if (!wxTextCtrlBase::Create(parent, id, pos, size,

                            style|wxFULL_REPAINT_ON_RESIZE,
                            validator, name))
         return false;
                            style|wxFULL_REPAINT_ON_RESIZE,
                            validator, name))
         return false;


@@ -674,23 +692,7 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
 
     if (event.GetEventType() == wxEVT_KEY_DOWN)
     {
 
     if (event.GetEventType() == wxEVT_KEY_DOWN)
     {

-        if (event.GetKeyCode() == WXK_LEFT ||
-            event.GetKeyCode() == WXK_RIGHT ||
-            event.GetKeyCode() == WXK_UP ||
-            event.GetKeyCode() == WXK_DOWN ||
-            event.GetKeyCode() == WXK_HOME ||
-            event.GetKeyCode() == WXK_PAGEUP ||
-            event.GetKeyCode() == WXK_PAGEDOWN ||
-            event.GetKeyCode() == WXK_END ||
-
-            event.GetKeyCode() == WXK_NUMPAD_LEFT ||
-            event.GetKeyCode() == WXK_NUMPAD_RIGHT ||
-            event.GetKeyCode() == WXK_NUMPAD_UP ||
-            event.GetKeyCode() == WXK_NUMPAD_DOWN ||
-            event.GetKeyCode() == WXK_NUMPAD_HOME ||
-            event.GetKeyCode() == WXK_NUMPAD_PAGEUP ||
-            event.GetKeyCode() == WXK_NUMPAD_PAGEDOWN ||
-            event.GetKeyCode() == WXK_NUMPAD_END)
+        if (event.IsKeyInCategory(WXK_CATEGORY_NAVIGATION))

         {
             KeyboardNavigate(event.GetKeyCode(), flags);
             return;
         {
             KeyboardNavigate(event.GetKeyCode(), flags);
             return;


@@ -766,7 +768,6 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
             case WXK_NUMPAD_END:
             case WXK_NUMPAD_BEGIN:
             case WXK_NUMPAD_INSERT:
             case WXK_NUMPAD_END:
             case WXK_NUMPAD_BEGIN:
             case WXK_NUMPAD_INSERT:

-            case WXK_NUMPAD_DELETE:

             case WXK_WINDOWS_LEFT:
             {
                 return;
             case WXK_WINDOWS_LEFT:
             {
                 return;


@@ -992,7 +993,8 @@ void wxRichTextCtrl::OnChar(wxKeyEvent& event)
 #ifdef __WXMAC__
                 if (event.CmdDown())
 #else
 #ifdef __WXMAC__
                 if (event.CmdDown())
 #else

-                if (event.CmdDown() || event.AltDown())
+                // Fixes AltGr+key with European input languages on Windows
+                if ((event.CmdDown() && !event.AltDown()) || (event.AltDown() && !event.CmdDown()))

 #endif
                 {
                     event.Skip();
 #endif
                 {
                     event.Skip();


@@ -2294,7 +2296,7 @@ wxRichTextCtrl::HitTest(const wxPoint& pt,
 // set/get the controls text
 // ----------------------------------------------------------------------------
 
 // set/get the controls text
 // ----------------------------------------------------------------------------
 

-wxString wxRichTextCtrl::GetValue() const
+wxString wxRichTextCtrl::DoGetValue() const

 {
     return GetBuffer().GetText();
 }
 {
     return GetBuffer().GetText();
 }


@@ -2514,6 +2516,8 @@ void wxRichTextCtrl::SetInsertionPoint(long pos)
     m_caretPosition = pos - 1;
 
     PositionCaret();
     m_caretPosition = pos - 1;
 
     PositionCaret();

+
+    SetDefaultStyleToCursorStyle();

 }
 
 void wxRichTextCtrl::SetInsertionPointEnd()
 }
 
 void wxRichTextCtrl::SetInsertionPointEnd()


@@ -2561,11 +2565,6 @@ void wxRichTextCtrl::SetSelection(long from, long to)
         to = GetLastPosition()+1;
     }
 
         to = GetLastPosition()+1;
     }
 

-    DoSetSelection(from, to);
-}
-
-void wxRichTextCtrl::DoSetSelection(long from, long to, bool WXUNUSED(scrollCaret))
-{

     if (from == to)
     {
         SelectNone();
     if (from == to)
     {
         SelectNone();


@@ -2870,7 +2869,7 @@ bool wxRichTextCtrl::GetUncombinedStyle(long position, wxTextAttr& style)
 /// Set font, and also the buffer attributes
 bool wxRichTextCtrl::SetFont(const wxFont& font)
 {
 /// Set font, and also the buffer attributes
 bool wxRichTextCtrl::SetFont(const wxFont& font)
 {

-    wxControl::SetFont(font);
+    wxTextCtrlBase::SetFont(font);

 
     wxTextAttr attr = GetBuffer().GetAttributes();
     attr.SetFont(font);
 
     wxTextAttr attr = GetBuffer().GetAttributes();
     attr.SetFont(font);


@@ -3482,10 +3481,13 @@ void wxRichTextCaret::Init()
     m_yOld = -1;
     m_richTextCtrl = NULL;
     m_needsUpdate = false;
     m_yOld = -1;
     m_richTextCtrl = NULL;
     m_needsUpdate = false;

+    m_flashOn = true;

 }
 
 wxRichTextCaret::~wxRichTextCaret()
 {
 }
 
 wxRichTextCaret::~wxRichTextCaret()
 {

+    if (m_timer.IsRunning())
+        m_timer.Stop();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -3494,11 +3496,19 @@ wxRichTextCaret::~wxRichTextCaret()
 
 void wxRichTextCaret::DoShow()
 {
 
 void wxRichTextCaret::DoShow()
 {

+    m_flashOn = true;
+
+    if (!m_timer.IsRunning())
+        m_timer.Start(GetBlinkTime());
+

     Refresh();
 }
 
 void wxRichTextCaret::DoHide()
 {
     Refresh();
 }
 
 void wxRichTextCaret::DoHide()
 {

+    if (m_timer.IsRunning())
+        m_timer.Stop();
+

     Refresh();
 }
 
     Refresh();
 }
 


@@ -3575,17 +3585,25 @@ void wxRichTextCaret::DoDraw(wxDC *dc)
     dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH));
     dc->SetPen(*wxBLACK_PEN);
 
     dc->SetBrush(*(m_hasFocus ? wxBLACK_BRUSH : wxTRANSPARENT_BRUSH));
     dc->SetPen(*wxBLACK_PEN);
 

-    // VZ: unfortunately, the rectangle comes out a pixel smaller when this is
-    //     done under wxGTK - no idea why
-    //dc->SetLogicalFunction(wxINVERT);
-

     wxPoint pt(m_x, m_y);
 
     if (m_richTextCtrl)
     {
         pt = m_richTextCtrl->GetLogicalPoint(pt);
     }
     wxPoint pt(m_x, m_y);
 
     if (m_richTextCtrl)
     {
         pt = m_richTextCtrl->GetLogicalPoint(pt);
     }

-    dc->DrawRectangle(pt.x, pt.y, m_width, m_height);
+    if (IsVisible() && m_flashOn)
+        dc->DrawRectangle(pt.x, pt.y, m_width, m_height);
+}
+
+void wxRichTextCaret::Notify()
+{
+    m_flashOn = !m_flashOn;
+    Refresh();
+}
+
+void wxRichTextCaretTimer::Notify()
+{
+    m_caret->Notify();

 }
 #endif
     // wxRICHTEXT_USE_OWN_CARET
 }
 #endif
     // wxRICHTEXT_USE_OWN_CARET