Correct compilation conditions for wxURL::SetProxy.

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

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 54f62629d7ac0cafc19db03e29a15b3c25ea2d7f..8c7a4c028075f91b2c1932c79e0881b9d1ef91d2 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -12,8 +12,8 @@
 #ifndef _WX_UNIV_TEXTCTRL_H_
 #define _WX_UNIV_TEXTCTRL_H_
 
 #ifndef _WX_UNIV_TEXTCTRL_H_
 #define _WX_UNIV_TEXTCTRL_H_
 

-#ifdef __GNUG__
-    #pragma interface "textctrl.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "univtextctrl.h"

 #endif
 
 class WXDLLEXPORT wxCaret;
 #endif
 
 class WXDLLEXPORT wxCaret;


@@ -66,31 +66,6 @@ class WXDLLEXPORT wxTextCtrlCommandProcessor;
 #define wxACTION_TEXT_UNDO          _T("undo")
 #define wxACTION_TEXT_REDO          _T("redo")
 
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTextCtrl
 // ----------------------------------------------------------------------------


@@ -152,7 +127,8 @@ public:
     virtual void Replace(wxTextPos from, wxTextPos to, const wxString& value);
     virtual void Remove(wxTextPos from, wxTextPos to);
 
     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
     virtual void DiscardEdits();
 
     // writing text inserts it at the current position, appending always


@@ -200,8 +176,8 @@ public:
     // -----------------------
 
     // caret stuff
     // -----------------------
 
     // 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
     void CreateCaret(); // for the current font size
 
     // helpers for cursor movement


@@ -215,16 +191,10 @@ public:
     void RemoveSelection();
     wxString GetSelectionText() const;
 
     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()
 
     // find the character at this position in the given line, return value as
     // for HitTest()


@@ -251,8 +221,7 @@ public:
     virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
     virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const;
 
     virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
     virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const;
 

-    // set the right colours and border
-    virtual bool IsContainerWindow() const { return TRUE; }
+    // ensure we have correct default border

     virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; }
 
     // perform an action
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; }
 
     // perform an action


@@ -262,10 +231,9 @@ public:
 
     // override these methods to handle the caret
     virtual bool SetFont(const wxFont &font);
 
     // 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
 
     // more readable flag testing methods

-    bool IsSingleLine() const { return !(GetWindowStyle() & wxTE_MULTILINE); }

     bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; }
     bool WrapLines() const
         { return !IsSingleLine() && !(GetWindowStyle() & wxHSCROLL); }
     bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; }
     bool WrapLines() const
         { return !IsSingleLine() && !(GetWindowStyle() & wxHSCROLL); }


@@ -327,7 +295,7 @@ protected:
     wxRect GetRealTextArea() const;
 
     // refresh the text in the given (in logical coords) rect
     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);
 
     // refresh the line wrap marks for the given range of lines (inclusive)
     void RefreshLineWrapMarks(wxTextCoord rowFirst, wxTextCoord rowLast);


@@ -362,7 +330,7 @@ protected:
                                 wxCoord *widthReal = NULL) const;
 
     // get the start and end of the selection for this line: if the line is
                                 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;
 
     bool GetSelectedPartOfLine(wxTextCoord line,
                                wxTextPos *start, wxTextPos *end) const;
 


@@ -409,7 +377,7 @@ protected:
                                      wxTextCoord *colStart,
                                      wxTextCoord *colEnd,
                                      wxTextCoord *colRowStart,
                                      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
 
     // HitTest() version which takes the logical text coordinates and not the
     // device ones


@@ -418,7 +386,7 @@ protected:
                                            wxTextCoord *row) const;
 
     // get the line and the row in this line corresponding to the given row,
                                            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,
     //
     // NB: this function can only be called for controls which wrap lines
     bool GetLineAndRow(wxTextCoord row,


@@ -456,7 +424,6 @@ protected:
 
     // event handlers
     // --------------
 
     // event handlers
     // --------------

-    void OnIdle(wxIdleEvent& event);

     void OnChar(wxKeyEvent& event);
     void OnSize(wxSizeEvent& event);
 
     void OnChar(wxKeyEvent& event);
     void OnSize(wxSizeEvent& event);
 


@@ -477,6 +444,8 @@ protected:
     bool DoCut();
     bool DoPaste();
 
     bool DoCut();
     bool DoPaste();
 

+    // idle processing
+    virtual void OnInternalIdle();

 private:
     // all these methods are for multiline text controls only
 
 private:
     // all these methods are for multiline text controls only
 


@@ -487,7 +456,7 @@ private:
     inline const wxArrayString& GetLines() const;
     inline size_t GetLineCount() const;
 
     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
     bool ReplaceLine(wxTextCoord line, const wxString& text);
 
     // remove a line


@@ -550,6 +519,8 @@ private:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)

+
+    friend class wxWrappedLineData;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -562,14 +533,14 @@ class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler
 public:
     wxStdTextCtrlInputHandler(wxInputHandler *inphand);
 
 public:
     wxStdTextCtrlInputHandler(wxInputHandler *inphand);
 

-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,

                            const wxKeyEvent& event,
                            bool pressed);
                            const wxKeyEvent& event,
                            bool pressed);

-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,

                              const wxMouseEvent& event);
                              const wxMouseEvent& event);

-    virtual bool HandleMouseMove(wxControl *control,
+    virtual bool HandleMouseMove(wxInputConsumer *consumer,

                                  const wxMouseEvent& event);
                                  const wxMouseEvent& event);

-    virtual bool HandleFocus(wxControl *control, const wxFocusEvent& event);
+    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);

 
 protected:
     // get the position of the mouse click
 
 protected:
     // get the position of the mouse click