Several wxBitmapDataCell changes.

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

diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index 5e3c487683acdc21e0fbabd4a846198bfe7f52c7..81085c80a3d77daae641020cedb98cef15f4d4c6 100644 (file)
--- a/include/wx/os2/textctrl.h
+++ b/include/wx/os2/textctrl.h
@@ -30,7 +30,7 @@ public:
     {
         Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
     }
-    ~wxTextCtrl();
+    virtual ~wxTextCtrl();
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
@@ -72,7 +72,7 @@ public:
                         ,long lTo
                        );
 
-    virtual bool LoadFile(const wxString& rsFile);
+    virtual bool DoLoadFile(const wxString& rsFile, int fileType);
 
     virtual void MarkDirty();
     virtual void DiscardEdits(void);
@@ -112,7 +112,7 @@ public:
     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