corrections for path handling under Mac OS X

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

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 4d0f086530ab00baa677d090fa410531536e42b2..b2e57eb854717655a8ae043e6fb60a65040d767e 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,30 +46,23 @@
 // 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 wxUSE_IOSTREAMH
-  if (allocate())
-    setp(base(),ebuf());
-  #else
-  m_streambuf=new char[64];
-  setp(m_streambuf,m_streambuf+64);
-  #endif //wxUSE_IOSTREAMH
-#endif // NO_TEXT_WINDOW_STREAM

 }
 
 wxTextCtrlBase::~wxTextCtrlBase()
 {
 }
 
 wxTextCtrlBase::~wxTextCtrlBase()
 {

-#ifndef NO_TEXT_WINDOW_STREAM
-#if !wxUSE_IOSTREAMH
-  delete[] m_streambuf;
-#endif
-#endif

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


@@ -100,6 +96,7 @@ const wxTextAttr& wxTextCtrlBase::GetDefaultStyle() const
 
 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() )
     {


@@ -117,6 +114,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;
 }


@@ -132,6 +130,7 @@ bool wxTextCtrlBase::SaveFile(const wxString& 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()) )
     {


@@ -144,6 +143,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;
 }


@@ -201,34 +201,56 @@ 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());
+}
+
+#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