Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

[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 c328911a424429d2b94b0d92828e4e6e1a3ea78a..d04b118fd109cd080271558416c7ab141bb7c17f 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,13 +12,9 @@
 #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"
 
 #include "wx/dynarray.h"
 

-class WXDLLEXPORT wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;

 WX_DEFINE_EXPORTED_ARRAY_PTR(wxTextCtrl *, wxArrayTextSpins);
 
 class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 WX_DEFINE_EXPORTED_ARRAY_PTR(wxTextCtrl *, wxArrayTextSpins);
 
 class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase


@@ -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);


@@ -139,8 +137,6 @@ public:
 
     virtual void Command(wxCommandEvent& event);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
     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);

 
     virtual void AdoptAttributesFromHWND();
 
 
     virtual void AdoptAttributesFromHWND();
 


@@ -191,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);