X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..30e13695172732216d90b578db80f3c07e6b9544:/include/wx/univ/textctrl.h?ds=sidebyside diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h index 444962d382..1c513e8b40 100644 --- a/include/wx/univ/textctrl.h +++ b/include/wx/univ/textctrl.h @@ -12,10 +12,6 @@ #ifndef _WX_UNIV_TEXTCTRL_H_ #define _WX_UNIV_TEXTCTRL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univtextctrl.h" -#endif - class WXDLLEXPORT wxCaret; class WXDLLEXPORT wxTextCtrlCommandProcessor; @@ -66,31 +62,6 @@ class WXDLLEXPORT wxTextCtrlCommandProcessor; #define wxACTION_TEXT_UNDO _T("undo") #define wxACTION_TEXT_REDO _T("redo") -// ---------------------------------------------------------------------------- -// wxTextCtrl types -// ---------------------------------------------------------------------------- - -// wxTextPos is the position in the text -typedef long wxTextPos; - -// wxTextCoord is the line or row number (which should have been unsigned but -// is long for backwards compatibility) -typedef long wxTextCoord; - -// ---------------------------------------------------------------------------- -// wxTextCtrl::HitTest return values -// ---------------------------------------------------------------------------- - -// the point asked is ... -enum wxTextCtrlHitTestResult -{ - wxTE_HT_BEFORE = -1, // either to the left or upper - wxTE_HT_ON_TEXT, // directly on - wxTE_HT_BELOW, // below [the last line] - wxTE_HT_BEYOND // after [the end of line] -}; -// ... the character returned - // ---------------------------------------------------------------------------- // wxTextCtrl // ---------------------------------------------------------------------------- @@ -201,8 +172,8 @@ public: // ----------------------- // caret stuff - virtual void ShowCaret(bool show = TRUE); - void HideCaret() { ShowCaret(FALSE); } + virtual void ShowCaret(bool show = true); + void HideCaret() { ShowCaret(false); } void CreateCaret(); // for the current font size // helpers for cursor movement @@ -216,16 +187,10 @@ public: void RemoveSelection(); wxString GetSelectionText() const; - // find the character at this position, return 0 if the character is - // really there, -1 if the point is before the beginning of the text/line - // and the returned character is the first one to follow it or +1 if it the - // position is beyond the end of line/text and the returned character is - // the last one - // - // NB: pt is in device coords (not adjusted for the client area origin nor - // for the scrolling) - wxTextCtrlHitTestResult HitTest(const wxPoint& pt, - wxTextCoord *col, wxTextCoord *row) const; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const; + virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, + wxTextCoord *col, + wxTextCoord *row) const; // find the character at this position in the given line, return value as // for HitTest() @@ -262,7 +227,7 @@ public: // override these methods to handle the caret virtual bool SetFont(const wxFont &font); - virtual bool Enable(bool enable = TRUE); + virtual bool Enable(bool enable = true); // more readable flag testing methods bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; } @@ -326,7 +291,7 @@ protected: wxRect GetRealTextArea() const; // refresh the text in the given (in logical coords) rect - void RefreshTextRect(const wxRect& rect, bool textOnly = TRUE); + void RefreshTextRect(const wxRect& rect, bool textOnly = true); // refresh the line wrap marks for the given range of lines (inclusive) void RefreshLineWrapMarks(wxTextCoord rowFirst, wxTextCoord rowLast); @@ -361,7 +326,7 @@ protected: wxCoord *widthReal = NULL) const; // get the start and end of the selection for this line: if the line is - // outside the selection, both will be -1 and FALSE will be returned + // outside the selection, both will be -1 and false will be returned bool GetSelectedPartOfLine(wxTextCoord line, wxTextPos *start, wxTextPos *end) const; @@ -408,7 +373,7 @@ protected: wxTextCoord *colStart, wxTextCoord *colEnd, wxTextCoord *colRowStart, - bool devCoords = TRUE) const; + bool devCoords = true) const; // HitTest() version which takes the logical text coordinates and not the // device ones @@ -417,7 +382,7 @@ protected: wxTextCoord *row) const; // get the line and the row in this line corresponding to the given row, - // return TRUE if ok and FALSE if row is out of range + // return true if ok and false if row is out of range // // NB: this function can only be called for controls which wrap lines bool GetLineAndRow(wxTextCoord row, @@ -487,7 +452,7 @@ private: inline const wxArrayString& GetLines() const; inline size_t GetLineCount() const; - // replace a line (returns TRUE if the number of rows in thel ine changed) + // replace a line (returns true if the number of rows in thel ine changed) bool ReplaceLine(wxTextCoord line, const wxString& text); // remove a line @@ -550,6 +515,8 @@ private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxTextCtrl) + + friend class wxWrappedLineData; }; // ----------------------------------------------------------------------------