Rebake from clean wx tree.

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index a56a3ff7d67cf95f69daee965203fb10283f2b84..5354104c74d6b488380a50ad3a3e9fc4b7e8bfec 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 

-class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase

 {
 public:
     // creation
 {
 public:
     // creation


@@ -41,45 +41,40 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxTextCtrlNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxTextCtrlNameStr);
 

-    // implement base class pure virtuals
-    // ----------------------------------
+    // overridden wxTextEntry methods
+    // ------------------------------

 
     virtual wxString GetValue() const;
 
     virtual wxString GetValue() const;

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

     virtual bool IsEmpty() const;
 
     virtual bool IsEmpty() const;
 

-    virtual wxString GetRange(long from, long to) const;
+    virtual void WriteText(const wxString& text);
+    virtual void AppendText(const wxString& text);
+    virtual void Clear();

 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
 
 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
 

-    virtual bool IsModified() const;
-    virtual bool IsEditable() const;
+    virtual void SetMaxLength(unsigned long len);

 
 

-    virtual void GetSelection(long* from, long* to) const;
+    virtual void GetSelection(long *from, long *to) const;

 
 

-    // operations
-    // ----------
+    virtual void Redo();
+    virtual bool CanRedo() const;

 
 

-    // editing
-    virtual void Clear();
-    virtual void Replace(long from, long to, const wxString& value);
-    virtual void Remove(long from, long to);
+    virtual void SetInsertionPointEnd();
+    virtual long GetInsertionPoint() const;
+    virtual wxTextPos GetLastPosition() const;

 
 

-    // load the control's contents from the file
-    virtual bool DoLoadFile(const wxString& file, int fileType);
+    // implement base class pure virtuals
+    // ----------------------------------

 
 

-    // clears the dirty flag
+    virtual bool IsModified() const;

     virtual void MarkDirty();
     virtual void DiscardEdits();
 
     virtual void MarkDirty();
     virtual void DiscardEdits();
 

-    virtual void SetMaxLength(unsigned long len);
-
-    // writing text inserts it at the current position, appending always
-    // inserts it at the end
-    virtual void WriteText(const wxString& text);
-    virtual void AppendText(const wxString& text);
-

 #ifdef __WIN32__
     virtual bool EmulateKeyPress(const wxKeyEvent& event);
 #endif // __WIN32__
 #ifdef __WIN32__
     virtual bool EmulateKeyPress(const wxKeyEvent& event);
 #endif // __WIN32__


@@ -107,39 +102,13 @@ public:
         return wxTextCtrlBase::HitTest(pt, col, row);
     }
 
         return wxTextCtrlBase::HitTest(pt, col, row);
     }
 

-    // Clipboard operations
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-
-    virtual bool CanCopy() const;
-    virtual bool CanCut() const;
-    virtual bool CanPaste() const;
-
-    // Undo/redo
-    virtual void Undo();
-    virtual void Redo();
-
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-
-    // Insertion point
-    virtual void SetInsertionPoint(long pos);
-    virtual void SetInsertionPointEnd();
-    virtual long GetInsertionPoint() const;
-    virtual wxTextPos GetLastPosition() const;
-
-    virtual void SetSelection(long from, long to);
-    virtual void SetEditable(bool editable);
-

     // Caret handling (Windows only)
     // Caret handling (Windows only)

-

     bool ShowNativeCaret(bool show = true);
     bool HideNativeCaret() { return ShowNativeCaret(false); }
 
     // Implementation from now on
     // --------------------------
     bool ShowNativeCaret(bool show = true);
     bool HideNativeCaret() { return ShowNativeCaret(false); }
 
     // Implementation from now on
     // --------------------------

- 
+

 #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
     virtual void SetDropTarget(wxDropTarget *dropTarget);
 #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
 #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
     virtual void SetDropTarget(wxDropTarget *dropTarget);
 #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT


@@ -172,7 +141,7 @@ public:
 
     virtual void AdoptAttributesFromHWND();
 
 
     virtual void AdoptAttributesFromHWND();
 

-    virtual bool AcceptsFocus() const;
+    virtual bool AcceptsFocusFromKeyboard() const;

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


@@ -210,12 +179,13 @@ public:
 
     virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

-    virtual wxVisualAttributes GetDefaultAttributes() const;

 
 protected:
     // common part of all ctors
     void Init();
 
 
 protected:
     // common part of all ctors
     void Init();
 

+    virtual bool DoLoadFile(const wxString& file, int fileType);
+

     // creates the control of appropriate class (plain or rich edit) with the
     // styles corresponding to m_windowStyle
     //
     // creates the control of appropriate class (plain or rich edit) with the
     // styles corresponding to m_windowStyle
     //


@@ -252,11 +222,8 @@ protected:
     void DoWriteText(const wxString& text,
                      int flags = SetValue_SendEvent | SetValue_SelectionOnly);
 
     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);
-
-    // return true if there is a non empty selection in the control
-    bool HasSelection() const;
+    // set the selection (possibly without scrolling the caret into view)
+    void DoSetSelection(long from, long to, int flags);

 
     // get the length of the line containing the character at the given
     // position
 
     // get the length of the line containing the character at the given
     // position


@@ -279,6 +246,17 @@ protected:
     int m_updatesCount;
 
 private:
     int m_updatesCount;
 
 private:

+    virtual void EnableTextChangedEvents(bool enable)
+    {
+        m_updatesCount = enable ? -1 : -2;
+    }
+
+    // implement wxTextEntry pure virtual: it implements all the operations for
+    // the simple EDIT controls
+    virtual WXHWND GetEditHWND() const { return m_hWnd; }
+
+    void OnKeyDown(wxKeyEvent& event);
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl)
 


@@ -292,5 +270,4 @@ private:
 
 };
 
 
 };
 

-#endif
-    // _WX_TEXTCTRL_H_
+#endif // _WX_TEXTCTRL_H_