projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the factory constructor to not use a predefined wxMBConv object as it
[wxWidgets.git]
/
include
/
wx
/
msw
/
wince
/
textctrlce.h
diff --git
a/include/wx/msw/wince/textctrlce.h
b/include/wx/msw/wince/textctrlce.h
index bad7dda85ad7909b7293bd9e105f23747212ba82..259a3daadb0606838a9a0e12b51063e093176661 100644
(file)
--- a/
include/wx/msw/wince/textctrlce.h
+++ b/
include/wx/msw/wince/textctrlce.h
@@
-1,6
+1,6
@@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/wince/textctrlce.h
/////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/wince/textctrlce.h
-// Purpose: wxTextCtrl implementation for smart phones driven by WinCE
+// Purpose: wxTextCtrl implementation for smart phones driven by WinCE
// Author: Wlodzimierz ABX Skiba
// Modified by:
// Created: 30.08.2004
// Author: Wlodzimierz ABX Skiba
// Modified by:
// Created: 30.08.2004
@@
-12,10
+12,6
@@
#ifndef _WX_TEXTCTRLCE_H_
#define _WX_TEXTCTRLCE_H_
#ifndef _WX_TEXTCTRLCE_H_
#define _WX_TEXTCTRLCE_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "textctrlce.h"
-#endif
-
#include "wx/dynarray.h"
class WXDLLEXPORT wxTextCtrl;
#include "wx/dynarray.h"
class WXDLLEXPORT wxTextCtrl;
@@
-40,7
+36,7
@@
public:
Create(parent, id, value, pos, size, style, validator, name);
}
Create(parent, id, value, pos, size, style, validator, name);
}
- ~wxTextCtrl();
+
virtual
~wxTextCtrl();
bool Create(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString,
bool Create(wxWindow *parent, wxWindowID id,
const wxString& value = wxEmptyString,
@@
-54,7
+50,9
@@
public:
// ----------------------------------
virtual wxString GetValue() const;
// ----------------------------------
virtual wxString GetValue() const;
- virtual void SetValue(const wxString& value);
+ virtual void SetValue(const wxString& value) { DoSetValue(value, SetValue_SendEvent); }
+
+ virtual void ChangeValue(const wxString &value) { DoSetValue(value); }
virtual wxString GetRange(long from, long to) const;
virtual wxString GetRange(long from, long to) const;
@@
-124,7
+122,7
@@
public:
virtual void SetInsertionPoint(long pos);
virtual void SetInsertionPointEnd();
virtual long GetInsertionPoint() const;
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);
virtual void SetSelection(long from, long to);
virtual void SetEditable(bool editable);
@@
-189,9
+187,11
@@
protected:
// false if we hit the limit set by SetMaxLength() and so didn't change it
bool AdjustSpaceLimit();
// false if we hit the limit set by SetMaxLength() and so didn't change it
bool AdjustSpaceLimit();
+ void DoSetValue(const wxString &value, int flags = 0);
+
// replace the contents of the selection or of the entire control with the
// given text
// replace the contents of the selection or of the entire control with the
// given text
- void DoWriteText(const wxString& text,
bool selectionOnly = true
);
+ void DoWriteText(const wxString& text,
int flags = SetValue_SelectionOnly
);
// set the selection possibly without scrolling the caret into view
void DoSetSelection(long from, long to, bool scrollCaret = true);
// set the selection possibly without scrolling the caret into view
void DoSetSelection(long from, long to, bool scrollCaret = true);