remove Create{Window,Client,Paint}DC() methods without window parameter -- they don...

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 61ff087e2b61fb8fc05ae41bc4c494ba96e6613e..c4a91f15287235cf21f8129692f75de5e832aac0 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -32,6 +32,7 @@
 #include "wx/dcbuffer.h"
 #include "wx/arrimpl.cpp"
 #include "wx/fontenum.h"
 #include "wx/dcbuffer.h"
 #include "wx/arrimpl.cpp"
 #include "wx/fontenum.h"

+#include "wx/accel.h"

 
 // DLL options compatibility check:
 #include "wx/app.h"
 
 // DLL options compatibility check:
 #include "wx/app.h"


@@ -56,6 +57,69 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET)
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_RICHTEXT_BUFFER_RESET)
 

+#if wxRICHTEXT_USE_OWN_CARET
+
+/*!
+ * wxRichTextCaret
+ *
+ * This implements a non-flashing cursor in case there
+ * are platform-specific problems with the generic caret.
+ * wxRICHTEXT_USE_OWN_CARET is set in richtextbuffer.h.
+ */
+
+class wxRichTextCaret: public wxCaret
+{
+public:
+    // ctors
+    // -----
+        // default - use Create()
+    wxRichTextCaret() { Init(); }
+        // creates a block caret associated with the given window
+    wxRichTextCaret(wxRichTextCtrl *window, int width, int height)
+        : wxCaret(window, width, height) { Init(); m_richTextCtrl = window; }
+    wxRichTextCaret(wxRichTextCtrl *window, const wxSize& size)
+        : wxCaret(window, size) { Init(); m_richTextCtrl = window; }
+
+    virtual ~wxRichTextCaret();
+
+    // implementation
+    // --------------
+
+    // called by wxWindow (not using the event tables)
+    virtual void OnSetFocus();
+    virtual void OnKillFocus();
+
+    // draw the caret on the given DC
+    void DoDraw(wxDC *dc);
+
+    // get the visible count
+    int GetVisibleCount() const { return m_countVisible; }
+
+    // delay repositioning
+    bool GetNeedsUpdate() const { return m_needsUpdate; }
+    void SetNeedsUpdate(bool needsUpdate = true ) { m_needsUpdate = needsUpdate; }
+
+protected:
+    virtual void DoShow();
+    virtual void DoHide();
+    virtual void DoMove();
+    virtual void DoSize();
+
+    // refresh the caret
+    void Refresh();
+
+private:
+    void Init();
+
+    int           m_xOld,
+                  m_yOld;
+    bool          m_hasFocus;       // true => our window has focus
+    bool          m_needsUpdate;    // must be repositioned
+
+    wxRichTextCtrl* m_richTextCtrl;
+};
+#endif
+

 IMPLEMENT_CLASS( wxRichTextCtrl, wxControl )
 
 IMPLEMENT_CLASS( wxRichTextEvent, wxNotifyEvent )
 IMPLEMENT_CLASS( wxRichTextCtrl, wxControl )
 
 IMPLEMENT_CLASS( wxRichTextEvent, wxNotifyEvent )


@@ -152,8 +216,6 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
     attributes.SetLineSpacing(10);
     attributes.SetParagraphSpacingAfter(10);
     attributes.SetParagraphSpacingBefore(0);
     attributes.SetLineSpacing(10);
     attributes.SetParagraphSpacingAfter(10);
     attributes.SetParagraphSpacingBefore(0);

-    attributes.SetTextEffects(0);
-    attributes.SetTextEffectFlags(wxTEXT_ATTR_EFFECT_STRIKETHROUGH|wxTEXT_ATTR_EFFECT_CAPITALS);

 
     SetBasicStyle(attributes);
 
 
     SetBasicStyle(attributes);
 


@@ -168,8 +230,11 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
     GetBuffer().Reset();
     GetBuffer().SetRichTextCtrl(this);
 
     GetBuffer().Reset();
     GetBuffer().SetRichTextCtrl(this);
 

+#if wxRICHTEXT_USE_OWN_CARET
+    SetCaret(new wxRichTextCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16));
+#else

     SetCaret(new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16));
     SetCaret(new wxCaret(this, wxRICHTEXT_DEFAULT_CARET_WIDTH, 16));

-    GetCaret()->Show();
+#endif

 
     // Tell the sizers to use the given or best size
     SetInitialSize(size);
 
     // Tell the sizers to use the given or best size
     SetInitialSize(size);


@@ -189,6 +254,17 @@ bool wxRichTextCtrl::Create( wxWindow* parent, wxWindowID id, const wxString& va
 
     GetBuffer().AddEventHandler(this);
 
 
     GetBuffer().AddEventHandler(this);
 

+    // Accelerators
+    wxAcceleratorEntry entries[4];
+
+    entries[0].Set(wxACCEL_CMD,   (int) 'C',       wxID_COPY);
+    entries[1].Set(wxACCEL_CMD,   (int) 'X',       wxID_CUT);
+    entries[2].Set(wxACCEL_CMD,   (int) 'V',       wxID_PASTE);
+    entries[3].Set(wxACCEL_CMD,   (int) 'A',       wxID_SELECTALL);
+
+    wxAcceleratorTable accel(4, entries);
+    SetAcceleratorTable(accel);
+

     return true;
 }
 
     return true;
 }
 


@@ -250,8 +326,10 @@ void wxRichTextCtrl::Clear()
 /// Painting
 void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
 /// Painting
 void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 {

-    if (GetCaret() && GetCaret()->IsVisible())
+#if !wxRICHTEXT_USE_OWN_CARET
+    if (GetCaret() && !IsFrozen())

         GetCaret()->Hide();
         GetCaret()->Hide();

+#endif

 
     {
 #if wxRICHTEXT_BUFFERED_PAINTING
 
     {
 #if wxRICHTEXT_BUFFERED_PAINTING


@@ -284,12 +362,19 @@ void wxRichTextCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         }
 
         GetBuffer().Draw(dc, GetBuffer().GetRange(), GetInternalSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);
         }
 
         GetBuffer().Draw(dc, GetBuffer().GetRange(), GetInternalSelectionRange(), drawingArea, 0 /* descent */, 0 /* flags */);

+#if wxRICHTEXT_USE_OWN_CARET
+        if (GetCaret()->IsVisible())
+        {
+            ((wxRichTextCaret*) GetCaret())->DoDraw(& dc);
+        }
+#endif

     }
 
     }
 

-    if (GetCaret() && !GetCaret()->IsVisible())
+#if !wxRICHTEXT_USE_OWN_CARET
+    if (GetCaret())

         GetCaret()->Show();
         GetCaret()->Show();

-

     PositionCaret();
     PositionCaret();

+#endif

 }
 
 // Empty implementation, to prevent flicker
 }
 
 // Empty implementation, to prevent flicker


@@ -301,22 +386,33 @@ void wxRichTextCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event))
 {
     if (GetCaret())
     {
 {
     if (GetCaret())
     {

-        if (!GetCaret()->IsVisible())
-            GetCaret()->Show();
+#if !wxRICHTEXT_USE_OWN_CARET

         PositionCaret();
         PositionCaret();

+#endif
+        GetCaret()->Show();

     }
 
     }
 

-    // if (!IsFrozen())
-    //    Refresh(false);
+#if defined(__WXGTK__) && !wxRICHTEXT_USE_OWN_CARET
+    // Work around dropouts when control is focused
+    if (!IsFrozen())
+    {
+        Refresh(false);
+    }
+#endif

 }
 
 void wxRichTextCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event))
 {
 }
 
 void wxRichTextCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event))
 {

-    if (GetCaret() && GetCaret()->IsVisible())
+    if (GetCaret())

         GetCaret()->Hide();
 
         GetCaret()->Hide();
 

-    // if (!IsFrozen())
-    //    Refresh(false);
+#if defined(__WXGTK__) && !wxRICHTEXT_USE_OWN_CARET
+    // Work around dropouts when control is focused
+    if (!IsFrozen())
+    {
+        Refresh(false);
+    }
+#endif

 }
 
 void wxRichTextCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
 }
 
 void wxRichTextCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))


@@ -1138,7 +1234,9 @@ bool wxRichTextCtrl::ScrollIntoView(long position, int keyCode)
         }
     }
 
         }
     }
 

+#if !wxRICHTEXT_USE_OWN_CARET

     if (scrolled)
     if (scrolled)

+#endif

         PositionCaret();
 
     return scrolled;
         PositionCaret();
 
     return scrolled;


@@ -1749,6 +1847,15 @@ void wxRichTextCtrl::OnSize(wxSizeEvent& event)
 /// Idle-time processing
 void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
 {
 /// Idle-time processing
 void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
 {

+#if wxRICHTEXT_USE_OWN_CARET
+    if (((wxRichTextCaret*) GetCaret())->GetNeedsUpdate())
+    {
+        ((wxRichTextCaret*) GetCaret())->SetNeedsUpdate(false);
+        PositionCaret();
+        GetCaret()->Show();
+    }
+#endif
+

     const int layoutInterval = wxRICHTEXT_DEFAULT_LAYOUT_INTERVAL;
 
     if (m_fullLayoutRequired && (wxGetLocalTimeMillis() > (m_fullLayoutTime + layoutInterval)))
     const int layoutInterval = wxRICHTEXT_DEFAULT_LAYOUT_INTERVAL;
 
     if (m_fullLayoutRequired && (wxGetLocalTimeMillis() > (m_fullLayoutTime + layoutInterval)))


@@ -1774,7 +1881,14 @@ void wxRichTextCtrl::OnIdle(wxIdleEvent& event)
 /// Scrolling
 void wxRichTextCtrl::OnScroll(wxScrollWinEvent& event)
 {
 /// Scrolling
 void wxRichTextCtrl::OnScroll(wxScrollWinEvent& event)
 {

-    // Not used
+#if wxRICHTEXT_USE_OWN_CARET
+    if (!((wxRichTextCaret*) GetCaret())->GetNeedsUpdate())
+    {
+        GetCaret()->Hide();
+        ((wxRichTextCaret*) GetCaret())->SetNeedsUpdate();
+    }
+#endif
+

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -1874,7 +1988,7 @@ bool wxRichTextCtrl::RecreateBuffer(const wxSize& size)
 
 bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
 {
 
 bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
 {

-    bool success = GetBuffer().LoadFile(filename, fileType);
+    bool success = GetBuffer().LoadFile(filename, (wxRichTextFileType)fileType);

     if (success)
         m_filename = filename;
 
     if (success)
         m_filename = filename;
 


@@ -1898,7 +2012,7 @@ bool wxRichTextCtrl::DoLoadFile(const wxString& filename, int fileType)
 
 bool wxRichTextCtrl::DoSaveFile(const wxString& filename, int fileType)
 {
 
 bool wxRichTextCtrl::DoSaveFile(const wxString& filename, int fileType)
 {

-    if (GetBuffer().SaveFile(filename, fileType))
+    if (GetBuffer().SaveFile(filename, (wxRichTextFileType)fileType))

     {
         m_filename = filename;
 
     {
         m_filename = filename;
 


@@ -2141,7 +2255,7 @@ void wxRichTextCtrl::AppendText(const wxString& text)
 }
 
 /// Write an image at the current insertion point
 }
 
 /// Write an image at the current insertion point

-bool wxRichTextCtrl::WriteImage(const wxImage& image, int bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxImage& image, wxBitmapType bitmapType)

 {
     wxRichTextImageBlock imageBlock;
 
 {
     wxRichTextImageBlock imageBlock;
 


@@ -2152,7 +2266,7 @@ bool wxRichTextCtrl::WriteImage(const wxImage& image, int bitmapType)
     return false;
 }
 
     return false;
 }
 

-bool wxRichTextCtrl::WriteImage(const wxString& filename, int bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxString& filename, wxBitmapType bitmapType)

 {
     wxRichTextImageBlock imageBlock;
 
 {
     wxRichTextImageBlock imageBlock;
 


@@ -2168,7 +2282,7 @@ bool wxRichTextCtrl::WriteImage(const wxRichTextImageBlock& imageBlock)
     return GetBuffer().InsertImageWithUndo(m_caretPosition+1, imageBlock, this);
 }
 
     return GetBuffer().InsertImageWithUndo(m_caretPosition+1, imageBlock, this);
 }
 

-bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, int bitmapType)
+bool wxRichTextCtrl::WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType)

 {
     if (bitmap.Ok())
     {
 {
     if (bitmap.Ok())
     {


@@ -2339,7 +2453,6 @@ void wxRichTextCtrl::SetSelection(long from, long to)
     }
 
     DoSetSelection(from, to);
     }
 
     DoSetSelection(from, to);

-    SetDefaultStyleToCursorStyle();

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


@@ -2694,8 +2807,11 @@ void wxRichTextCtrl::PositionCaret()
         wxPoint pt = GetPhysicalPoint(newPt);
         if (GetCaret()->GetPosition() != pt || GetCaret()->GetSize() != newSz)
         {
         wxPoint pt = GetPhysicalPoint(newPt);
         if (GetCaret()->GetPosition() != pt || GetCaret()->GetSize() != newSz)
         {

+            GetCaret()->Hide();
+            if (GetCaret()->GetSize() != newSz)
+                GetCaret()->SetSize(newSz);

             GetCaret()->Move(pt);
             GetCaret()->Move(pt);

-            GetCaret()->SetSize(newSz);
+            GetCaret()->Show();

         }
     }
 }
         }
     }
 }


@@ -3237,5 +3353,127 @@ bool wxRichTextCtrl::RefreshForSelectionChange(const wxRichTextRange& oldSelecti
     return true;
 }
 
     return true;
 }
 

+#if wxRICHTEXT_USE_OWN_CARET
+
+// ----------------------------------------------------------------------------
+// initialization and destruction
+// ----------------------------------------------------------------------------
+
+void wxRichTextCaret::Init()
+{
+    m_hasFocus = true;
+
+    m_xOld =
+    m_yOld = -1;
+    m_richTextCtrl = NULL;
+    m_needsUpdate = false;
+}
+
+wxRichTextCaret::~wxRichTextCaret()
+{
+}
+
+// ----------------------------------------------------------------------------
+// showing/hiding/moving the caret (base class interface)
+// ----------------------------------------------------------------------------
+
+void wxRichTextCaret::DoShow()
+{
+    Refresh();
+}
+
+void wxRichTextCaret::DoHide()
+{
+    Refresh();
+}
+
+void wxRichTextCaret::DoMove()
+{
+    if (IsVisible())
+    {
+        Refresh();
+
+        if (m_xOld != -1 && m_yOld != -1)
+        {
+            if (m_richTextCtrl)
+            {
+                wxRect rect(GetPosition(), GetSize());
+                m_richTextCtrl->RefreshRect(rect, false);
+            }
+        }
+    }
+
+    m_xOld = m_x;
+    m_yOld = m_y;
+}
+
+void wxRichTextCaret::DoSize()
+{
+    int countVisible = m_countVisible;
+    if (countVisible > 0)
+    {
+        m_countVisible = 0;
+        DoHide();
+    }
+
+    if (countVisible > 0)
+    {
+        m_countVisible = countVisible;
+        DoShow();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// handling the focus
+// ----------------------------------------------------------------------------
+
+void wxRichTextCaret::OnSetFocus()
+{
+    m_hasFocus = true;
+
+    if ( IsVisible() )
+        Refresh();
+}
+
+void wxRichTextCaret::OnKillFocus()
+{
+    m_hasFocus = false;
+}
+
+// ----------------------------------------------------------------------------
+// drawing the caret
+// ----------------------------------------------------------------------------
+
+void wxRichTextCaret::Refresh()
+{
+    if (m_richTextCtrl)
+    {
+        wxRect rect(GetPosition(), GetSize());
+        m_richTextCtrl->RefreshRect(rect, false);
+    }
+}
+
+void wxRichTextCaret::DoDraw(wxDC *dc)
+{
+    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);
+    }
+    dc->DrawRectangle(pt.x, pt.y, m_width, m_height);
+}
+#endif
+    // wxRICHTEXT_USE_OWN_CARET
+

 #endif
     // wxUSE_RICHTEXT
 #endif
     // wxUSE_RICHTEXT