Remove "ED" suffix from EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED.

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 8f3f531615ee0422f4c7cf843c9b81552d4e78a7..c56bcae45aad84d51edb206d6de3da67e0746896 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -125,10 +125,11 @@ public:
     int GetRichVersion() const { return m_verRichEdit; }
     bool IsRich() const { return m_verRichEdit != 0; }
 
     int GetRichVersion() const { return m_verRichEdit; }
     bool IsRich() const { return m_verRichEdit != 0; }
 

-    // rich edit controls are not compatible with normal ones and wem ust set
-    // the colours for them otherwise
+    // rich edit controls are not compatible with normal ones and we must set
+    // the colours and font for them otherwise

     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);

+    virtual bool SetFont(const wxFont& font);

 #else
     bool IsRich() const { return false; }
 #endif // wxUSE_RICHEDIT
 #else
     bool IsRich() const { return false; }
 #endif // wxUSE_RICHEDIT


@@ -179,7 +180,6 @@ 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
 
 protected:
     // common part of all ctors


@@ -198,6 +198,8 @@ protected:
 
     virtual void DoSetValue(const wxString &value, int flags = 0);
 
 
     virtual void DoSetValue(const wxString &value, int flags = 0);
 

+    virtual wxPoint DoPositionToCoords(long pos) 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;
     // 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;


@@ -234,11 +236,26 @@ protected:
     bool SendUpdateEvent();
 
     virtual wxSize DoGetBestSize() const;
     bool SendUpdateEvent();
 
     virtual wxSize DoGetBestSize() const;

+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;

 
 #if wxUSE_RICHEDIT
 
 #if wxUSE_RICHEDIT

+    // Apply the character-related parts of wxTextAttr to the given selection
+    // or the entire control if start == end == -1.
+    //
+    // This function is private and should only be called for rich edit
+    // controls and with (from, to) already in correct order, i.e. from <= to.
+    bool MSWSetCharFormat(const wxTextAttr& attr, long from = -1, long to = -1);
+
+    // Same as above for paragraph-related parts of wxTextAttr. Note that this
+    // can only be applied to the selection as RichEdit doesn't support setting
+    // the paragraph styles globally.
+    bool MSWSetParaFormat(const wxTextAttr& attr, long from, long to);
+
+

     // we're using RICHEDIT (and not simple EDIT) control if this field is not
     // 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
-    // 3 so far)
+    // 0, it also gives the version of the RICHEDIT control being used
+    // (although not directly: 1 is for 1.0, 2 is for either 2.0 or 3.0 as we
+    // can't nor really need to distinguish between them and 4 is for 4.1)

     int m_verRichEdit;
 #endif // wxUSE_RICHEDIT
 
     int m_verRichEdit;
 #endif // wxUSE_RICHEDIT