Watcom does not accept #warning but supports more than MSW port.

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index a2d13fa08d3487940b407f599eb1ba9619f8fe76..8203a16d6425295a45553eae375e177185bbf281 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -32,6 +32,13 @@
 #include "wx/splitter.h"
 #include "wx/textfile.h"
 
+#include "../sample.xpm"
+
+#ifdef __WXMAC__
+#undef wxFontDialog
+#include "wx/mac/fontdlg.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -54,7 +61,7 @@ class MyCanvas: public wxWindow
 {
 public:
     MyCanvas( wxWindow *parent );
-    virtual ~MyCanvas();
+    virtual ~MyCanvas(){};
 
     // accessors for the frame
     const wxFont& GetTextFont() const { return m_font; }
@@ -229,6 +236,8 @@ 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;
 
@@ -293,9 +302,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
     splitter->SplitHorizontally(m_textctrl, m_canvas, 100);
 
+#if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar();
     SetStatusText(wxT("Welcome to wxWidgets font demo!"));
+#endif // wxUSE_STATUSBAR
 }
 
 // --------------------------------------------------------
@@ -314,8 +325,8 @@ protected:
                                 const wxString& encoding)
     {
         wxString text;
-        text.Printf(wxT("Encoding %d: %s (available in facename '%s')\n"),
-                    ++m_n, encoding.c_str(), facename.c_str());
+        text.Printf(wxT("Encoding %u: %s (available in facename '%s')\n"),
+                    (unsigned int) ++m_n, encoding.c_str(), facename.c_str());
         m_text += text;
         return true;
     }
@@ -375,6 +386,7 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
         }
 
         wxString facename;
+
         if ( silent )
         {
             // choose the first
@@ -397,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);
@@ -460,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!"));
     }
@@ -574,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"),
@@ -685,6 +698,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
                          wxFontMapper::GetEncodingDescription(fontenc).c_str());
         }
     }
+#endif // wxUSE_FILEDLG
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@@ -709,10 +723,6 @@ MyCanvas::MyCanvas( wxWindow *parent )
 {
 }
 
-MyCanvas::~MyCanvas()
-{
-}
-
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc(this);
@@ -734,7 +744,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     fontInfo.Printf(wxT("Font size is %d points, family: %s, encoding: %s"),
                     m_font.GetPointSize(),
                     m_font.GetFamilyString().c_str(),
-                    wxFontMapper::Get()->
+                    wxFontMapper::
                         GetEncodingDescription(m_font.GetEncoding()).c_str());
 
     dc.DrawText(fontInfo, x, y);
@@ -779,7 +789,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     {
         for ( int j = 0; j < 32; j++ )
         {
-            wxChar c = 32 * (i + 1) + j;
+            wxChar c = (wxChar)(32 * (i + 1) + j);
 
             long charWidth, charHeight;
             dc.GetTextExtent(c, &charWidth, &charHeight);