X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4055ed8281971e3d35bf04177193c27043d42ed1..19c4d91638c2546630c4427e39c02f5380a8bb87:/include/wx/palmos/textctrl.h diff --git a/include/wx/palmos/textctrl.h b/include/wx/palmos/textctrl.h index e6f8f5ba1e..98d73a6be2 100644 --- a/include/wx/palmos/textctrl.h +++ b/include/wx/palmos/textctrl.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/palmos/textctrl.h // Purpose: wxTextCtrl class -// Author: William Osborne +// Author: William Osborne - minimal working wxPalmOS port // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,10 +12,6 @@ #ifndef _WX_TEXTCTRL_H_ #define _WX_TEXTCTRL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "textctrl.h" -#endif - class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase { public: @@ -35,7 +31,7 @@ public: Create(parent, id, value, pos, size, style, validator, name); } - ~wxTextCtrl(); + virtual ~wxTextCtrl(); bool Create(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, @@ -49,9 +45,6 @@ public: // ---------------------------------- virtual wxString GetValue() const; - virtual void SetValue(const wxString& value); - - virtual wxString GetRange(long from, long to) const; virtual int GetLineLength(long lineNo) const; virtual wxString GetLineText(long lineNo) const; @@ -70,8 +63,8 @@ public: virtual void Replace(long from, long to, const wxString& value); virtual void Remove(long from, long to); - // load the controls contents from the file - virtual bool LoadFile(const wxString& file); + // load the control's contents from the file + virtual bool DoLoadFile(const wxString& file, int fileType); // clears the dirty flag virtual void MarkDirty(); @@ -123,7 +116,7 @@ public: virtual void SetInsertionPoint(long pos); virtual void SetInsertionPointEnd(); virtual long GetInsertionPoint() const; - virtual long GetLastPosition() const; + virtual wxTextPos GetLastPosition() const; virtual void SetSelection(long from, long to); virtual void SetEditable(bool editable); @@ -136,12 +129,8 @@ public: // Implementation from now on // -------------------------- - virtual void SetWindowStyleFlag(long style); - virtual void Command(wxCommandEvent& event); virtual bool MSWCommand(WXUINT param, WXWORD id); - virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam); #if wxUSE_RICHEDIT virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); @@ -155,8 +144,6 @@ public: virtual bool SetForegroundColour(const wxColour& colour); #endif // wxUSE_RICHEDIT - virtual void AdoptAttributesFromHWND(); - virtual bool AcceptsFocus() const; // callbacks @@ -191,6 +178,9 @@ protected: // common part of all ctors void Init(); + virtual void DoSetValue(const wxString& value, int flags = 0); + + // intercept WM_GETDLGCODE virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);