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 d7ed630390f5a8089354440bd041bbca78c4102d..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
 // ----------------------------------------------------------------------------


@@ -141,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;
 


@@ -420,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)


@@ -516,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());


@@ -668,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();
     }
 


@@ -1082,6 +1084,19 @@ wxTextAreaBase::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(pos)) const
     return wxTE_HT_UNKNOWN;
 }
 
     return wxTE_HT_UNKNOWN;
 }
 

+wxPoint wxTextAreaBase::PositionToCoords(long pos) const
+{
+    wxCHECK_MSG( IsValidPosition(pos), wxDefaultPosition,
+                 wxS("Position argument out of range.") );
+
+    return DoPositionToCoords(pos);
+}
+
+wxPoint wxTextAreaBase::DoPositionToCoords(long WXUNUSED(pos)) const
+{
+    return wxDefaultPosition;
+}
+

 #else // !wxUSE_TEXTCTRL
 
 // define this one even if !wxUSE_TEXTCTRL because it is also used by other
 #else // !wxUSE_TEXTCTRL
 
 // define this one even if !wxUSE_TEXTCTRL because it is also used by other