Added NormalizeFontSizes which will set the html font sizes based on

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

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 43e6d1a53bbe056cd0ba52dd8cf3ea13e5b14aa8..e756e912e385126a846035026ea4e12cb57b4144 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UNIV_TEXTCTRL_H_
 #define _WX_UNIV_TEXTCTRL_H_
 
 #ifndef _WX_UNIV_TEXTCTRL_H_
 #define _WX_UNIV_TEXTCTRL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univtextctrl.h"
 #endif
 
     #pragma interface "univtextctrl.h"
 #endif
 


@@ -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


@@ -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


@@ -265,7 +234,6 @@ public:
     virtual bool Enable(bool enable = TRUE);
 
     // more readable flag testing methods
     virtual bool Enable(bool enable = TRUE);
 
     // 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); }


@@ -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