m_styleDefinition = NULL;
m_styleSheet = NULL;
m_object = NULL;
+ m_options = 0;
}
wxRichTextFormattingDialog::~wxRichTextFormattingDialog()
const wxPoint& pos, const wxSize& sz, long style)
{
SetExtraStyle(wxDIALOG_EX_CONTEXTHELP|wxWS_EX_VALIDATE_RECURSIVELY);
+#ifdef __WXMAC__
+ SetWindowVariant(wxWINDOW_VARIANT_SMALL);
+#endif
int resizeBorder = wxRESIZE_BORDER;
}
// Apply attributes to the object being edited, if any
-bool wxRichTextFormattingDialog::ApplyStyle(wxRichTextCtrl* ctrl, int WXUNUSED(flags))
+bool wxRichTextFormattingDialog::ApplyStyle(wxRichTextCtrl* ctrl, int flags)
{
if (GetObject())
{
- ctrl->SetStyle(GetObject(), m_attributes);
+ ctrl->SetStyle(GetObject(), m_attributes, flags);
return true;
}
else
wxRichTextFormattingDialog* wxRichTextFormattingDialog::GetDialog(wxWindow* win)
{
wxWindow* p = win->GetParent();
- while (p && !p->IsKindOf(CLASSINFO(wxRichTextFormattingDialog)))
+ while (p && !wxDynamicCast(p, wxRichTextFormattingDialog))
p = p->GetParent();
wxRichTextFormattingDialog* dialog = wxDynamicCast(p, wxRichTextFormattingDialog);
return dialog;
if (event.LeftDown())
{
wxWindow* parent = GetParent();
- while (parent != NULL && !parent->IsKindOf(CLASSINFO(wxDialog)) && !parent->IsKindOf(CLASSINFO(wxFrame)))
+ while (parent != NULL && !wxDynamicCast(parent, wxDialog) && !wxDynamicCast(parent, wxFrame))
parent = parent->GetParent();
wxColourData data;