changed return type of RGBColor to const Reference (avoiding compiler warnings)

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

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 98155be3077018b602f1497bd040d0e5a2017009..05d53de239406810cea390beebbeb820d6c2676a 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -45,6 +45,7 @@
 #endif
 
 class WXDLLEXPORT wxTextCtrl;
+class WXDLLEXPORT wxTextCtrlBase;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -82,6 +83,12 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 // doesn't have focus - use this style to force it to always show it
 #define wxTE_NOHIDESEL      0x2000
 
+// use wxHSCROLL to not wrap text at all, wxTE_LINEWRAP to wrap it at any
+// position and wxTE_WORDWRAP to wrap at words boundary
+#define wxTE_DONTWRAP       wxHSCROLL
+#define wxTE_LINEWRAP       0x4000
+#define wxTE_WORDWRAP       0x0000  // it's just == !wxHSCROLL
+
 // ----------------------------------------------------------------------------
 // wxTextAttr: a structure containing the visual attributes of a text
 // ----------------------------------------------------------------------------
@@ -117,6 +124,13 @@ public:
         return !HasTextColour() && !HasBackgroundColour() && !HasFont();
     }
 
+    // return the attribute having the valid font and colours: it uses the
+    // attributes set in attr and falls back first to attrDefault and then to
+    // the text control font/colours for those attributes which are not set
+    static wxTextAttr Combine(const wxTextAttr& attr,
+                              const wxTextAttr& attrDef,
+                              const wxTextCtrlBase *text);
+
 private:
     wxColour m_colText,
              m_colBack;
@@ -157,7 +171,7 @@ public:
     // If the return values from and to are the same, there is no selection.
     virtual void GetSelection(long* from, long* to) const = 0;
 
-    virtual wxString GetSelection() const;
+    virtual wxString GetStringSelection() const;
 
     // operations
     // ----------