various changes to get up to date with CVS

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-09-25 20:22:58 +00:00
parent f87d0500fa
commit f5263701c2
23 changed files with 1547 additions and 58 deletions

View File

@@ -110,7 +110,9 @@ enum wxTextCtrlHitTestResult
enum {
wxOutOfRangeTextCoord,
wxInvalidTextCoord
wxInvalidTextCoord,
wxTEXT_TYPE_ANY
};
//---------------------------------------------------------------------------
@@ -253,8 +255,8 @@ public:
virtual void Remove(long from, long to);
// load/save the controls contents from/to the file
virtual bool LoadFile(const wxString& file);
virtual bool SaveFile(const wxString& file = wxPyEmptyString);
virtual bool LoadFile(const wxString& file, int fileType = wxTEXT_TYPE_ANY);
virtual bool SaveFile(const wxString& file = wxPyEmptyString, int fileType = wxTEXT_TYPE_ANY);
// sets/clears the dirty flag
virtual void MarkDirty();