wxFileSelector should have file name only, not path, passed to 3rd arg

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index a872b85b8a62bfdeafec8d661ccadb684805da37..00719a113f5a1d528ddb306a7efd8782d8c6bd26 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -84,6 +84,9 @@ public:
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

+    void OnIncFont(wxCommandEvent& event) { DoResizeFont(+2); }
+    void OnDecFont(wxCommandEvent& event) { DoResizeFont(-2); }
+

     void OnViewMsg(wxCommandEvent& event);
     void OnSelectFont(wxCommandEvent& event);
     void OnEnumerateFamiliesForEncoding(wxCommandEvent& event);
     void OnViewMsg(wxCommandEvent& event);
     void OnSelectFont(wxCommandEvent& event);
     void OnEnumerateFamiliesForEncoding(wxCommandEvent& event);


@@ -93,6 +96,8 @@ public:
         { DoEnumerateFamilies(TRUE); }
     void OnEnumerateEncodings(wxCommandEvent& event);
 
         { DoEnumerateFamilies(TRUE); }
     void OnEnumerateEncodings(wxCommandEvent& event);
 

+    void OnCheckNativeToFromString(wxCommandEvent& event);
+

     void OnSize(wxSizeEvent& event);
 
 protected:
     void OnSize(wxSizeEvent& event);
 
 protected:


@@ -100,10 +105,13 @@ protected:
                              wxFontEncoding encoding = wxFONTENCODING_SYSTEM,
                              bool silent = FALSE);
 
                              wxFontEncoding encoding = wxFONTENCODING_SYSTEM,
                              bool silent = FALSE);
 

+    void DoResizeFont(int diff);

     void DoChangeFont(const wxFont& font, const wxColour& col = wxNullColour);
 
     void Resize(const wxSize& size, const wxFont& font = wxNullFont);
 
     void DoChangeFont(const wxFont& font, const wxColour& col = wxNullColour);
 
     void Resize(const wxSize& size, const wxFont& font = wxNullFont);
 

+    size_t      m_fontSize; // in points
+

     wxTextCtrl *m_textctrl;
     MyCanvas   *m_canvas;
 
     wxTextCtrl *m_textctrl;
     MyCanvas   *m_canvas;
 


@@ -123,11 +131,14 @@ enum
     Font_Quit = 1,
     Font_About,
     Font_ViewMsg,
     Font_Quit = 1,
     Font_About,
     Font_ViewMsg,

+    Font_IncSize,
+    Font_DecSize,

     Font_Choose = 100,
     Font_EnumFamiliesForEncoding,
     Font_EnumFamilies,
     Font_EnumFixedFamilies,
     Font_EnumEncodings,
     Font_Choose = 100,
     Font_EnumFamiliesForEncoding,
     Font_EnumFamilies,
     Font_EnumFixedFamilies,
     Font_EnumEncodings,

+    Font_CheckNativeToFromString,

     Font_Max
 };
 
     Font_Max
 };
 


@@ -141,12 +152,15 @@ enum
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_Quit,  MyFrame::OnQuit)
     EVT_MENU(Font_About, MyFrame::OnAbout)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Font_Quit,  MyFrame::OnQuit)
     EVT_MENU(Font_About, MyFrame::OnAbout)

+    EVT_MENU(Font_IncSize, MyFrame::OnIncFont)
+    EVT_MENU(Font_DecSize, MyFrame::OnDecFont)

     EVT_MENU(Font_ViewMsg, MyFrame::OnViewMsg)
     EVT_MENU(Font_Choose, MyFrame::OnSelectFont)
     EVT_MENU(Font_EnumFamiliesForEncoding, MyFrame::OnEnumerateFamiliesForEncoding)
     EVT_MENU(Font_EnumFamilies, MyFrame::OnEnumerateFamilies)
     EVT_MENU(Font_EnumFixedFamilies, MyFrame::OnEnumerateFixedFamilies)
     EVT_MENU(Font_EnumEncodings, MyFrame::OnEnumerateEncodings)
     EVT_MENU(Font_ViewMsg, MyFrame::OnViewMsg)
     EVT_MENU(Font_Choose, MyFrame::OnSelectFont)
     EVT_MENU(Font_EnumFamiliesForEncoding, MyFrame::OnEnumerateFamiliesForEncoding)
     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()
 
     EVT_SIZE(MyFrame::OnSize)
 END_EVENT_TABLE()


@@ -191,6 +205,8 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, -1, title, pos, size), m_textctrl(NULL)
 {
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
        : wxFrame((wxFrame *)NULL, -1, title, pos, size), m_textctrl(NULL)
 {

+    m_fontSize = 12;
+

     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 


@@ -202,17 +218,23 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuFile->Append(Font_Quit, "E&xit\tAlt-X", "Quit this program");
 
     wxMenu *menuFont = new wxMenu;
     menuFile->Append(Font_Quit, "E&xit\tAlt-X", "Quit this program");
 
     wxMenu *menuFont = new wxMenu;

+    menuFont->Append(Font_IncSize, "&Increase font size by 2 points\tCtrl-I");
+    menuFont->Append(Font_DecSize, "&Decrease font size by 2 points\tCtrl-D");
+    menuFont->AppendSeparator();

     menuFont->Append(Font_Choose, "&Select font...\tCtrl-S",
                      "Select a standard font");
     menuFont->AppendSeparator();
     menuFont->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F");
     menuFont->Append(Font_EnumFixedFamilies,
     menuFont->Append(Font_Choose, "&Select font...\tCtrl-S",
                      "Select a standard font");
     menuFont->AppendSeparator();
     menuFont->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F");
     menuFont->Append(Font_EnumFixedFamilies,

-                     "Enumerate f&ixed font families\tCtrl-I");
+                     "Enumerate fi&xed font families\tCtrl-X");

     menuFont->Append(Font_EnumEncodings,
                      "Enumerate &encodings\tCtrl-E");
     menuFont->Append(Font_EnumFamiliesForEncoding,
                      "Find font for en&coding...\tCtrl-C",
                      "Find font families for given encoding");
     menuFont->Append(Font_EnumEncodings,
                      "Enumerate &encodings\tCtrl-E");
     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;
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;


@@ -240,10 +262,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 class MyEncodingEnumerator : public wxFontEnumerator
 {
 public:
 class MyEncodingEnumerator : public wxFontEnumerator
 {
 public:

-    MyEncodingEnumerator() 
+    MyEncodingEnumerator()

         { m_n = 0; }
 
         { m_n = 0; }
 

-    const wxString& GetText() const 
+    const wxString& GetText() const

         { return m_text; }
 
 protected:
         { return m_text; }
 
 protected:


@@ -277,10 +299,10 @@ void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event))
 class MyFontEnumerator : public wxFontEnumerator
 {
 public:
 class MyFontEnumerator : public wxFontEnumerator
 {
 public:

-    bool GotAny() const 
+    bool GotAny() const

         { return !m_facenames.IsEmpty(); }
 
         { return !m_facenames.IsEmpty(); }
 

-    const wxArrayString& GetFacenames() const 
+    const wxArrayString& GetFacenames() const

         { return m_facenames; }
 
 protected:
         { return m_facenames; }
 
 protected:


@@ -367,22 +389,22 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
         wxFONTENCODING_CP1252,
     };
 
         wxFONTENCODING_CP1252,
     };
 

-    static const char *encodingNames[] =
+    static const wxString encodingNames[] =

     {
     {

-        "West European (Latin 1)",
-        "Central European (Latin 2)",
-        "Cyrillic (Latin 5)",
-        "Greek (Latin 7)",
-        "West European new (Latin 0)",
+        "Western European (ISO-8859-1)",
+        "Central European (ISO-8859-2)",
+        "Cyrillic (ISO-8859-5)",
+        "Greek (ISO-8859-7)",
+        "Western European with Euro (ISO-8859-15)",

         "KOI8-R",
         "KOI8-R",

-        "Windows Latin 2",
-        "Windows Cyrillic",
-        "Windows Latin 1",
+        "Windows Central European (CP 1250)",
+        "Windows Cyrillic (CP 1251)",
+        "Windows Western European (CP 1252)",

     };
 
     int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",
                                    WXSIZEOF(encodingNames),
     };
 
     int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",
                                    WXSIZEOF(encodingNames),

-                                   (char **)encodingNames,
+                                   encodingNames,

                                    this);
 
     if ( n != -1 )
                                    this);
 
     if ( n != -1 )


@@ -391,9 +413,45 @@ 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();
+
+    DoChangeFont(
+        wxFont(
+               fontOld.GetPointSize() + diff,
+               fontOld.GetFamily(),
+               fontOld.GetStyle(),
+               fontOld.GetWeight(),
+               fontOld.GetUnderlined(),
+               fontOld.GetFaceName(),
+               fontOld.GetEncoding()
+              )
+    );
+}
+

 void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
 {
 void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
 {

-    Resize(GetSize(), font);
+    Resize(GetClientSize(), font);

 
     m_canvas->SetTextFont(font);
     if ( col.Ok() )
 
     m_canvas->SetTextFont(font);
     if ( col.Ok() )


@@ -499,24 +557,26 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
 
     m_textctrl->LoadFile(filename);
 
 
     m_textctrl->LoadFile(filename);
 

-    if (!wxTheFontMapper->IsEncodingAvailable(fontenc))
+    if ( fontenc == wxFONTENCODING_UTF8 ||
+            !wxTheFontMapper->IsEncodingAvailable(fontenc) )

     {
         // try to find some similar encoding:
     {
         // try to find some similar encoding:

-        wxFontEncoding enc2;
-        if (wxTheFontMapper->GetAltForEncoding(fontenc, &enc2, 
-                                       wxEmptyString /*facename*/, FALSE /*interactive*/))
+        wxFontEncoding encAlt;
+        if ( wxTheFontMapper->GetAltForEncoding(fontenc, &encAlt) )

         {
             wxEncodingConverter conv;
         {
             wxEncodingConverter conv;

-            
-            if (conv.Init(fontenc, enc2))
+
+            if (conv.Init(fontenc, encAlt))

             {
             {

-                fontenc = enc2;
+                fontenc = encAlt;

                 m_textctrl -> SetValue(conv.Convert(m_textctrl -> GetValue()));
             }
             else
                 m_textctrl -> SetValue(conv.Convert(m_textctrl -> GetValue()));
             }
             else

+            {

                 wxLogWarning("Cannot convert from '%s' to '%s'.",
                              wxFontMapper::GetEncodingDescription(fontenc).c_str(),
                 wxLogWarning("Cannot convert from '%s' to '%s'.",
                              wxFontMapper::GetEncodingDescription(fontenc).c_str(),

-                             wxFontMapper::GetEncodingDescription(enc2).c_str());
+                             wxFontMapper::GetEncodingDescription(encAlt).c_str());
+            }

         }
         else
             wxLogWarning("No fonts for encoding '%s' on this system.",
         }
         else
             wxLogWarning("No fonts for encoding '%s' on this system.",


@@ -551,9 +611,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnSize(wxSizeEvent& event)
 {
 
 void MyFrame::OnSize(wxSizeEvent& event)
 {

-    wxSize size = event.GetSize();
-
-    Resize(size);
+    Resize(GetClientSize());

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -609,13 +667,22 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     // output the font name/info
     wxString fontInfo;
 
     // output the font name/info
     wxString fontInfo;

-    fontInfo.Printf("Font family is '%s', style '%s', weight '%s'",
+    fontInfo.Printf("Font size is %d points, family is %s, style %s, weight %s",
+                    m_font.GetPointSize(),

                     m_font.GetFamilyString().c_str(),
                     m_font.GetStyleString().c_str(),
                     m_font.GetWeightString().c_str());
 
     dc.DrawText(fontInfo, 5, 5);
 
                     m_font.GetFamilyString().c_str(),
                     m_font.GetStyleString().c_str(),
                     m_font.GetWeightString().c_str());
 
     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);
     // prepare to draw the font
     dc.SetFont(m_font);
     dc.SetTextForeground(m_colour);