X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2a1f999fafa4312ccd47b7be65c672c2220fea36..740af654d1d20aaccad331e0eb73d113b5c0b02f:/samples/font/font.cpp

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 5e2f27962e..8203a16d64 100644
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -237,7 +237,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     m_fontSize = 12;
 
     SetIcon(wxIcon(sample_xpm));
-    
+
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
@@ -386,6 +386,7 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
         }
 
         wxString facename;
+
         if ( silent )
         {
             // choose the first
@@ -408,7 +409,7 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
             delete [] facenames;
         }
 
-        if ( !facename.IsEmpty() )
+        if ( !facename.empty() )
         {
             wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
                         wxFONTWEIGHT_NORMAL, false, facename, encoding);
@@ -471,7 +472,7 @@ void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event))
 {
     wxString fontInfo = m_canvas->GetTextFont().GetNativeFontInfoDesc();
 
-    if ( fontInfo.IsEmpty() )
+    if ( fontInfo.empty() )
     {
         wxLogError(wxT("Native font info string is empty!"));
     }
@@ -585,6 +586,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_FILEDLG
     // first, choose the file
     static wxString s_dir, s_file;
     wxFileDialog dialog(this, wxT("Open an email message file"),
@@ -696,6 +698,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
                          wxFontMapper::GetEncodingDescription(fontenc).c_str());
         }
     }
+#endif // wxUSE_FILEDLG
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))