projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
console builds need another header from xcode
[wxWidgets.git]
/
include
/
wx
/
os2
/
textctrl.h
diff --git
a/include/wx/os2/textctrl.h
b/include/wx/os2/textctrl.h
index 8770ddbda25ab094d3cd2fbb3ab2f6e5ec216370..e00ff2433a7d3719ee04e685f31e921bfd39440c 100644
(file)
--- a/
include/wx/os2/textctrl.h
+++ b/
include/wx/os2/textctrl.h
@@
-12,7
+12,9
@@
#ifndef _WX_TEXTCTRL_H_
#define _WX_TEXTCTRL_H_
#ifndef _WX_TEXTCTRL_H_
#define _WX_TEXTCTRL_H_
-class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
+typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData);
+
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
{
public:
wxTextCtrl();
{
public:
wxTextCtrl();
@@
-22,14
+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);
}
+ virtual ~wxTextCtrl();
bool Create( wxWindow* pParent
,wxWindowID vId
bool Create( wxWindow* pParent
,wxWindowID vId
@@
-37,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
);
@@
-48,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;
@@
-73,8
+71,9
@@
public:
,long lTo
);
,long lTo
);
- virtual bool
LoadFile(const wxString& rsFil
e);
+ virtual bool
DoLoadFile(const wxString& rsFile, int fileTyp
e);
+ virtual void MarkDirty();
virtual void DiscardEdits(void);
virtual void WriteText(const wxString& rsText);
virtual void DiscardEdits(void);
virtual void WriteText(const wxString& rsText);
@@
-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
@@
-154,12
+153,16
@@
public:
void OnPaste(wxCommandEvent& rEvent);
void OnUndo(wxCommandEvent& rEvent);
void OnRedo(wxCommandEvent& rEvent);
void OnPaste(wxCommandEvent& rEvent);
void OnUndo(wxCommandEvent& rEvent);
void OnRedo(wxCommandEvent& rEvent);
+ void OnDelete(wxCommandEvent& rEvent);
+ void OnSelectAll(wxCommandEvent& rEvent);
void OnUpdateCut(wxUpdateUIEvent& rEvent);
void OnUpdateCopy(wxUpdateUIEvent& rEvent);
void OnUpdatePaste(wxUpdateUIEvent& rEvent);
void OnUpdateUndo(wxUpdateUIEvent& rEvent);
void OnUpdateRedo(wxUpdateUIEvent& rEvent);
void OnUpdateCut(wxUpdateUIEvent& rEvent);
void OnUpdateCopy(wxUpdateUIEvent& rEvent);
void OnUpdatePaste(wxUpdateUIEvent& rEvent);
void OnUpdateUndo(wxUpdateUIEvent& rEvent);
void OnUpdateRedo(wxUpdateUIEvent& rEvent);
+ void OnUpdateDelete(wxUpdateUIEvent& rEvent);
+ void OnUpdateSelectAll(wxUpdateUIEvent& rEvent);
inline bool IsMLE(void) {return m_bIsMLE;}
inline void SetMLE(bool bIsMLE) {m_bIsMLE = bIsMLE;}
inline bool IsMLE(void) {return m_bIsMLE;}
inline void SetMLE(bool bIsMLE) {m_bIsMLE = bIsMLE;}
@@
-176,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)