Bo's patch for generic code, more sorting code, WIP

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

diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index 9eb7c150002991efd89f90ccb44616a0175c3003..c868ddc7ae41a05192bb09badb7283468a4aaf5d 100644 (file)
--- a/include/wx/os2/textctrl.h
+++ b/include/wx/os2/textctrl.h
@@ -12,6 +12,8 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 

+typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData);
+

 class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 {
 public:
 class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 {
 public:


@@ -22,15 +24,13 @@ public:
                ,const wxPoint&     rPos = wxDefaultPosition
                ,const wxSize&      rSize = wxDefaultSize
                ,long               lStyle = 0
                ,const wxPoint&     rPos = wxDefaultPosition
                ,const wxSize&      rSize = wxDefaultSize
                ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                ,const wxValidator& rValidator = wxDefaultValidator
                ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                ,const wxString&    rsName = wxTextCtrlNameStr
               )
     {
         Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
     }
                ,const wxString&    rsName = wxTextCtrlNameStr
               )
     {
         Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
     }

-    ~wxTextCtrl();
+    virtual ~wxTextCtrl();

 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId


@@ -38,9 +38,7 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxTextCtrlNameStr
                );
 
                 ,const wxString&    rsName = wxTextCtrlNameStr
                );
 


@@ -49,7 +47,6 @@ public:
     // ----------------------------------
     //
     virtual      wxString GetValue(void) const;
     // ----------------------------------
     //
     virtual      wxString GetValue(void) const;

-    virtual void SetValue(const wxString& rsValue);

 
     virtual int      GetLineLength(long nLineNo) const;
     virtual wxString GetLineText(long nLineNo) const;
 
     virtual int      GetLineLength(long nLineNo) const;
     virtual wxString GetLineText(long nLineNo) const;


@@ -74,8 +71,9 @@ public:
                         ,long lTo
                        );
 
                         ,long lTo
                        );
 

-    virtual bool LoadFile(const wxString& rsFile);
+    virtual bool DoLoadFile(const wxString& rsFile, int fileType);

 
 

+    virtual void MarkDirty();

     virtual void DiscardEdits(void);
 
     virtual void WriteText(const wxString& rsText);
     virtual void DiscardEdits(void);
 
     virtual void WriteText(const wxString& rsText);


@@ -113,7 +111,7 @@ public:
     virtual void SetInsertionPoint(long lPos);
     virtual void SetInsertionPointEnd(void);
     virtual long GetInsertionPoint(void) const;
     virtual void SetInsertionPoint(long lPos);
     virtual void SetInsertionPointEnd(void);
     virtual long GetInsertionPoint(void) const;

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

 
     virtual void SetSelection( long lFrom
                               ,long lTo
 
     virtual void SetSelection( long lFrom
                               ,long lTo


@@ -181,6 +179,11 @@ protected:
     virtual WXDWORD OS2GetStyle( long     lStyle
                                 ,WXDWORD* dwExstyle
                                ) const;
     virtual WXDWORD OS2GetStyle( long     lStyle
                                 ,WXDWORD* dwExstyle
                                ) const;

+
+    virtual void DoSetValue(const wxString &value, int flags = 0);
+
+    bool m_bSkipUpdate;
+

 private:
     bool                            m_bIsMLE;
     DECLARE_EVENT_TABLE()
 private:
     bool                            m_bIsMLE;
     DECLARE_EVENT_TABLE()