src/X11/font.cpp needs smae change as other wxXXX versions

[wxWidgets.git] / src / common / textcmn.cpp

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index de9a68979c74aa898759beb12d857ce42d514d2f..8fa4ad28c9dda3ea74d2636f1a9cf148ff7c97c3 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -1,22 +1,18 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/textcmn.cpp
+// Name:        src/common/textcmn.cpp

 // Purpose:     implementation of platform-independent functions of wxTextCtrl
 // Author:      Julian Smart
 // Modified by:
 // Created:     13.07.99
 // RCS-ID:      $Id$
 // Purpose:     implementation of platform-independent functions of wxTextCtrl
 // Author:      Julian Smart
 // Modified by:
 // Created:     13.07.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // declarations
 // ============================================================================
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // declarations
 // ============================================================================
 

-#ifdef __GNUG__
-    #pragma implementation "textctrlbase.h"
-#endif
-

 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -24,12 +20,17 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+    #include "wx/event.h"
+#endif // WX_PRECOMP
+

 #if wxUSE_TEXTCTRL
 
 #if wxUSE_TEXTCTRL
 

+#include "wx/textctrl.h"
+

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"

-    #include "wx/textctrl.h"

 #endif // WX_PRECOMP
 
 #include "wx/ffile.h"
 #endif // WX_PRECOMP
 
 #include "wx/ffile.h"


@@ -53,22 +54,38 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN)
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN)
 

+IMPLEMENT_ABSTRACT_CLASS(wxTextCtrlBase, wxControl)
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// ctor
+// style functions - not implemented here

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxTextCtrlBase::wxTextCtrlBase()
+wxTextAttr::wxTextAttr(const wxColour& colText,
+               const wxColour& colBack,
+               const wxFont& font,
+               wxTextAttrAlignment alignment)
+    : m_colText(colText), m_colBack(colBack), m_font(font), m_textAlignment(alignment)

 {
 {

+    m_flags = 0;
+    m_leftIndent = 0;
+    m_leftSubIndent = 0;
+    m_rightIndent = 0;
+    if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR;
+    if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR;
+    if (m_font.Ok()) m_flags |= wxTEXT_ATTR_FONT;
+    if (alignment != wxTEXT_ALIGNMENT_DEFAULT)
+        m_flags |= wxTEXT_ATTR_ALIGNMENT;

 }
 
 }
 

-wxTextCtrlBase::~wxTextCtrlBase()
+void wxTextAttr::Init()

 {
 {

+    m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT;
+    m_flags = 0;
+    m_leftIndent = 0;
+    m_leftSubIndent = 0;
+    m_rightIndent = 0;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// style functions - not implemented here
-// ----------------------------------------------------------------------------
-

 /* static */
 wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
                                const wxTextAttr& attrDef,
 /* static */
 wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
                                const wxTextAttr& attrDef,


@@ -101,15 +118,58 @@ wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
             colBg = text->GetBackgroundColour();
     }
 
             colBg = text->GetBackgroundColour();
     }
 

-    return wxTextAttr(colFg, colBg, font);
+    wxTextAttr newAttr(colFg, colBg, font);
+
+    if (attr.HasAlignment())
+        newAttr.SetAlignment(attr.GetAlignment());
+    else if (attrDef.HasAlignment())
+        newAttr.SetAlignment(attrDef.GetAlignment());
+
+    if (attr.HasTabs())
+        newAttr.SetTabs(attr.GetTabs());
+    else if (attrDef.HasTabs())
+        newAttr.SetTabs(attrDef.GetTabs());
+
+    if (attr.HasLeftIndent())
+        newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
+    else if (attrDef.HasLeftIndent())
+        newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());
+
+    if (attr.HasRightIndent())
+        newAttr.SetRightIndent(attr.GetRightIndent());
+    else if (attrDef.HasRightIndent())
+        newAttr.SetRightIndent(attrDef.GetRightIndent());
+
+    return newAttr;
+}
+
+void wxTextAttr::operator= (const wxTextAttr& attr)
+{
+    m_font = attr.m_font;
+    m_colText = attr.m_colText;
+    m_colBack = attr.m_colBack;
+    m_textAlignment = attr.m_textAlignment;
+    m_leftIndent = attr.m_leftIndent;
+    m_leftSubIndent = attr.m_leftSubIndent;
+    m_rightIndent = attr.m_rightIndent;
+    m_tabs = attr.m_tabs;
+    m_flags = attr.m_flags;

 }
 
 }
 

+

 // apply styling to text range
 bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
                               const wxTextAttr& WXUNUSED(style))
 {
 // apply styling to text range
 bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
                               const wxTextAttr& WXUNUSED(style))
 {

-    // to be implemented in derived TextCtrl classes
-    return FALSE;
+    // to be implemented in derived classes
+    return false;
+}
+
+// get the styling at the given position
+bool wxTextCtrlBase::GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style))
+{
+    // to be implemented in derived classes
+    return false;

 }
 
 // change default text attributes
 }
 
 // change default text attributes


@@ -123,20 +183,14 @@ bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
     else
         m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this);
 
     else
         m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this);
 

-    return TRUE;
-}
-
-// get default text attributes
-const wxTextAttr& wxTextCtrlBase::GetDefaultStyle() const
-{
-    return m_defaultStyle;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // file IO functions
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // file IO functions
 // ----------------------------------------------------------------------------
 

-bool wxTextCtrlBase::LoadFile(const wxString& filename)
+bool wxTextCtrlBase::DoLoadFile(const wxString& filename, int WXUNUSED(fileType))

 {
 #if wxUSE_FFILE
     wxFFile file(filename);
 {
 #if wxUSE_FFILE
     wxFFile file(filename);


@@ -151,43 +205,49 @@ bool wxTextCtrlBase::LoadFile(const wxString& filename)
 
             m_filename = filename;
 
 
             m_filename = filename;
 

-            return TRUE;
+            return true;

         }
     }
 
     wxLogError(_("File couldn't be loaded."));
 #endif // wxUSE_FFILE
 
         }
     }
 
     wxLogError(_("File couldn't be loaded."));
 #endif // wxUSE_FFILE
 

-    return FALSE;
+    return false;

 }
 
 }
 

-bool wxTextCtrlBase::SaveFile(const wxString& filename)
+bool wxTextAreaBase::SaveFile(const wxString& filename, int fileType)

 {
 {

-    wxString filenameToUse = filename.IsEmpty() ? m_filename : filename;
-    if ( !filenameToUse )
+    wxString filenameToUse = filename.empty() ? m_filename : filename;
+    if ( filenameToUse.empty() )

     {
         // what kind of message to give? is it an error or a program bug?
         wxLogDebug(wxT("Can't save textctrl to file without filename."));
 
     {
         // what kind of message to give? is it an error or a program bug?
         wxLogDebug(wxT("Can't save textctrl to file without filename."));
 

-        return FALSE;
+        return false;

     }
 
     }
 

+    return DoSaveFile(filenameToUse, fileType);
+}
+
+bool wxTextCtrlBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType))
+{

 #if wxUSE_FFILE
 #if wxUSE_FFILE

-    wxFFile file(filename, "w");
+    wxFFile file(filename, _T("w"));

     if ( file.IsOpened() && file.Write(GetValue()) )
     {
     if ( file.IsOpened() && file.Write(GetValue()) )
     {

+        // if it worked, save for future calls
+        m_filename = filename;
+

         // it's not modified any longer
         DiscardEdits();
 
         // it's not modified any longer
         DiscardEdits();
 

-        m_filename = filename;
-
-        return TRUE;
+        return true;

     }
     }

+#endif // wxUSE_FFILE

 
     wxLogError(_("The text couldn't be saved."));
 
     wxLogError(_("The text couldn't be saved."));

-#endif // wxUSE_FFILE

 
 

-    return FALSE;
+    return false;

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


@@ -241,7 +301,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(const wxChar c)
 // streambuf methods implementation
 // ----------------------------------------------------------------------------
 
 // streambuf methods implementation
 // ----------------------------------------------------------------------------
 

-#ifndef NO_TEXT_WINDOW_STREAM
+#if wxHAS_TEXT_WINDOW_STREAM

 
 int wxTextCtrlBase::overflow(int c)
 {
 
 int wxTextCtrlBase::overflow(int c)
 {


@@ -251,31 +311,7 @@ int wxTextCtrlBase::overflow(int c)
     return 0;
 }
 
     return 0;
 }
 

-#endif // NO_TEXT_WINDOW_STREAM
-
-// ----------------------------------------------------------------------------
-// clipboard stuff
-// ----------------------------------------------------------------------------
-
-bool wxTextCtrlBase::CanCopy() const
-{
-    // can copy if there's a selection
-    long from, to;
-    GetSelection(&from, &to);
-    return from != to;
-}
-
-bool wxTextCtrlBase::CanCut() const
-{
-    // can cut if there's a selection and if we're not read only
-    return CanCopy() && IsEditable();
-}
-
-bool wxTextCtrlBase::CanPaste() const
-{
-    // can paste if we are not read only
-    return IsEditable();
-}
+#endif // wxHAS_TEXT_WINDOW_STREAM

 
 // ----------------------------------------------------------------------------
 // emulating key presses
 
 // ----------------------------------------------------------------------------
 // emulating key presses


@@ -283,9 +319,9 @@ bool wxTextCtrlBase::CanPaste() const
 
 bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
 {
 
 bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
 {

-    // the generic version is unused in wxMSW
+    // we have a native implementation for Win32 and so don't need this one

 #ifndef __WIN32__
 #ifndef __WIN32__

-    wxChar ch;
+    wxChar ch = 0;

     int keycode = event.GetKeyCode();
     switch ( keycode )
     {
     int keycode = event.GetKeyCode();
     switch ( keycode )
     {


@@ -299,7 +335,7 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
         case WXK_NUMPAD7:
         case WXK_NUMPAD8:
         case WXK_NUMPAD9:
         case WXK_NUMPAD7:
         case WXK_NUMPAD8:
         case WXK_NUMPAD9:

-            ch = _T('0') + keycode - WXK_NUMPAD0;
+            ch = (wxChar)(_T('0') + keycode - WXK_NUMPAD0);

             break;
 
         case WXK_MULTIPLY:
             break;
 
         case WXK_MULTIPLY:


@@ -327,7 +363,33 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
             ch = _T('/');
             break;
 
             ch = _T('/');
             break;
 

+        case WXK_DELETE:
+        case WXK_NUMPAD_DELETE:
+            // delete the character at cursor
+            {
+                const long pos = GetInsertionPoint();
+                if ( pos < GetLastPosition() )
+                    Remove(pos, pos + 1);
+            }
+            break;
+
+        case WXK_BACK:
+            // delete the character before the cursor
+            {
+                const long pos = GetInsertionPoint();
+                if ( pos > 0 )
+                    Remove(pos - 1, pos);
+            }
+            break;
+

         default:
         default:

+#if wxUSE_UNICODE
+            if ( event.GetUnicodeKey() )
+            {
+                ch = event.GetUnicodeKey();
+            }
+            else
+#endif

             if ( keycode < 256 && keycode >= 0 && wxIsprint(keycode) )
             {
                 // FIXME this is not going to work for non letters...
             if ( keycode < 256 && keycode >= 0 && wxIsprint(keycode) )
             {
                 // FIXME this is not going to work for non letters...


@@ -348,48 +410,83 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
     {
         WriteText(ch);
 
     {
         WriteText(ch);
 

-        return TRUE;
+        return true;

     }
     }

-#endif // !__WIN32__
+#else // __WIN32__
+    wxUnusedVar(event);
+#endif // !__WIN32__/__WIN32__

 
 

-    return FALSE;
+    return false;
+}
+
+// do the window-specific processing after processing the update event
+void wxTextCtrlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
+{
+    // call inherited, but skip the wxControl's version, and call directly the
+    // wxWindow's one instead, because the only reason why we are overriding this
+    // function is that we want to use SetValue() instead of wxControl::SetLabel()
+    wxWindowBase::DoUpdateWindowUI(event);
+
+    // update text
+    if ( event.GetSetText() )
+    {
+        if ( event.GetText() != GetValue() )
+            SetValue(event.GetText());
+    }

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

-// selection and ranges
+// hit testing

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxTextCtrlBase::SelectAll()
+wxTextCtrlHitTestResult
+wxTextAreaBase::HitTest(const wxPoint& pt, wxTextCoord *x, wxTextCoord *y) const

 {
 {

-    SetSelection(0, GetLastPosition());
+    // implement in terms of the other overload as the native ports typically
+    // can get the position and not (x, y) pair directly (although wxUniv
+    // directly gets x and y -- and so overrides this method as well)
+    long pos;
+    wxTextCtrlHitTestResult rc = HitTest(pt, &pos);
+
+    if ( rc != wxTE_HT_UNKNOWN )
+    {
+        PositionToXY(pos, x, y);
+    }
+
+    return rc;

 }
 
 }
 

-wxString wxTextCtrlBase::GetStringSelection() const
+wxTextCtrlHitTestResult
+wxTextAreaBase::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(pos)) const

 {
 {

-    long from, to;
-    GetSelection(&from, &to);
-
-    return GetRange(from, to);
+    // not implemented
+    return wxTE_HT_UNKNOWN;

 }
 
 }
 

-wxString wxTextCtrlBase::GetRange(long from, long to) const
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+/* static */
+bool wxTextCtrlBase::SendTextUpdatedEvent(wxWindow *win)

 {
 {

-    wxString sel;
-    if ( from < to )
-    {
-        sel = GetValue().Mid(from, to - from);
-    }
+    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, win->GetId());

 
 

-    return sel;
+    // do not do this as it could be very inefficient if the text control
+    // contains a lot of text and we're not using ref-counted wxString
+    // implementation -- instead, event.GetString() will query the control for
+    // its current text if needed
+    //event.SetString(win->GetValue());
+
+    event.SetEventObject(win);
+    return win->GetEventHandler()->ProcessEvent(event);

 }
 
 #else // !wxUSE_TEXTCTRL
 
 // define this one even if !wxUSE_TEXTCTRL because it is also used by other
 // controls (wxComboBox and wxSpinCtrl)
 }
 
 #else // !wxUSE_TEXTCTRL
 
 // define this one even if !wxUSE_TEXTCTRL because it is also used by other
 // controls (wxComboBox and wxSpinCtrl)

-#include "wx/event.h"

 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED)
 
 #endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED)
 
 #endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL

-