fixed wxBITMAP for Motif

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

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index acc320e27082c02f1d0237c401a80d9114b04a7a..56e5a565b671e32aa2e731f68a7daf832723ae11 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -296,29 +296,44 @@ bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
 
     if ( fontEnumerator.GotAny() )
     {
 
     if ( fontEnumerator.GotAny() )
     {

-        int n, nFacenames = fontEnumerator.GetFacenames().GetCount();
-        wxLogStatus(this, "Found %d %sfonts",
-                    nFacenames, fixedWidthOnly ? "fixed width " : "");
-
-        wxString *facenames = new wxString[nFacenames];
-        for ( n = 0; n < nFacenames; n++ )
-            facenames[n] = fontEnumerator.GetFacenames().Item(n);
+        int nFacenames = fontEnumerator.GetFacenames().GetCount();
+        if ( !silent )
+        {
+            wxLogStatus(this, "Found %d %sfonts",
+                        nFacenames, fixedWidthOnly ? "fixed width " : "");
+        }

 
 

+        wxString facename;

         if ( silent )
         if ( silent )

-            n = 1;
+        {
+            // choose the first
+            facename = fontEnumerator.GetFacenames().Item(0);
+        }

         else
         else

+        {
+            // let the user choose
+            wxString *facenames = new wxString[nFacenames];
+            int n;
+            for ( n = 0; n < nFacenames; n++ )
+                facenames[n] = fontEnumerator.GetFacenames().Item(n);
+

             n = wxGetSingleChoiceIndex("Choose a facename", "Font demo",
                                        nFacenames, facenames, this);
             n = wxGetSingleChoiceIndex("Choose a facename", "Font demo",
                                        nFacenames, facenames, this);

-        if ( n != -1 )
+
+            if ( n != -1 )
+                facename = facenames[n];
+
+            delete [] facenames;
+        }
+
+        if ( !facename.IsEmpty() )

         {
         {

-            wxFont font(14, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
-                        wxFONTWEIGHT_NORMAL, FALSE, facenames[n], encoding);
+            wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+                        wxFONTWEIGHT_NORMAL, FALSE, facename, encoding);

 
             DoChangeFont(font);
         }
 
 
             DoChangeFont(font);
         }
 

-        delete [] facenames;
-

         return TRUE;
     }
     else if ( !silent )
         return TRUE;
     }
     else if ( !silent )


@@ -477,7 +492,7 @@ void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event))
     // and now create the correct font
     if ( !DoEnumerateFamilies(FALSE, fontenc, TRUE /* silent */) )
     {
     // and now create the correct font
     if ( !DoEnumerateFamilies(FALSE, fontenc, TRUE /* silent */) )
     {

-        wxFont font(14, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+        wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,

                     wxFONTWEIGHT_NORMAL, FALSE /* !underlined */,
                     wxEmptyString /* facename */, fontenc);
         if ( font.Ok() )
                     wxFONTWEIGHT_NORMAL, FALSE /* !underlined */,
                     wxEmptyString /* facename */, fontenc);
         if ( font.Ok() )


@@ -542,10 +557,9 @@ BEGIN_EVENT_TABLE(MyCanvas, wxWindow)
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( wxWindow *parent )
 END_EVENT_TABLE()
 
 MyCanvas::MyCanvas( wxWindow *parent )

-        : wxWindow( parent, -1 )
+        : wxWindow( parent, -1 ),
+          m_colour(*wxRED), m_font(*wxNORMAL_FONT)

 {
 {

-    m_font = *wxNORMAL_FONT;
-    m_colour = *wxRED;

 }
 
 MyCanvas::~MyCanvas()
 }
 
 MyCanvas::~MyCanvas()