warning for 2.5.3

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

diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 37348e0cdd0929306b86763b7c258d47e8039f8c..1b8f0143a2520066a141c8afd077061372f97282 100644 (file)
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.h
+// Name:        wx/x11/textctrl.h

 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97


@@ -11,12 +11,20 @@
 #ifndef __X11TEXTCTRLH__
 #define __X11TEXTCTRLH__
 
 #ifndef __X11TEXTCTRLH__
 #define __X11TEXTCTRLH__
 

-#ifdef __GNUG__
+// 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"
 
 //-----------------------------------------------------------------------------


@@ -43,9 +51,9 @@ class wxSourceUndoStep: public wxObject
 {
 public:
     wxSourceUndoStep( wxSourceUndo type, int y1, int y2, wxTextCtrl *owner );
 {
 public:
     wxSourceUndoStep( wxSourceUndo type, int y1, int y2, wxTextCtrl *owner );

-    
+

     void Undo();
     void Undo();

-    
+

     wxSourceUndo    m_type;
     int             m_y1;
     int             m_y2;
     wxSourceUndo    m_type;
     int             m_y1;
     int             m_y2;


@@ -63,7 +71,7 @@ public:
     {
         m_text = text;
     }
     {
         m_text = text;
     }

-    
+

     wxString       m_text;
 };
 
     wxString       m_text;
 };
 


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


@@ -102,12 +111,12 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString &name = wxTextCtrlNameStr);
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString &name = wxTextCtrlNameStr);

-               
+

     // required for scrolling with wxScrollHelper
     // ------------------------------------------
 
     virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
     // required for scrolling with wxScrollHelper
     // ------------------------------------------
 
     virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }

-    
+

     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 


@@ -123,11 +132,11 @@ public:
 
     // 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 FALSE; }
     bool IsSingleLine() const { return !(GetWindowStyle() & wxTE_MULTILINE); }
     bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; }
     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;
 


@@ -182,7 +191,7 @@ public:
     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 );
+    virtual bool Enable( bool enable = TRUE );

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


@@ -210,36 +219,36 @@ public:
     virtual bool ScrollPages(int pages);
 
     // not part of the wxTextCtrl API from now on..
     virtual bool ScrollPages(int pages);
 
     // not part of the wxTextCtrl API from now on..

-    
+

     void SetLanguage( wxSourceLanguage lang = wxSOURCE_LANG_NONE );
 
     void Delete();
     void DeleteLine();
     void SetLanguage( wxSourceLanguage lang = wxSOURCE_LANG_NONE );
 
     void Delete();
     void DeleteLine();

-    
+

     void Indent();
     void Unindent();
     void Indent();
     void Unindent();

-    
+

     bool HasSelection();
     void ClearSelection();
     bool HasSelection();
     void ClearSelection();

-    
+

     int GetCursorX()                        { return m_cursorX; }
     int GetCursorY()                        { return m_cursorY; }
     bool IsModified()                       { return m_modified; }
     bool OverwriteMode()                    { return m_overwrite; }
 
     // implementation from now on...
     int GetCursorX()                        { return m_cursorX; }
     int GetCursorY()                        { return m_cursorY; }
     bool IsModified()                       { return m_modified; }
     bool OverwriteMode()                    { return m_overwrite; }
 
     // implementation from now on...

-    
+

     int PosToPixel( int line, int pos );
     int PixelToPos( int line, int pixel );
 
     void SearchForBrackets();
     int PosToPixel( int line, int pos );
     int PixelToPos( int line, int pixel );
 
     void SearchForBrackets();

-    
+

     void DoChar( char c );
     void DoBack();
     void DoDelete();
     void DoReturn();
     void DoDClick();
     void DoChar( char c );
     void DoBack();
     void DoDelete();
     void DoReturn();
     void DoDClick();

-    
+

     wxString GetNextToken( wxString &line, size_t &pos );
 
     void DrawLinePart( wxDC &dc, int x, int y, const wxString &toDraw, const wxString &origin, const wxColour &colour);
     wxString GetNextToken( wxString &line, size_t &pos );
 
     void DrawLinePart( wxDC &dc, int x, int y, const wxString &toDraw, const wxString &origin, const wxColour &colour);


@@ -248,15 +257,15 @@ public:
     void OnEraseBackground( wxEraseEvent &event );
     void OnMouse( wxMouseEvent &event );
     void OnChar( wxKeyEvent &event );
     void OnEraseBackground( wxEraseEvent &event );
     void OnMouse( wxMouseEvent &event );
     void OnChar( wxKeyEvent &event );

-    void OnIdle( wxIdleEvent &event );

     void OnSetFocus( wxFocusEvent& event );
     void OnKillFocus( wxFocusEvent& event );
     void OnSetFocus( wxFocusEvent& event );
     void OnKillFocus( wxFocusEvent& event );

-    
+
+    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 MyAdjustScrollbars();
     void RefreshLine( int n );
     void RefreshDown( int n );
     void MoveCursor( int new_x, int new_y, bool shift = FALSE, bool centre = FALSE );
     void MyAdjustScrollbars();

-    
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -271,38 +280,38 @@ protected:
     wxColour           m_sourceColour;
     wxColour           m_commentColour;
     wxColour           m_stringColour;
     wxColour           m_sourceColour;
     wxColour           m_commentColour;
     wxColour           m_stringColour;

-    
+

     int                m_cursorX;
     int                m_cursorY;
     int                m_cursorX;
     int                m_cursorY;

-    
+

     int                m_selStartX,m_selStartY;
     int                m_selEndX,m_selEndY;
     int                m_selStartX,m_selStartY;
     int                m_selEndX,m_selEndY;

-    
+

     int                m_lineHeight;
     int                m_charWidth;
     int                m_lineHeight;
     int                m_charWidth;

-    
+

     int                m_longestLine;
     int                m_longestLine;

-    
+

     bool               m_overwrite;
     bool               m_modified;
     bool               m_editable;
     bool               m_ignoreInput;
     bool               m_overwrite;
     bool               m_modified;
     bool               m_editable;
     bool               m_ignoreInput;

-    
+

     wxArrayString      m_keywords;
     wxColour           m_keywordColour;
     wxArrayString      m_keywords;
     wxColour           m_keywordColour;

-    
+

     wxArrayString      m_defines;
     wxColour           m_defineColour;
     wxArrayString      m_defines;
     wxColour           m_defineColour;

-    
+

     wxArrayString      m_variables;
     wxColour           m_variableColour;
     wxArrayString      m_variables;
     wxColour           m_variableColour;

-    
+

     wxSourceLanguage   m_lang;
     wxSourceLanguage   m_lang;

-    
+

     wxList             m_undos;
     wxList             m_undos;

-    
+

     bool               m_capturing;
     bool               m_capturing;

-    
+

     int                m_bracketX;
     int                m_bracketY;
 
     int                m_bracketX;
     int                m_bracketY;
 


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

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