added wxTextCtrl::MarkDirty()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 2e22f469821a3355b6f10119555e5e80691f5a8b..f44fd0cefb8eef57fb2bc97757e8a985648bcf20 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -53,6 +53,7 @@ All (GUI):
 
 - added some support for C++ exceptions in the library (do read the manual!)
 - added wxListCtrl::GetViewRect()
+- added wxTextCtrl::MarkDirty()
 
 wxMSW:
 

diff --git a/include/wx/cocoa/textctrl.h b/include/wx/cocoa/textctrl.h
index 5205ed9f6475b74a71cd50642c2d7ab23263cec3..322fb99b48dd3d892e19b962447f36d207e4f228 100644 (file)
--- a/include/wx/cocoa/textctrl.h
+++ b/include/wx/cocoa/textctrl.h
@@ -76,6 +76,7 @@ public:
     virtual void Remove(long from, long to);
 
     // clears the dirty flag
+    virtual void MarkDirty();
     virtual void DiscardEdits();
 
     // writing text inserts it at the current position, appending always

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index a8730f89fd34f39be2a19b28ca28d504fb5cbc10..88ebbb41afc7271ca604ad3a3c97173795b377c0 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -65,7 +65,8 @@ public:
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
 
-    // clears the dirty flag
+    // sets/clears the dirty flag
+    virtual void MarkDirty();
     virtual void DiscardEdits();
 
     virtual void SetMaxLength(unsigned long len);

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index a8730f89fd34f39be2a19b28ca28d504fb5cbc10..88ebbb41afc7271ca604ad3a3c97173795b377c0 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -65,7 +65,8 @@ public:
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
 
-    // clears the dirty flag
+    // sets/clears the dirty flag
+    virtual void MarkDirty();
     virtual void DiscardEdits();
 
     virtual void SetMaxLength(unsigned long len);

diff --git a/include/wx/mac/textctrl.h b/include/wx/mac/textctrl.h
index 03c218b04c81d3192e1f85bb1aabfa37ef2caf84..df3a9643392218ae470b4f7c3aeaecc5873ee579 100644 (file)
--- a/include/wx/mac/textctrl.h
+++ b/include/wx/mac/textctrl.h
@@ -76,7 +76,8 @@ public:
   // load the controls contents from the file
   virtual bool LoadFile(const wxString& file);
 
-  // clears the dirty flag
+  // sets/clears the dirty flag
+  virtual void MarkDirty();
   virtual void DiscardEdits();
 
   // set the max number of characters which may be entered in a single line

diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index 201d5e7e26394a3180c0294385abb718bdafe94c..c8037713c796a30b313e8f886cbe6fc840a1a5d3 100644 (file)
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -86,6 +86,7 @@ public:
     
     virtual void WriteText(const wxString& text);
     virtual void AppendText(const wxString& text);
+    virtual void MarkDirty();
     virtual void DiscardEdits();
     virtual bool IsModified() const;
     

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 2c66ed228e1ef75a2eb4aabe74ca4bd73a7fa354..dfc07966c59d079eceee34bfd1ec13d9ecf6d5b9 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -74,6 +74,7 @@ public:
     virtual bool LoadFile(const wxString& file);
 
     // clears the dirty flag
+    virtual void MarkDirty();
     virtual void DiscardEdits();
 
     virtual void SetMaxLength(unsigned long len);

diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index 836bd5f4381321559ae17183953dc239aba1c665..5e3c487683acdc21e0fbabd4a846198bfe7f52c7 100644 (file)
--- a/include/wx/os2/textctrl.h
+++ b/include/wx/os2/textctrl.h
@@ -74,6 +74,7 @@ public:
 
     virtual bool LoadFile(const wxString& rsFile);
 
+    virtual void MarkDirty();
     virtual void DiscardEdits(void);
 
     virtual void WriteText(const wxString& rsText);

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index eb69adfdc449fab840a318174718b02abae8e861..df004c947926367bda396d098575571928bc3bf2 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);
 
-    // 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

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 85b1717f61076619fa3940c10138623accdc8fd5..adcbc90209a38cddc3c564f1da8de454a38e1a95 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -152,7 +152,8 @@ public:
     virtual void Replace(wxTextPos from, wxTextPos to, const wxString& value);
     virtual void Remove(wxTextPos from, wxTextPos to);
 
-    // clears the dirty flag
+    // sets/clears the dirty flag
+    virtual void MarkDirty();
     virtual void DiscardEdits();
 
     // writing text inserts it at the current position, appending always

diff --git a/src/cocoa/textctrl.mm b/src/cocoa/textctrl.mm
index 1036882df4b71129e2d3bda6c1cd53097864c8a4..1d858a32b0648a47e5ffbad0ee7a1c113d9d1d10 100644 (file)
--- a/src/cocoa/textctrl.mm
+++ b/src/cocoa/textctrl.mm
@@ -72,6 +72,10 @@ void wxTextCtrl::SetEditable(bool)
 {
 }
 
+void wxTextCtrl::MarkDirty()
+{
+}
+
 void wxTextCtrl::DiscardEdits()
 {
 }

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index fda2c96595ed9749e694f2f02ab53f25d823ae0d..119b1bf57d519524b4f05eb9de565405181192fa 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -905,6 +905,11 @@ void wxTextCtrl::OnParentEnable( bool enable )
     }
 }
 
+void wxTextCtrl::MarkDirty()
+{
+    m_modified = TRUE;
+}
+
 void wxTextCtrl::DiscardEdits()
 {
     m_modified = FALSE;

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index fda2c96595ed9749e694f2f02ab53f25d823ae0d..119b1bf57d519524b4f05eb9de565405181192fa 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -905,6 +905,11 @@ void wxTextCtrl::OnParentEnable( bool enable )
     }
 }
 
+void wxTextCtrl::MarkDirty()
+{
+    m_modified = TRUE;
+}
+
 void wxTextCtrl::DiscardEdits()
 {
     m_modified = FALSE;

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 8e397f8618250dc9fbb0209e84ab4d5b75ceea44..97588b198bd278b53e401f175020ea5ce605bbfe 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1433,7 +1433,12 @@ bool wxTextCtrl::CanRedo() const
     return FALSE ;
 }
 
-// Makes 'unmodified'
+// Makes modifie or unmodified
+void wxTextCtrl::MarkDirty()
+{
+    m_dirty = true;
+}
+
 void wxTextCtrl::DiscardEdits()
 {
     m_dirty = false;

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 8e397f8618250dc9fbb0209e84ab4d5b75ceea44..97588b198bd278b53e401f175020ea5ce605bbfe 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -1433,7 +1433,12 @@ bool wxTextCtrl::CanRedo() const
     return FALSE ;
 }
 
-// Makes 'unmodified'
+// Makes modifie or unmodified
+void wxTextCtrl::MarkDirty()
+{
+    m_dirty = true;
+}
+
 void wxTextCtrl::DiscardEdits()
 {
     m_dirty = false;

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 0177cb2b2ff055fdf86ed3a57f37f2d41dca55fa..97b5521972cf33765fde71b3e0b1dc9f58d25012 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -420,7 +420,12 @@ bool wxTextCtrl::IsModified() const
     return m_modified;
 }
 
-// Makes 'unmodified'
+// Makes modified or unmodified
+void wxTextCtrl::MarkDirty()
+{
+    m_modified = FALSE;
+}
+
 void wxTextCtrl::DiscardEdits()
 {
     m_modified = FALSE;

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 9730fe999206679d1c29958eea687c2c0f31f826..559508e9d49dd8c33f6395e3e5dc3dfd6ba86710 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -1261,7 +1261,11 @@ bool wxTextCtrl::IsModified() const
     return SendMessage(GetHwnd(), EM_GETMODIFY, 0, 0) != 0;
 }
 
-// Makes 'unmodified'
+void wxTextCtrl::MarkDirty()
+{
+    SendMessage(GetHwnd(), EM_SETMODIFY, TRUE, 0L);
+}
+
 void wxTextCtrl::DiscardEdits()
 {
     SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);

diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp
index 679d0fa248cd56ac7bb8bb1da1306173bd09a3ea..9efd84b6e8c1700531e3699a010f5aa4261faf74 100644 (file)
--- a/src/os2/textctrl.cpp
+++ b/src/os2/textctrl.cpp
@@ -710,6 +710,11 @@ bool wxTextCtrl::IsModified() const
     return bRc;
 } // end of wxTextCtrl::IsModified
 
+void wxTextCtrl::MarkDirty()
+{
+    wxFAIL_MSG( _T("not implemented") );
+}
+
 //
 // Makes 'unmodified'
 //

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 911934d6a153120610966c09995ba1790ef2a0a7..1538bcefd067d11f4b8217cba74753f77b4f1f89 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -1585,6 +1585,11 @@ bool wxTextCtrl::IsEditable() const
     return m_isEditable && IsEnabled();
 }
 
+void wxTextCtrl::MarkDirty()
+{
+    m_isModified = TRUE;
+}
+
 void wxTextCtrl::DiscardEdits()
 {
     m_isModified = FALSE;