projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed wxGTK1 compilation after wxDC changes (still doesn't work)
[wxWidgets.git]
/
include
/
wx
/
richtext
/
richtextstyles.h
diff --git
a/include/wx/richtext/richtextstyles.h
b/include/wx/richtext/richtextstyles.h
index 96659e7f9d1034785988ce9c17c1339a34dc30d4..fb5557b6fde6f2fbc97e12acd568a182073d7f45 100644
(file)
--- a/
include/wx/richtext/richtextstyles.h
+++ b/
include/wx/richtext/richtextstyles.h
@@
-94,18
+94,18
@@
public:
const wxString& GetBaseStyle() const { return m_baseStyle; }
/// Sets and gets the style
const wxString& GetBaseStyle() const { return m_baseStyle; }
/// Sets and gets the style
- void SetStyle(const wx
Rich
TextAttr& style) { m_style = style; }
- const wx
Rich
TextAttr& GetStyle() const { return m_style; }
- wx
Rich
TextAttr& GetStyle() { return m_style; }
+ void SetStyle(const wxTextAttr& style) { m_style = style; }
+ const wxTextAttr& GetStyle() const { return m_style; }
+ wxTextAttr& GetStyle() { return m_style; }
/// Gets the style combined with the base style
/// Gets the style combined with the base style
- virtual wx
Rich
TextAttr GetStyleMergedWithBase(const wxRichTextStyleSheet* sheet) const;
+ virtual wxTextAttr GetStyleMergedWithBase(const wxRichTextStyleSheet* sheet) const;
protected:
wxString m_name;
wxString m_baseStyle;
wxString m_description;
protected:
wxString m_name;
wxString m_baseStyle;
wxString m_description;
- wx
Rich
TextAttr m_style;
+ wxTextAttr m_style;
};
/*!
};
/*!
@@
-206,9
+206,9
@@
public:
virtual wxRichTextStyleDefinition* Clone() const { return new wxRichTextListStyleDefinition(*this); }
/// Sets/gets the attributes for the given level
virtual wxRichTextStyleDefinition* Clone() const { return new wxRichTextListStyleDefinition(*this); }
/// Sets/gets the attributes for the given level
- void SetLevelAttributes(int i, const wx
Rich
TextAttr& attr);
- wx
Rich
TextAttr* GetLevelAttributes(int i);
- const wx
Rich
TextAttr* GetLevelAttributes(int i) const;
+ void SetLevelAttributes(int i, const wxTextAttr& attr);
+ wxTextAttr* GetLevelAttributes(int i);
+ const wxTextAttr* GetLevelAttributes(int i) const;
/// Convenience function for setting the major attributes for a list level specification
void SetAttributes(int i, int leftIndent, int leftSubIndent, int bulletStyle, const wxString& bulletSymbol = wxEmptyString);
/// Convenience function for setting the major attributes for a list level specification
void SetAttributes(int i, int leftIndent, int leftSubIndent, int bulletStyle, const wxString& bulletSymbol = wxEmptyString);
@@
-218,15
+218,15
@@
public:
/// Combine the base and list style with a paragraph style, using the given indent (from which
/// an appropriate level is found)
/// Combine the base and list style with a paragraph style, using the given indent (from which
/// an appropriate level is found)
- wx
RichTextAttr CombineWithParagraphStyle(int indent, const wxRich
TextAttr& paraStyle, wxRichTextStyleSheet* styleSheet = NULL);
+ wx
TextAttr CombineWithParagraphStyle(int indent, const wx
TextAttr& paraStyle, wxRichTextStyleSheet* styleSheet = NULL);
/// Combine the base and list style, using the given indent (from which
/// an appropriate level is found)
/// Combine the base and list style, using the given indent (from which
/// an appropriate level is found)
- wx
Rich
TextAttr GetCombinedStyle(int indent, wxRichTextStyleSheet* styleSheet = NULL);
+ wxTextAttr GetCombinedStyle(int indent, wxRichTextStyleSheet* styleSheet = NULL);
/// Combine the base and list style, using the given level from which
/// an appropriate level is found)
/// Combine the base and list style, using the given level from which
/// an appropriate level is found)
- wx
Rich
TextAttr GetCombinedStyleForLevel(int level, wxRichTextStyleSheet* styleSheet = NULL);
+ wxTextAttr GetCombinedStyleForLevel(int level, wxRichTextStyleSheet* styleSheet = NULL);
/// Gets the number of available levels
int GetLevelCount() const { return 10; }
/// Gets the number of available levels
int GetLevelCount() const { return 10; }
@@
-237,7
+237,7
@@
public:
protected:
/// The styles for each level (up to 10)
protected:
/// The styles for each level (up to 10)
- wx
Rich
TextAttr m_levelStyles[10];
+ wxTextAttr m_levelStyles[10];
};
/*!
};
/*!
@@
-253,7
+253,7
@@
public:
wxRichTextStyleSheet(const wxRichTextStyleSheet& sheet)
: wxObject()
{
wxRichTextStyleSheet(const wxRichTextStyleSheet& sheet)
: wxObject()
{
-
Init();
+ Init();
Copy(sheet);
}
wxRichTextStyleSheet() { Init(); }
Copy(sheet);
}
wxRichTextStyleSheet() { Init(); }
@@
-580,12
+580,7
@@
public:
m_value = -1;
}
m_value = -1;
}
- virtual bool Create( wxWindow* parent )
- {
- return wxRichTextStyleListBox::Create(parent, wxID_ANY,
- wxPoint(0,0), wxDefaultSize,
- wxSIMPLE_BORDER);
- }
+ virtual bool Create( wxWindow* parent );
virtual wxWindow *GetControl() { return this; }
virtual wxWindow *GetControl() { return this; }