Add some version checks to help compiling on OSX.

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

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 526f83412dd35cb2122ac0cdd6bc98461b5990c6..9e04aedcaa99882f38fa6b0acb5218f0a30a3b4f 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -35,6 +35,8 @@
 
 #include "wx/ffile.h"
 
 
 #include "wx/ffile.h"
 

+extern WXDLLEXPORT_DATA(const char) wxTextCtrlNameStr[] = "text";
+

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -47,6 +49,80 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxTextCtrlStyle )
+wxBEGIN_FLAGS( wxTextCtrlStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxTE_PROCESS_ENTER)
+wxFLAGS_MEMBER(wxTE_PROCESS_TAB)
+wxFLAGS_MEMBER(wxTE_MULTILINE)
+wxFLAGS_MEMBER(wxTE_PASSWORD)
+wxFLAGS_MEMBER(wxTE_READONLY)
+wxFLAGS_MEMBER(wxHSCROLL)
+wxFLAGS_MEMBER(wxTE_RICH)
+wxFLAGS_MEMBER(wxTE_RICH2)
+wxFLAGS_MEMBER(wxTE_AUTO_URL)
+wxFLAGS_MEMBER(wxTE_NOHIDESEL)
+wxFLAGS_MEMBER(wxTE_LEFT)
+wxFLAGS_MEMBER(wxTE_CENTRE)
+wxFLAGS_MEMBER(wxTE_RIGHT)
+wxFLAGS_MEMBER(wxTE_DONTWRAP)
+wxFLAGS_MEMBER(wxTE_CHARWRAP)
+wxFLAGS_MEMBER(wxTE_WORDWRAP)
+wxEND_FLAGS( wxTextCtrlStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl, "wx/textctrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxTextCtrl)
+wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
+wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
+
+wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group") )
+wxPROPERTY( Value, wxString, SetValue, GetValue, wxString(), \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+
+wxPROPERTY_FLAGS( WindowStyle, wxTextCtrlStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxTextCtrl)
+
+wxCONSTRUCTOR_6( wxTextCtrl, wxWindow*, Parent, wxWindowID, Id, \
+                wxString, Value, wxPoint, Position, wxSize, Size, \
+                long, WindowStyle)
+
+

 IMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent)
 
 wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent );
 IMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent)
 
 wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent );


@@ -67,8 +143,8 @@ wxTextAttr::wxTextAttr(const wxColour& colText,
 {
     Init();
 
 {
     Init();
 

-    if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR;
-    if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR;
+    if (m_colText.IsOk()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR;
+    if (m_colBack.IsOk()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR;

     if (alignment != wxTEXT_ALIGNMENT_DEFAULT)
         m_flags |= wxTEXT_ATTR_ALIGNMENT;
 
     if (alignment != wxTEXT_ALIGNMENT_DEFAULT)
         m_flags |= wxTEXT_ATTR_ALIGNMENT;
 


@@ -188,9 +264,11 @@ bool wxTextAttr::operator== (const wxTextAttr& attr) const
             GetURL() == attr.GetURL();
 }
 
             GetURL() == attr.GetURL();
 }
 

-// Partial equality test taking flags into account
-bool wxTextAttr::EqPartial(const wxTextAttr& attr, int flags) const
+// Partial equality test. Only returns false if an attribute doesn't match.
+bool wxTextAttr::EqPartial(const wxTextAttr& attr) const

 {
 {

+    int flags = attr.GetFlags();
+    

     if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && GetTextColour() != attr.GetTextColour())
         return false;
 
     if ((flags & wxTEXT_ATTR_TEXT_COLOUR) && GetTextColour() != attr.GetTextColour())
         return false;
 


@@ -333,7 +411,7 @@ wxFont wxTextAttr::GetFont() const
     if (HasFontEncoding())
         encoding = GetFontEncoding();
 
     if (HasFontEncoding())
         encoding = GetFontEncoding();
 

-    int fontFamily = wxFONTFAMILY_DEFAULT;
+    wxFontFamily fontFamily = wxFONTFAMILY_DEFAULT;

     if (HasFontFamily())
         fontFamily = GetFontFamily();
 
     if (HasFontFamily())
         fontFamily = GetFontFamily();
 


@@ -344,7 +422,7 @@ wxFont wxTextAttr::GetFont() const
 // Get attributes from font.
 bool wxTextAttr::GetFontAttributes(const wxFont& font, int flags)
 {
 // Get attributes from font.
 bool wxTextAttr::GetFontAttributes(const wxFont& font, int flags)
 {

-    if (!font.Ok())
+    if (!font.IsOk())

         return false;
 
     if (flags & wxTEXT_ATTR_FONT_SIZE)
         return false;
 
     if (flags & wxTEXT_ATTR_FONT_SIZE)


@@ -366,7 +444,16 @@ bool wxTextAttr::GetFontAttributes(const wxFont& font, int flags)
         m_fontEncoding = font.GetEncoding();
 
     if (flags & wxTEXT_ATTR_FONT_FAMILY)
         m_fontEncoding = font.GetEncoding();
 
     if (flags & wxTEXT_ATTR_FONT_FAMILY)

-        m_fontFamily = font.GetFamily();
+    {
+        // wxFont might not know its family, avoid setting m_fontFamily to an
+        // invalid value and rather pretend that we don't have any font family
+        // information at all in this case
+        const wxFontFamily fontFamily = font.GetFamily();
+        if ( fontFamily == wxFONTFAMILY_UNKNOWN )
+            flags &= ~wxTEXT_ATTR_FONT_FAMILY;
+        else
+            m_fontFamily = fontFamily;
+    }

 
     m_flags |= flags;
 
 
     m_flags |= flags;
 


@@ -431,13 +518,13 @@ bool wxTextAttr::Apply(const wxTextAttr& style, const wxTextAttr* compareWith)
             destStyle.SetFontFamily(style.GetFontFamily());
     }
 
             destStyle.SetFontFamily(style.GetFontFamily());
     }
 

-    if (style.GetTextColour().Ok() && style.HasTextColour())
+    if (style.GetTextColour().IsOk() && style.HasTextColour())

     {
         if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour()))
             destStyle.SetTextColour(style.GetTextColour());
     }
 
     {
         if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour()))
             destStyle.SetTextColour(style.GetTextColour());
     }
 

-    if (style.GetBackgroundColour().Ok() && style.HasBackgroundColour())
+    if (style.GetBackgroundColour().IsOk() && style.HasBackgroundColour())

     {
         if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour()))
             destStyle.SetBackgroundColour(style.GetBackgroundColour());
     {
         if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour()))
             destStyle.SetBackgroundColour(style.GetBackgroundColour());


@@ -583,30 +670,30 @@ wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
     if (attr.HasFont())
         font = attr.GetFont();
 
     if (attr.HasFont())
         font = attr.GetFont();
 

-    if ( !font.Ok() )
+    if ( !font.IsOk() )

     {
         if (attrDef.HasFont())
             font = attrDef.GetFont();
 
     {
         if (attrDef.HasFont())
             font = attrDef.GetFont();
 

-        if ( text && !font.Ok() )
+        if ( text && !font.IsOk() )

             font = text->GetFont();
     }
 
     wxColour colFg = attr.GetTextColour();
             font = text->GetFont();
     }
 
     wxColour colFg = attr.GetTextColour();

-    if ( !colFg.Ok() )
+    if ( !colFg.IsOk() )

     {
         colFg = attrDef.GetTextColour();
 
     {
         colFg = attrDef.GetTextColour();
 

-        if ( text && !colFg.Ok() )
+        if ( text && !colFg.IsOk() )

             colFg = text->GetForegroundColour();
     }
 
     wxColour colBg = attr.GetBackgroundColour();
             colFg = text->GetForegroundColour();
     }
 
     wxColour colBg = attr.GetBackgroundColour();

-    if ( !colBg.Ok() )
+    if ( !colBg.IsOk() )

     {
         colBg = attrDef.GetBackgroundColour();
 
     {
         colBg = attrDef.GetBackgroundColour();
 

-        if ( text && !colBg.Ok() )
+        if ( text && !colBg.IsOk() )

             colBg = text->GetBackgroundColour();
     }
 
             colBg = text->GetBackgroundColour();
     }
 


@@ -736,7 +823,7 @@ bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
 // file IO functions
 // ----------------------------------------------------------------------------
 
 // file IO functions
 // ----------------------------------------------------------------------------
 

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

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


@@ -747,18 +834,34 @@ bool wxTextCtrlBase::DoLoadFile(const wxString& filename, int WXUNUSED(fileType)
         {
             SetValue(text);
 
         {
             SetValue(text);
 

-            DiscardEdits();
-
-            m_filename = filename;
-

             return true;
         }
     }
             return true;
         }
     }

+#endif // wxUSE_FFILE
+
+    return false;
+}

 
 

+bool wxTextCtrlBase::DoLoadFile(const wxString& filename, int fileType)
+{
+    if ( wxTextAreaBase::DoLoadFile(filename, fileType) )
+    {
+        DiscardEdits();
+        m_filename = filename;
+        return true;
+    }

     wxLogError(_("File couldn't be loaded."));
     wxLogError(_("File couldn't be loaded."));

-#endif // wxUSE_FFILE
+    return false;
+}

 
 

+bool wxTextAreaBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType))
+{
+#if wxUSE_FFILE
+    wxFFile file(filename, wxT("w"));
+    return file.IsOpened() && file.Write(GetValue(), *wxConvCurrent);
+#else

     return false;
     return false;

+#endif // wxUSE_FFILE

 }
 
 bool wxTextAreaBase::SaveFile(const wxString& filename, int fileType)
 }
 
 bool wxTextAreaBase::SaveFile(const wxString& filename, int fileType)


@@ -775,11 +878,9 @@ bool wxTextAreaBase::SaveFile(const wxString& filename, int fileType)
     return DoSaveFile(filenameToUse, fileType);
 }
 
     return DoSaveFile(filenameToUse, fileType);
 }
 

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

 {
 {

-#if wxUSE_FFILE
-    wxFFile file(filename, _T("w"));
-    if ( file.IsOpened() && file.Write(GetValue()) )
+    if ( wxTextAreaBase::DoSaveFile(filename, fileType) )

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


@@ -789,10 +890,6 @@ bool wxTextCtrlBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType)
 
         return true;
     }
 
         return true;
     }

-#endif // wxUSE_FFILE
-
-    wxLogError(_("The text couldn't be saved."));
-

     return false;
 }
 
     return false;
 }
 


@@ -859,32 +956,32 @@ 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 = (wxChar)(_T('0') + keycode - WXK_NUMPAD0);
+            ch = (wxChar)(wxT('0') + keycode - WXK_NUMPAD0);

             break;
 
         case WXK_MULTIPLY:
         case WXK_NUMPAD_MULTIPLY:
             break;
 
         case WXK_MULTIPLY:
         case WXK_NUMPAD_MULTIPLY:

-            ch = _T('*');
+            ch = wxT('*');

             break;
 
         case WXK_ADD:
         case WXK_NUMPAD_ADD:
             break;
 
         case WXK_ADD:
         case WXK_NUMPAD_ADD:

-            ch = _T('+');
+            ch = wxT('+');

             break;
 
         case WXK_SUBTRACT:
         case WXK_NUMPAD_SUBTRACT:
             break;
 
         case WXK_SUBTRACT:
         case WXK_NUMPAD_SUBTRACT:

-            ch = _T('-');
+            ch = wxT('-');

             break;
 
         case WXK_DECIMAL:
         case WXK_NUMPAD_DECIMAL:
             break;
 
         case WXK_DECIMAL:
         case WXK_NUMPAD_DECIMAL:

-            ch = _T('.');
+            ch = wxT('.');

             break;
 
         case WXK_DIVIDE:
         case WXK_NUMPAD_DIVIDE:
             break;
 
         case WXK_DIVIDE:
         case WXK_NUMPAD_DIVIDE:

-            ch = _T('/');
+            ch = wxT('/');

             break;
 
         case WXK_DELETE:
             break;
 
         case WXK_DELETE:


@@ -926,7 +1023,7 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
             }
             else
             {
             }
             else
             {

-                ch = _T('\0');
+                ch = wxT('\0');

             }
     }
 
             }
     }
 


@@ -987,23 +1084,17 @@ wxTextAreaBase::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(pos)) const
     return wxTE_HT_UNKNOWN;
 }
 
     return wxTE_HT_UNKNOWN;
 }
 

-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxTextCtrlBase::SendTextUpdatedEvent(wxWindow *win)
+wxPoint wxTextAreaBase::PositionToCoords(long pos) const

 {
 {

-    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, win->GetId());
+    wxCHECK_MSG( IsValidPosition(pos), wxDefaultPosition,
+                 wxS("Position argument out of range.") );

 
 

-    // 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());
+    return DoPositionToCoords(pos);
+}

 
 

-    event.SetEventObject(win);
-    return win->GetEventHandler()->ProcessEvent(event);
+wxPoint wxTextAreaBase::DoPositionToCoords(long WXUNUSED(pos)) const
+{
+    return wxDefaultPosition;

 }
 
 #else // !wxUSE_TEXTCTRL
 }
 
 #else // !wxUSE_TEXTCTRL