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 e6197dd8fd74afe182829cdb0c3f2e80334d9544..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();


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

-    virtual void SetValue(const wxString& value) { DoSetValue(value, SetValue_SendEvent); }
-
-    virtual void ChangeValue(const wxString &value) { DoSetValue(value); }

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


@@ -183,11 +180,15 @@ protected:
                                 ,WXDWORD* dwExstyle
                                ) const;
 
                                 ,WXDWORD* dwExstyle
                                ) const;
 

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

 
     bool m_bSkipUpdate;
 
 private:
 
     bool m_bSkipUpdate;
 
 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)