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

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 44cbc3653b40e7c681cf29a1a84b3baf675aec4f..09dc91bd0dcc3dfa3a6030108492220fb65791db 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -45,7 +45,7 @@ public:
     // ----------------------------------
 
     virtual wxString GetValue() const;
     // ----------------------------------
 
     virtual wxString GetValue() const;

-    virtual void SetValue(const wxString& value);
+    virtual bool IsEmpty() const;

 
     virtual wxString GetRange(long from, long to) const;
 
 
     virtual wxString GetRange(long from, long to) const;
 


@@ -66,9 +66,8 @@ public:
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
 
     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);
-    virtual bool LoadFile(const wxString& file, int WXUNUSED(fileType)) { return LoadFile(file); }
+    // load the control's contents from the file
+    virtual bool DoLoadFile(const wxString& file, int fileType);

 
     // clears the dirty flag
     virtual void MarkDirty();
 
     // clears the dirty flag
     virtual void MarkDirty();


@@ -157,6 +156,8 @@ public:
     // the colours for them otherwise
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
     // the colours for them otherwise
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);

+#else
+    bool IsRich() const { return false; }

 #endif // wxUSE_RICHEDIT
 
 #if wxUSE_INKEDIT && wxUSE_RICHEDIT
 #endif // wxUSE_RICHEDIT
 
 #if wxUSE_INKEDIT && wxUSE_RICHEDIT


@@ -169,6 +170,9 @@ public:
 
     virtual bool AcceptsFocus() const;
 
 
     virtual bool AcceptsFocus() const;
 

+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const;
+

     // callbacks
     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event); // Process 'enter' if required
     // callbacks
     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event); // Process 'enter' if required


@@ -208,6 +212,17 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    // creates the control of appropriate class (plain or rich edit) with the
+    // styles corresponding to m_windowStyle
+    //
+    // this is used by ctor/Create() and when we need to recreate the control
+    // later
+    bool MSWCreateText(const wxString& value,
+                       const wxPoint& pos,
+                       const wxSize& size);
+
+    virtual void DoSetValue(const wxString &value, int flags = 0);
+

     // return true if this control has a user-set limit on amount of text (i.e.
     // the limit is due to a previous call to SetMaxLength() and not built in)
     bool HasSpaceLimit(unsigned int *len) const;
     // return true if this control has a user-set limit on amount of text (i.e.
     // the limit is due to a previous call to SetMaxLength() and not built in)
     bool HasSpaceLimit(unsigned int *len) const;


@@ -230,7 +245,8 @@ protected:
 
     // 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_SendEvent | 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);