layout improvement on mac

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 499163b037f2a91dcd55705cbcba0598517d461e..c5e03295f3b52f537e4ab90dbfa8df53babd7f16 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -82,6 +82,10 @@ public:
     virtual void WriteText(const wxString& text);
     virtual void AppendText(const wxString& text);
 
     virtual void WriteText(const wxString& text);
     virtual void AppendText(const wxString& text);
 

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

 #if wxUSE_RICHEDIT
     // apply text attribute to the range of text (only works with richedit
     // controls)
 #if wxUSE_RICHEDIT
     // apply text attribute to the range of text (only works with richedit
     // controls)


@@ -124,6 +128,8 @@ public:
     // Implementation from now on
     // --------------------------
 
     // Implementation from now on
     // --------------------------
 

+    virtual void SetWindowStyleFlag(long style);
+

     virtual void Command(wxCommandEvent& event);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
     virtual void Command(wxCommandEvent& event);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,


@@ -171,6 +177,9 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

+    // intercept WM_GETDLGCODE
+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+

     // call this to increase the size limit (will do nothing if the current
     // limit is big enough)
     //
     // call this to increase the size limit (will do nothing if the current
     // limit is big enough)
     //


@@ -179,10 +188,17 @@ protected:
     bool AdjustSpaceLimit();
 
 #if wxUSE_RICHEDIT
     bool AdjustSpaceLimit();
 
 #if wxUSE_RICHEDIT

-    // replace the selection with the given text in the specified encoding
-    bool StreamIn(const wxString& value, wxFontEncoding encoding);
+    // replace the selection or the entire control contents with the given text
+    // in the specified encoding
+    bool StreamIn(const wxString& value,
+                  wxFontEncoding encoding,
+                  bool selOnly);

 #endif // wxUSE_RICHEDIT
 
 #endif // wxUSE_RICHEDIT
 

+    // replace the contents of the selection or of the entire control with the
+    // given text
+    void DoWriteText(const wxString& text, bool selectionOnly = TRUE);
+

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


@@ -194,6 +210,8 @@ protected:
     virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
     virtual wxSize DoGetBestSize() const;
 
     virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
     virtual wxSize DoGetBestSize() const;
 

+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+

 #if wxUSE_RICHEDIT
     // we're using RICHEDIT (and not simple EDIT) control if this field is not
     // 0, it also gives the version of the RICHEDIT control being used (1, 2 or
 #if wxUSE_RICHEDIT
     // we're using RICHEDIT (and not simple EDIT) control if this field is not
     // 0, it also gives the version of the RICHEDIT control being used (1, 2 or