From c730fa076c2c424a101d43f50a86cc0c5b9acb99 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 2 Apr 2007 08:49:36 +0000 Subject: [PATCH] Fixed compile problem and warning git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextformatdlg.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/richtext/richtextformatdlg.cpp b/src/richtext/richtextformatdlg.cpp index 93ef4bb597..07307f53bb 100644 --- a/src/richtext/richtextformatdlg.cpp +++ b/src/richtext/richtextformatdlg.cpp @@ -65,9 +65,9 @@ #endif #if 0 // def __WXMAC__ -#define wxRICHTEXT_USE_TOOLBOOK true +#define wxRICHTEXT_USE_TOOLBOOK 1 #else -#define wxRICHTEXT_USE_TOOLBOOK false +#define wxRICHTEXT_USE_TOOLBOOK 0 #endif bool wxRichTextFormattingDialog::sm_showToolTips = false; @@ -346,6 +346,8 @@ bool wxRichTextFormattingDialogFactory::SetSheetStyle(wxRichTextFormattingDialog dialog->SetSheetStyle(sheetStyle); dialog->SetSheetInnerBorder(0); dialog->SetSheetOuterBorder(0); +#else + wxUnusedVar(dialog); #endif // wxRICHTEXT_USE_TOOLBOOK return true; @@ -415,13 +417,13 @@ void wxRichTextFontPreviewCtrl::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.SetTextForeground(GetForegroundColour()); dc.SetClippingRegion(2, 2, size.x-4, size.y-4); dc.DrawText(text, cx, cy); - + if (GetTextEffects() & wxTEXT_ATTR_EFFECT_STRIKETHROUGH) { dc.SetPen(wxPen(GetForegroundColour(), 1)); dc.DrawLine(cx, (int) (cy + h/2 + 0.5), cx + w, (int) (cy + h/2 + 0.5)); } - + dc.DestroyClippingRegion(); } }