added operator[] for STL builds

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

diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 0f1706da59df35ce10474c9868b045e58a29f77b..197acb64b560372dc9cfdafe2f246d9a27766f06 100644 (file)
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -19,19 +19,15 @@
 #include "wx/univ/textctrl.h"
 #else
 
 #include "wx/univ/textctrl.h"
 #else
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "textctrl.h"
-#endif
-

 #include "wx/scrolwin.h"
 #include "wx/scrolwin.h"

-#include "wx/dynarray.h"
+#include "wx/arrstr.h"

 #include "wx/datetime.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 #include "wx/datetime.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxTextCtrl;
+class WXDLLIMPEXP_CORE wxTextCtrl;

 
 //-----------------------------------------------------------------------------
 // helpers
 
 //-----------------------------------------------------------------------------
 // helpers


@@ -89,7 +85,7 @@ enum wxSourceLanguage
 // wxTextCtrl
 //-----------------------------------------------------------------------------
 
 // wxTextCtrl
 //-----------------------------------------------------------------------------
 

-class wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper
+class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper

 {
 public:
     wxTextCtrl() { Init(); }
 {
 public:
     wxTextCtrl() { Init(); }


@@ -101,6 +97,7 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString &name = wxTextCtrlNameStr);

+    virtual ~wxTextCtrl();

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -132,9 +129,12 @@ public:
     // more readable flag testing methods
     // ----------------------------------
 
     // more readable flag testing methods
     // ----------------------------------
 

+#if 0
+    // it seems now in wxTextCtrlBase

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

+#endif

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

-    bool WrapLines() const { return FALSE; }
+    bool WrapLines() const { return false; }

 
     // If the return values from and to are the same, there is no selection.
     virtual void GetSelection(long* from, long* to) const;
 
     // If the return values from and to are the same, there is no selection.
     virtual void GetSelection(long* from, long* to) const;


@@ -179,18 +179,18 @@ public:
     virtual void Redo() {}
 
     virtual bool CanUndo() const    { return (m_undos.GetCount() > 0); }
     virtual void Redo() {}
 
     virtual bool CanUndo() const    { return (m_undos.GetCount() > 0); }

-    virtual bool CanRedo() const    { return FALSE; }
+    virtual bool CanRedo() const    { return false; }

 
     // Insertion point
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
 
     // Insertion point
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;

-    virtual long GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const;

 
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 
 
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 

-    virtual bool Enable( bool enable = TRUE );
+    virtual bool Enable( bool enable = true );

 
     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);
 
     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);


@@ -208,7 +208,7 @@ public:
     bool SetForegroundColour(const wxColour& colour);
     bool SetBackgroundColour(const wxColour& colour);
 
     bool SetForegroundColour(const wxColour& colour);
     bool SetBackgroundColour(const wxColour& colour);
 

-    void SetModified() { m_modified = TRUE; }
+    void SetModified() { m_modified = true; }

 
     virtual void Freeze();
     virtual void Thaw();
 
     virtual void Freeze();
     virtual void Thaw();


@@ -262,7 +262,7 @@ public:
     void OnInternalIdle();
     void RefreshLine( int n );
     void RefreshDown( int n );
     void OnInternalIdle();
     void RefreshLine( int n );
     void RefreshDown( int n );

-    void MoveCursor( int new_x, int new_y, bool shift = FALSE, bool centre = FALSE );
+    void MoveCursor( int new_x, int new_y, bool shift = false, bool centre = false );

     void MyAdjustScrollbars();
 
 protected:
     void MyAdjustScrollbars();
 
 protected:


@@ -366,13 +366,6 @@ private:
 // wxTextCtrl types
 // ----------------------------------------------------------------------------
 
 // 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;
-

 class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler
 {
 public:
 class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler
 {
 public:


@@ -380,10 +373,10 @@ public:
 
     virtual bool HandleKey(wxInputConsumer *consumer,
                            const wxKeyEvent& event,
 
     virtual bool HandleKey(wxInputConsumer *consumer,
                            const wxKeyEvent& event,

-                           bool pressed) { return FALSE; }
-    virtual bool HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event) { return FALSE; }
-    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) { return FALSE; }
-    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) { return FALSE; }
+                           bool pressed) { return false; }
+    virtual bool HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event) { return false; }
+    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) { return false; }
+    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) { return false; }

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