moved to appropriate 'protected' sections all functions wrongly placed in 'public' sections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -513,11 +513,6 @@ public:
|
||||
*/
|
||||
virtual void DiscardEdits();
|
||||
|
||||
/**
|
||||
Currently this simply returns @c wxSize(10, 10).
|
||||
*/
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
/**
|
||||
Ends alignment.
|
||||
*/
|
||||
@@ -854,11 +849,6 @@ public:
|
||||
*/
|
||||
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
|
||||
@@ -1493,5 +1483,17 @@ public:
|
||||
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;
|
||||
};
|
||||
|
||||
|
@@ -82,11 +82,6 @@ public:
|
||||
static bool DeleteTemporaryImages(int flags,
|
||||
const wxArrayString& imageLocations);
|
||||
|
||||
/**
|
||||
Saves the buffer content to the HTML stream.
|
||||
*/
|
||||
virtual bool DoSaveFile(wxRichTextBuffer* buffer, wxOutputStream& stream);
|
||||
|
||||
/**
|
||||
Returns the mapping for converting point sizes to HTML font sizes.
|
||||
*/
|
||||
@@ -139,5 +134,11 @@ public:
|
||||
Sets the list of image locations generated by the last operation.
|
||||
*/
|
||||
void SetTemporaryImageLocations(const wxArrayString& locations);
|
||||
|
||||
protected:
|
||||
/**
|
||||
Saves the buffer content to the HTML stream.
|
||||
*/
|
||||
virtual bool DoSaveFile(wxRichTextBuffer* buffer, wxOutputStream& stream);
|
||||
};
|
||||
|
||||
|
@@ -289,11 +289,6 @@ public:
|
||||
*/
|
||||
wxRichTextStyleListBox::wxRichTextStyleType GetStyleType() const;
|
||||
|
||||
/**
|
||||
Returns the HTML for this item.
|
||||
*/
|
||||
virtual wxString OnGetItem(size_t n) const;
|
||||
|
||||
/**
|
||||
Implements left click behaviour, applying the clicked style to the
|
||||
wxRichTextCtrl.
|
||||
@@ -334,6 +329,13 @@ public:
|
||||
Updates the list from the associated style sheet.
|
||||
*/
|
||||
void UpdateStyles();
|
||||
|
||||
protected:
|
||||
|
||||
/**
|
||||
Returns the HTML for this item.
|
||||
*/
|
||||
virtual wxString OnGetItem(size_t n) const;
|
||||
};
|
||||
|
||||
|
||||
|
@@ -54,16 +54,6 @@ public:
|
||||
*/
|
||||
wxString CreateStyle(const wxTextAttr& attr, bool isPara = false);
|
||||
|
||||
/**
|
||||
Loads buffer context from the given stream.
|
||||
*/
|
||||
virtual bool DoLoadFile(wxRichTextBuffer* buffer, wxInputStream& stream);
|
||||
|
||||
/**
|
||||
Saves buffer context to the given stream.
|
||||
*/
|
||||
virtual bool DoSaveFile(wxRichTextBuffer* buffer, wxOutputStream& stream);
|
||||
|
||||
/**
|
||||
Recursively exports an object to the stream.
|
||||
*/
|
||||
@@ -109,5 +99,17 @@ public:
|
||||
Recursively imports an object.
|
||||
*/
|
||||
bool ImportXML(wxRichTextBuffer* buffer, wxXmlNode* node);
|
||||
|
||||
protected:
|
||||
|
||||
/**
|
||||
Loads buffer context from the given stream.
|
||||
*/
|
||||
virtual bool DoLoadFile(wxRichTextBuffer* buffer, wxInputStream& stream);
|
||||
|
||||
/**
|
||||
Saves buffer context to the given stream.
|
||||
*/
|
||||
virtual bool DoSaveFile(wxRichTextBuffer* buffer, wxOutputStream& stream);
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user