1. patch from Søren Erland Vestø implementing wxFTP::GetFileSize()

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index c8dd213baad978e32ce2e3947cc43dcdcac5885c..7948599d422e9dcb66e6166ad83ca22b0fa8a268 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -96,6 +96,8 @@ public:
         { DoEnumerateFamilies(TRUE); }
     void OnEnumerateEncodings(wxCommandEvent& event);
 
+    void OnCheckNativeToFromString(wxCommandEvent& event);
+
     void OnSize(wxSizeEvent& event);
 
 protected:
@@ -136,6 +138,7 @@ enum
     Font_EnumFamilies,
     Font_EnumFixedFamilies,
     Font_EnumEncodings,
+    Font_CheckNativeToFromString,
     Font_Max
 };
 
@@ -157,6 +160,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_EnumFamilies, MyFrame::OnEnumerateFamilies)
     EVT_MENU(Font_EnumFixedFamilies, MyFrame::OnEnumerateFixedFamilies)
     EVT_MENU(Font_EnumEncodings, MyFrame::OnEnumerateEncodings)
+    EVT_MENU(Font_CheckNativeToFromString, MyFrame::OnCheckNativeToFromString)
 
     EVT_SIZE(MyFrame::OnSize)
 END_EVENT_TABLE()
@@ -228,6 +232,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuFont->Append(Font_EnumFamiliesForEncoding,
                      "Find font for en&coding...\tCtrl-C",
                      "Find font families for given encoding");
+    menuFont->AppendSeparator();
+    menuFont->Append(Font_CheckNativeToFromString,
+                     "Check Native Font Info To/From String");
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
@@ -382,7 +389,7 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
         wxFONTENCODING_CP1252,
     };
 
-    static const char *encodingNames[] =
+    static const wxString encodingNames[] =
     {
         "West European (Latin 1)",
         "Central European (Latin 2)",
@@ -397,7 +404,7 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
 
     int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",
                                    WXSIZEOF(encodingNames),
-                                   (char **)encodingNames,
+                                   encodingNames,
                                    this);
 
     if ( n != -1 )
@@ -406,6 +413,25 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
     }
 }
 
+void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event))
+{
+    wxString fontInfo = m_canvas->GetTextFont().GetNativeFontInfoDesc();
+
+    if ( fontInfo.IsEmpty() )
+    {
+        wxLogError("Native font info string is empty!");
+    }
+    else
+    {
+        wxFont *font = wxFont::New(fontInfo);
+        if ( fontInfo != font->GetNativeFontInfoDesc() )
+            wxLogError("wxNativeFontInfo ToString()/FromString() broken!");
+        else
+            wxLogError("wxNativeFontInfo works: %s", fontInfo.c_str());
+        delete font;
+     }
+}
+
 void MyFrame::DoResizeFont(int diff)
 {
     wxFont fontOld = m_canvas->GetTextFont();
@@ -425,7 +451,7 @@ void MyFrame::DoResizeFont(int diff)
 
 void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
 {
-    Resize(GetSize(), font);
+    Resize(GetClientSize(), font);
 
     m_canvas->SetTextFont(font);
     if ( col.Ok() )
@@ -584,9 +610,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnSize(wxSizeEvent& event)
 {
-    wxSize size = event.GetSize();
-
-    Resize(size);
+    Resize(GetClientSize());
 
     event.Skip();
 }
@@ -650,6 +674,14 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     dc.DrawText(fontInfo, 5, 5);
 
+    if ( m_font.Ok() )
+    {
+        wxString fontDesc = m_font.GetNativeFontInfoDesc();
+        dc.SetFont(wxFont(fontDesc));
+        fontInfo.Printf("Native font info: %s", fontDesc.c_str());
+        dc.DrawText(fontInfo, 5, 5 + dc.GetCharHeight());
+    }
+
     // prepare to draw the font
     dc.SetFont(m_font);
     dc.SetTextForeground(m_colour);