DJGPP compilation fixes

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

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 5f6d7aacaff37c0a0c4549ce762472bc803a73ef..6a494d434cf125c3231f3dc36c471c14ece6b105 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -12,10 +12,11 @@
 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================

+

 #ifdef __GNUG__
     #pragma implementation "textctrlbase.h"
 #endif
 #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"
 


@@ -23,6 +24,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_TEXTCTRL
+

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


@@ -43,16 +46,90 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+IMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN)
+

 // ----------------------------------------------------------------------------
 // ctor
 // ----------------------------------------------------------------------------
 
 wxTextCtrlBase::wxTextCtrlBase()
 {
 // ----------------------------------------------------------------------------
 // ctor
 // ----------------------------------------------------------------------------
 
 wxTextCtrlBase::wxTextCtrlBase()
 {

-#ifndef NO_TEXT_WINDOW_STREAM
-    if (allocate())
-        setp(base(),ebuf());
-#endif // NO_TEXT_WINDOW_STREAM
+}
+
+wxTextCtrlBase::~wxTextCtrlBase()
+{
+}
+
+// ----------------------------------------------------------------------------
+// style functions - not implemented here
+// ----------------------------------------------------------------------------
+
+/* static */
+wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
+                               const wxTextAttr& attrDef,
+                               const wxTextCtrlBase *text)
+{
+    wxFont font = attr.GetFont();
+    if ( !font.Ok() )
+    {
+        font = attrDef.GetFont();
+
+        if ( text && !font.Ok() )
+            font = text->GetFont();
+    }
+
+    wxColour colFg = attr.GetTextColour();
+    if ( !colFg.Ok() )
+    {
+        colFg = attrDef.GetTextColour();
+
+        if ( text && !colFg.Ok() )
+            colFg = text->GetForegroundColour();
+    }
+
+    wxColour colBg = attr.GetBackgroundColour();
+    if ( !colBg.Ok() )
+    {
+        colBg = attrDef.GetBackgroundColour();
+
+        if ( text && !colBg.Ok() )
+            colBg = text->GetBackgroundColour();
+    }
+
+    return wxTextAttr(colFg, colBg, font);
+}
+
+// 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;
+}
+
+// change default text attributes
+bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
+{
+    // keep the old attributes if the new style doesn't specify them unless the
+    // new style is empty - then reset m_defaultStyle (as there is no other way
+    // to do it)
+    if ( style.IsDefault() )
+        m_defaultStyle = style;
+    else
+        m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this);
+
+    return TRUE;
+}
+
+// get default text attributes
+const wxTextAttr& wxTextCtrlBase::GetDefaultStyle() const
+{
+    return m_defaultStyle;

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


@@ -61,6 +138,7 @@ wxTextCtrlBase::wxTextCtrlBase()
 
 bool wxTextCtrlBase::LoadFile(const wxString& filename)
 {
 
 bool wxTextCtrlBase::LoadFile(const wxString& filename)
 {

+#if wxUSE_FFILE

     wxFFile file(filename);
     if ( file.IsOpened() )
     {
     wxFFile file(filename);
     if ( file.IsOpened() )
     {


@@ -78,6 +156,7 @@ bool wxTextCtrlBase::LoadFile(const wxString& filename)
     }
 
     wxLogError(_("File couldn't be loaded."));
     }
 
     wxLogError(_("File couldn't be loaded."));

+#endif // wxUSE_FFILE

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -88,11 +167,12 @@ bool wxTextCtrlBase::SaveFile(const wxString& filename)
     if ( !filenameToUse )
     {
         // what kind of message to give? is it an error or a program bug?
     if ( !filenameToUse )
     {
         // what kind of message to give? is it an error or a program bug?

-        wxLogDebug(T("Can't save textctrl to file without filename."));
+        wxLogDebug(wxT("Can't save textctrl to file without filename."));

 
         return FALSE;
     }
 
 
         return FALSE;
     }
 

+#if wxUSE_FFILE

     wxFFile file(filename, "w");
     if ( file.IsOpened() && file.Write(GetValue()) )
     {
     wxFFile file(filename, "w");
     if ( file.IsOpened() && file.Write(GetValue()) )
     {


@@ -105,6 +185,7 @@ bool wxTextCtrlBase::SaveFile(const wxString& filename)
     }
 
     wxLogError(_("The text couldn't be saved."));
     }
 
     wxLogError(_("The text couldn't be saved."));

+#endif // wxUSE_FFILE

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -122,7 +203,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(const wxString& s)
 wxTextCtrl& wxTextCtrlBase::operator<<(float f)
 {
     wxString str;
 wxTextCtrl& wxTextCtrlBase::operator<<(float f)
 {
     wxString str;

-    str.Printf(T("%.2f"), f);
+    str.Printf(wxT("%.2f"), f);

     AppendText(str);
     return *TEXTCTRL(this);
 }
     AppendText(str);
     return *TEXTCTRL(this);
 }


@@ -130,7 +211,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(float f)
 wxTextCtrl& wxTextCtrlBase::operator<<(double d)
 {
     wxString str;
 wxTextCtrl& wxTextCtrlBase::operator<<(double d)
 {
     wxString str;

-    str.Printf(T("%.2f"), d);
+    str.Printf(wxT("%.2f"), d);

     AppendText(str);
     return *TEXTCTRL(this);
 }
     AppendText(str);
     return *TEXTCTRL(this);
 }


@@ -138,7 +219,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(double d)
 wxTextCtrl& wxTextCtrlBase::operator<<(int i)
 {
     wxString str;
 wxTextCtrl& wxTextCtrlBase::operator<<(int i)
 {
     wxString str;

-    str.Printf(T("%d"), i);
+    str.Printf(wxT("%d"), i);

     AppendText(str);
     return *TEXTCTRL(this);
 }
     AppendText(str);
     return *TEXTCTRL(this);
 }


@@ -146,7 +227,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(int i)
 wxTextCtrl& wxTextCtrlBase::operator<<(long i)
 {
     wxString str;
 wxTextCtrl& wxTextCtrlBase::operator<<(long i)
 {
     wxString str;

-    str.Printf(T("%ld"), i);
+    str.Printf(wxT("%ld"), i);

     AppendText(str);
     return *TEXTCTRL(this);
 }
     AppendText(str);
     return *TEXTCTRL(this);
 }


@@ -162,34 +243,70 @@ wxTextCtrl& wxTextCtrlBase::operator<<(const wxChar c)
 
 #ifndef NO_TEXT_WINDOW_STREAM
 
 
 #ifndef NO_TEXT_WINDOW_STREAM
 

-int wxTextCtrlBase::overflow( int WXUNUSED(c) )
+int wxTextCtrlBase::overflow(int c)

 {
 {

-    int len = pptr() - pbase();
-    char *txt = new char[len+1];
-    strncpy(txt, pbase(), len);
-    txt[len] = '\0';
-    (*this) << txt;
-    setp(pbase(), epptr());
-    delete[] txt;
-    return EOF;
+    AppendText((wxChar)c);
+
+    // return something different from EOF
+    return 0;

 }
 
 }
 

-int wxTextCtrlBase::sync()
+#endif // NO_TEXT_WINDOW_STREAM
+
+// ----------------------------------------------------------------------------
+// clipboard stuff
+// ----------------------------------------------------------------------------
+
+bool wxTextCtrlBase::CanCopy() const

 {
 {

-    int len = pptr() - pbase();
-    char *txt = new char[len+1];
-    strncpy(txt, pbase(), len);
-    txt[len] = '\0';
-    (*this) << txt;
-    setp(pbase(), epptr());
-    delete[] txt;
-    return 0;
+    // can copy if there's a selection
+    long from, to;
+    GetSelection(&from, &to);
+    return from != to;

 }
 
 }
 

-int wxTextCtrlBase::underflow()
+bool wxTextCtrlBase::CanCut() const

 {
 {

-    return EOF;
+    // can cut if there's a selection and if we're not read only
+    return CanCopy() && IsEditable();

 }
 
 }
 

-#endif // NO_TEXT_WINDOW_STREAM
+bool wxTextCtrlBase::CanPaste() const
+{
+    // can paste if we are not read only
+    return IsEditable();
+}
+
+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------
+
+void wxTextCtrlBase::SelectAll()
+{
+    SetSelection(0, GetLastPosition());
+}
+
+wxString wxTextCtrlBase::GetStringSelection() const
+{
+    long from, to;
+    GetSelection(&from, &to);
+
+    wxString sel;
+    if ( from < to )
+    {
+        sel = GetValue().Mid(from, to - from);
+    }
+
+    return sel;
+}
+
+#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