Various makefile corrections,

Minor beatifications.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-01-22 22:47:30 +00:00
parent bfdc8d1870
commit e680a37841
7 changed files with 88 additions and 70 deletions

View File

@@ -235,34 +235,36 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
SetStatusText("Welcome to wxWindows font demo!");
}
// --------------------------------------------------------
class MyEncodingEnumerator : public wxFontEnumerator
{
public:
MyEncodingEnumerator()
{ m_n = 0; }
const wxString& GetText() const
{ return m_text; }
protected:
virtual bool OnFontEncoding(const wxString& facename,
const wxString& encoding)
{
wxString text;
text.Printf("Encoding %d: %s (available in facename '%s')\n",
++m_n, encoding.c_str(), facename.c_str());
m_text += text;
return TRUE;
}
private:
size_t m_n;
wxString m_text;
};
// event handlers
void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event))
{
class MyEncodingEnumerator : public wxFontEnumerator
{
public:
MyEncodingEnumerator() { m_n = 0; }
const wxString& GetText() const { return m_text; }
protected:
virtual bool OnFontEncoding(const wxString& facename,
const wxString& encoding)
{
wxString text;
text.Printf("Encoding %d: %s (available in facename '%s')\n",
++m_n, encoding.c_str(), facename.c_str());
m_text += text;
return TRUE;
}
private:
size_t m_n;
wxString m_text;
} fontEnumerator;
MyEncodingEnumerator fontEnumerator;
fontEnumerator.EnumerateEncodings();
@@ -270,28 +272,33 @@ void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event))
fontEnumerator.GetText().c_str());
}
// -------------------------------------------------------------
class MyFontEnumerator : public wxFontEnumerator
{
public:
bool GotAny() const
{ return !m_facenames.IsEmpty(); }
const wxArrayString& GetFacenames() const
{ return m_facenames; }
protected:
virtual bool OnFacename(const wxString& facename)
{
m_facenames.Add(facename);
return TRUE;
}
private:
wxArrayString m_facenames;
} fontEnumerator;
bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly,
wxFontEncoding encoding,
bool silent)
{
class MyFontEnumerator : public wxFontEnumerator
{
public:
bool GotAny() const { return !m_facenames.IsEmpty(); }
const wxArrayString& GetFacenames() const { return m_facenames; }
protected:
virtual bool OnFacename(const wxString& facename)
{
m_facenames.Add(facename);
return TRUE;
}
private:
wxArrayString m_facenames;
} fontEnumerator;
MyFontEnumerator fontEnumerator;
fontEnumerator.EnumerateFacenames(encoding, fixedWidthOnly);