document wxConvertFromIeeeExtended and wxConvertToIeeeExtended

[wxWidgets.git] / interface / wx / richtext / richtextctrl.h

diff --git a/interface/wx/richtext/richtextctrl.h b/interface/wx/richtext/richtextctrl.h
index cb2e6fab522880c01ecd8b655dfbfa919c2e07b7..f70ad5a7dd7b1a291530af9a07837a541b0aa006 100644 (file)
--- a/interface/wx/richtext/richtextctrl.h
+++ b/interface/wx/richtext/richtextctrl.h
@@ -73,11 +73,6 @@ public:
     */
     wxRichTextEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 
     */
     wxRichTextEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 

-    /**
-        Clones the event.
-    */
-    wxEvent* Clone() const;
-

     /**
         Returns the character pressed, within a wxEVT_COMMAND_RICHTEXT_CHARACTER event.
     */
     /**
         Returns the character pressed, within a wxEVT_COMMAND_RICHTEXT_CHARACTER event.
     */


@@ -114,7 +109,7 @@ public:
     /**
         Gets the range for the current operation.
     */
     /**
         Gets the range for the current operation.
     */

-    wxRichTextRange GetRange() const;
+    const wxRichTextRange& GetRange() const;

 
     /**
         Sets the character variable.
 
     /**
         Sets the character variable.


@@ -166,6 +161,7 @@ public:
 
     @library{wxrichtext}
     @category{richtext}
 
     @library{wxrichtext}
     @category{richtext}

+    @appearance{richtextctrl.png}

 */
 class wxRichTextCtrl
 {
 */
 class wxRichTextCtrl
 {


@@ -389,7 +385,7 @@ public:
         See BeginNumberedBullet() for an explanation of how indentation is used
         to render the bulleted paragraph.
     */
         See BeginNumberedBullet() for an explanation of how indentation is used
         to render the bulleted paragraph.
     */

-    bool BeginSymbolBullet(wxChar symbol, int leftIndent,
+    bool BeginSymbolBullet(const wxString& symbol, int leftIndent,

                            int leftSubIndent,
                            int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_SYMBOL);
 
                            int leftSubIndent,
                            int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_SYMBOL);
 


@@ -513,11 +509,6 @@ public:
     */
     virtual void DiscardEdits();
 
     */
     virtual void DiscardEdits();
 

-    /**
-        Currently this simply returns @c wxSize(10, 10).
-    */
-    virtual wxSize DoGetBestSize() const;
-

     /**
         Ends alignment.
     */
     /**
         Ends alignment.
     */


@@ -649,7 +640,7 @@ public:
         applied (for example, setting the default style to bold will cause
         subsequently inserted text to be bold).
     */
         applied (for example, setting the default style to bold will cause
         subsequently inserted text to be bold).
     */

-    const wxTextAttr GetBasicStyle() const;
+    virtual const wxTextAttr& GetBasicStyle() const;

 
     //@{
     /**
 
     //@{
     /**


@@ -678,7 +669,7 @@ public:
         Returns the current default style, which can be used to change how subsequently
         inserted text is displayed.
     */
         Returns the current default style, which can be used to change how subsequently
         inserted text is displayed.
     */

-    const wxTextAttr GetDefaultStyle() const;
+    virtual const wxTextAttr& GetDefaultStyle() const;

 
     /**
         Gets the size of the buffer beyond which layout is delayed during resizing.
 
     /**
         Gets the size of the buffer beyond which layout is delayed during resizing.


@@ -756,7 +747,7 @@ public:
     /**
         Returns the selection range in character positions. -1, -1 means no selection.
     */
     /**
         Returns the selection range in character positions. -1, -1 means no selection.
     */

-    const wxRichTextRange GetSelectionRange() const;
+    wxRichTextRange GetSelectionRange() const;

 
     /**
         Returns the text within the current selection range, if any.
 
     /**
         Returns the text within the current selection range, if any.


@@ -854,11 +845,6 @@ public:
     */
     void Init();
 
     */
     void Init();
 

-    /**
-        Initialises the command event.
-    */
-    void InitCommandEvent(wxCommandEvent& event) const;
-

     /**
         Returns @true if the user has recently set the default style without moving
         the caret, and therefore the UI needs to reflect the default style and not
     /**
         Returns @true if the user has recently set the default style without moving
         the caret, and therefore the UI needs to reflect the default style and not


@@ -1466,7 +1452,7 @@ public:
     /**
         Loads an image from a file and writes it at the current insertion point.
     */
     /**
         Loads an image from a file and writes it at the current insertion point.
     */

-    bool WriteImage(const wxString& filename, int bitmapType);
+    virtual bool WriteImage(const wxString& filename, wxBitmapType bitmapType);

 
     /**
         Writes an image block at the current insertion point.
 
     /**
         Writes an image block at the current insertion point.


@@ -1493,5 +1479,17 @@ public:
         Translates from column and line number to position.
     */
     virtual long XYToPosition(long x, long y) const;
         Translates from column and line number to position.
     */
     virtual long XYToPosition(long x, long y) const;

+
+protected:
+
+    /**
+        Currently this simply returns @c wxSize(10, 10).
+    */
+    virtual wxSize DoGetBestSize() const;
+
+    /**
+        Initialises the command event.
+    */
+    void InitCommandEvent(wxCommandEvent& event) const;

 };
 
 };