removed const operator[]s (should fix 1162115)

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

diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 2dd4196a92e6b2b45971b6432841b76b0a325e49..2e3b528c747b7881f5312a7f645e8c3f4727fb90 100644 (file)
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -11,12 +11,20 @@
 #ifndef __X11TEXTCTRLH__
 #define __X11TEXTCTRLH__
 
 #ifndef __X11TEXTCTRLH__
 #define __X11TEXTCTRLH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+// Set to 1 to use wxUniv's implementation, 0
+// to use wxX11's.
+#define wxUSE_UNIV_TEXTCTRL 1
+
+#if wxUSE_UNIV_TEXTCTRL
+#include "wx/univ/textctrl.h"
+#else
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "textctrl.h"
 #endif
 
 #include "wx/scrolwin.h"
     #pragma interface "textctrl.h"
 #endif
 
 #include "wx/scrolwin.h"

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

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


@@ -93,6 +101,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,


@@ -124,9 +133,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;


@@ -171,18 +183,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);


@@ -200,7 +212,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();


@@ -254,7 +266,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:


@@ -358,13 +370,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:


@@ -372,10 +377,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


@@ -385,5 +390,8 @@ protected:
     wxTextCtrl *m_winCapture;
 };
 
     wxTextCtrl *m_winCapture;
 };
 

-#endif // __GTKTEXTCTRLH__
+#endif
+// wxUSE_UNIV_TEXTCTRL
+
+#endif // __X11TEXTCTRLH__