Make expat's configure detect if -ext o is needed (MW) so tests work correctly.

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 61eeecb067a7a488e48d3869dcf2e5a61e51c49e..425f0a5fe3e366bb73809872fbdc138435096775 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;
 
@@ -243,10 +252,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuFont->Append(Font_IncSize, wxT("&Increase font size by 2 points\tCtrl-I"));
     menuFont->Append(Font_DecSize, wxT("&Decrease font size by 2 points\tCtrl-D"));
     menuFont->AppendSeparator();
-    menuFont->Append(Font_Bold, wxT("&Bold\tCtrl-B"), wxT("Toggle bold state"), true);
-    menuFont->Append(Font_Italic, wxT("&Oblique\tCtrl-O"), wxT("Toggle italic state"), true);
-    menuFont->Append(Font_Underlined, wxT("&Underlined\tCtrl-U"),
-                     wxT("Toggle underlined state"), true);
+    menuFont->AppendCheckItem(Font_Bold, wxT("&Bold\tCtrl-B"), wxT("Toggle bold state"));
+    menuFont->AppendCheckItem(Font_Italic, wxT("&Oblique\tCtrl-O"), wxT("Toggle italic state"));
+    menuFont->AppendCheckItem(Font_Underlined, wxT("&Underlined\tCtrl-U"),
+                     wxT("Toggle underlined state"));
 
     menuFont->AppendSeparator();
     menuFont->Append(Font_CheckNativeToFromString,
@@ -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;
     }
@@ -709,10 +720,6 @@ MyCanvas::MyCanvas( wxWindow *parent )
 {
 }
 
-MyCanvas::~MyCanvas()
-{
-}
-
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
     wxPaintDC dc(this);
@@ -779,7 +786,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);