pen.h depends from brush.h in compat mode

[wxWidgets.git] / include / wx / textctrl.h

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index f0e93fc0dba916ab096f8be59a211284672446b3..23f9a465493cd8963724a1f077b67bbab5f74c6a 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -25,13 +25,11 @@
 #include "wx/dynarray.h"        // wxArrayInt
 #include "wx/gdicmn.h"          // wxPoint
 
-// Open Watcom 1.3 does allow only ios::rdbuf() while
-// we want something with streambuf parameter
-// Also, can't use streambuf if making or using a DLL :-(
-
+// some compilers don't have standard compliant rdbuf() (and MSVC has it only
+// in its new iostream library, not in the old one used with iostream.h)
 #if defined(__WATCOMC__) || \
     defined(__MWERKS__) || \
-    (defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL)))
+    ((defined(__VISUALC5__) || defined(__VISUALC6__)) && wxUSE_IOSTREAMH)
     #define wxHAS_TEXT_WINDOW_STREAM 0
 #elif wxUSE_STD_IOSTREAM
     #include "wx/ioswrap.h"
@@ -280,9 +278,6 @@ public:
     // Partial equality test taking flags into account
     bool EqPartial(const wxTextAttr& attr, int flags) const;
 
-    // Create font from font attributes.
-    wxFont CreateFont() const;
-
     // Get attributes from font.
     bool GetFontAttributes(const wxFont& font, int flags = wxTEXT_ATTR_FONT);
 
@@ -339,7 +334,7 @@ public:
     const wxString& GetFontFaceName() const { return m_fontFaceName; }
     wxFontEncoding GetFontEncoding() const { return m_fontEncoding; }
 
-    wxFont GetFont() const { return CreateFont(); }
+    wxFont GetFont() const;
 
     const wxString& GetCharacterStyleName() const { return m_characterStyleName; }
     const wxString& GetParagraphStyleName() const { return m_paragraphStyleName; }
@@ -697,6 +692,8 @@ protected:
     #include "wx/cocoa/textctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/textctrl.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/textctrl.h"
 #endif
 
 // ----------------------------------------------------------------------------