Allow OS X Cocoa (or any OS X port) to override GetBestSize and provide a native...

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

diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index 5e3c487683acdc21e0fbabd4a846198bfe7f52c7..e00ff2433a7d3719ee04e685f31e921bfd39440c 100644 (file)
--- a/include/wx/os2/textctrl.h
+++ b/include/wx/os2/textctrl.h
@@ -14,7 +14,7 @@
 
 typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData);
 
 
 typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData);
 

-class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase

 {
 public:
     wxTextCtrl();
 {
 public:
     wxTextCtrl();


@@ -30,7 +30,7 @@ public:
     {
         Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
     }
     {
         Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
     }

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

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


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


@@ -72,7 +71,7 @@ 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 MarkDirty();
     virtual void DiscardEdits(void);


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


@@ -180,7 +179,16 @@ 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:
 private:

+    // implement wxTextEntry pure virtual: it implements all the operations for
+    // the simple EDIT controls
+    virtual WXHWND GetEditHWND() const { return m_hWnd; }
+

     bool                            m_bIsMLE;
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
     bool                            m_bIsMLE;
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)