The UseAntiAliasing is off by default on wxMac. Add a menu item to

[wxWidgets.git] / samples / font / font.cpp

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 4d1ce5ebcc5af80a0ad0fd38fee1cf2c6f8f822c..047299d82aaf3a83a198fc2bc6e88dbf4c529875 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -144,6 +144,7 @@ enum
     Font_wxSMALL_FONT,
     Font_wxITALIC_FONT,
     Font_wxSWISS_FONT,
+    Font_Standard,
 
     Font_Choose = 100,
     Font_EnumFamiliesForEncoding,
@@ -260,7 +261,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuStdFonts->Append(Font_wxSMALL_FONT,  wxT("wxSMALL_FONT"),  wxT("Small font used by wxWindows"));
     menuStdFonts->Append(Font_wxITALIC_FONT, wxT("wxITALIC_FONT"), wxT("Italic font used by wxWindows"));
     menuStdFonts->Append(Font_wxSWISS_FONT,  wxT("wxSWISS_FONT"),  wxT("Swiss font used by wxWindows"));
-    menuSelect->Append(-2, wxT("Standar&d fonts"), menuStdFonts);
+    menuSelect->Append(Font_Standard, wxT("Standar&d fonts"), menuStdFonts);
 
     menuSelect->AppendSeparator();
     menuSelect->Append(Font_EnumFamilies, wxT("Enumerate font &families\tCtrl-F"));
@@ -747,11 +748,9 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     if ( m_font.Ok() )
     {
-        wxNativeFontInfo *info = m_font.GetNativeFontInfo();
+        const wxNativeFontInfo *info = m_font.GetNativeFontInfo();
         if ( info )
         {
-            delete info;
-
             wxString fontDesc = m_font.GetNativeFontInfoUserDesc();
             fontInfo.Printf(wxT("Native font info: %s"), fontDesc.c_str());