projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #859996: "Wrong path in BuildCVS.txt". As well as a couple of other minor...
[wxWidgets.git]
/
include
/
wx
/
textctrl.h
diff --git
a/include/wx/textctrl.h
b/include/wx/textctrl.h
index 60107fca4fcfc5f3d4f049bb845d61ac579cb818..fa7d7814fe27d805186a9c9a990566685cc9a951 100644
(file)
--- a/
include/wx/textctrl.h
+++ b/
include/wx/textctrl.h
@@
-262,7
+262,8
@@
public:
virtual bool LoadFile(const wxString& file);
virtual bool SaveFile(const wxString& file = wxEmptyString);
virtual bool LoadFile(const wxString& file);
virtual bool SaveFile(const wxString& file = wxEmptyString);
- // clears the dirty flag
+ // sets/clears the dirty flag
+ virtual void MarkDirty() = 0;
virtual void DiscardEdits() = 0;
// set the max number of characters which may be entered in a single line
virtual void DiscardEdits() = 0;
// set the max number of characters which may be entered in a single line
@@
-335,7
+336,9
@@
public:
wxTextCtrl& operator<<(const wxChar c);
// do the window-specific processing after processing the update event
wxTextCtrl& operator<<(const wxChar c);
// do the window-specific processing after processing the update event
- virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ;
+ virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
+
+ virtual bool ShouldInheritColours() const { return false; }
protected:
// the name of the last file loaded with LoadFile() which will be used by
protected:
// the name of the last file loaded with LoadFile() which will be used by
@@
-435,14
+438,26
@@
typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&);
class WXDLLEXPORT wxStreamToTextRedirector
{
class WXDLLEXPORT wxStreamToTextRedirector
{
-public:
- wxStreamToTextRedirector(wxTextCtrl *text, wxSTD ostream *ostr = NULL)
- : m_ostr(ostr ? *ostr : wxSTD cout)
+private:
+ void Init(wxTextCtrl *text)
{
m_sbufOld = m_ostr.rdbuf();
m_ostr.rdbuf(text);
}
{
m_sbufOld = m_ostr.rdbuf();
m_ostr.rdbuf(text);
}
+public:
+ wxStreamToTextRedirector(wxTextCtrl *text)
+ : m_ostr(wxSTD cout)
+ {
+ Init(text);
+ }
+
+ wxStreamToTextRedirector(wxTextCtrl *text, wxSTD ostream *ostr)
+ : m_ostr(*ostr)
+ {
+ Init(text);
+ }
+
~wxStreamToTextRedirector()
{
m_ostr.rdbuf(m_sbufOld);
~wxStreamToTextRedirector()
{
m_ostr.rdbuf(m_sbufOld);