X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d111a89a859456a8649e809eec131f2639907610..30827629fa11f6365f69bd2917e1a35d22c35363:/samples/font/font.cpp diff --git a/samples/font/font.cpp b/samples/font/font.cpp index d2764e0367..aad214f94c 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -5,12 +5,12 @@ // Modified by: // Created: 30.09.99 // RCS-ID: $Id$ -// Copyright: (c) Vadim Zeitlin +// Copyright: (c) 1999 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -19,13 +19,18 @@ // for all others, include the necessary headers (this file is usually all you // need because it includes almost all + #include "wx/wx.h" - #include + #include "wx/log.h" #endif -#include -#include +#include "wx/choicdlg.h" +#include "wx/fontdlg.h" +#include "wx/fontenum.h" +#include "wx/fontmap.h" +#include "wx/encconv.h" +#include "wx/splitter.h" +#include "wx/textfile.h" // ---------------------------------------------------------------------------- // private classes @@ -80,40 +85,41 @@ public: // 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 OnBold(wxCommandEvent& event); + void OnItalic(wxCommandEvent& event); + void OnUnderline(wxCommandEvent& event); + + void OnViewMsg(wxCommandEvent& event); void OnSelectFont(wxCommandEvent& event); - void OnCreateFont(wxCommandEvent& event); + void OnEnumerateFamiliesForEncoding(wxCommandEvent& event); void OnEnumerateFamilies(wxCommandEvent& WXUNUSED(event)) { DoEnumerateFamilies(FALSE); } void OnEnumerateFixedFamilies(wxCommandEvent& WXUNUSED(event)) { DoEnumerateFamilies(TRUE); } void OnEnumerateEncodings(wxCommandEvent& event); -protected: - void DoEnumerateFamilies(bool fixedWidthOnly); - - MyCanvas *m_canvas; + void OnCheckNativeToFromString(wxCommandEvent& event); -private: - // any class wishing to process wxWindows events must use this macro - DECLARE_EVENT_TABLE() -}; - -// A custom font dialog which allows to directly edit wxFont proprieties -class MyFontDialog : public wxDialog -{ -public: - MyFontDialog(MyFrame *frame); +protected: + bool DoEnumerateFamilies(bool fixedWidthOnly, + wxFontEncoding encoding = wxFONTENCODING_SYSTEM, + bool silent = FALSE); - // event handlers - void OnApply(wxCommandEvent& WXUNUSED(event)) { DoApply(); } + void DoResizeFont(int diff); + void DoChangeFont(const wxFont& font, const wxColour& col = wxNullColour); -protected: - void DoApply(); + size_t m_fontSize; // in points - MyCanvas *m_canvas; + wxTextCtrl *m_textctrl; + MyCanvas *m_canvas; private: - //DECLARE_EVENT_TABLE() TODO + // any class wishing to process wxWindows events must use this macro + DECLARE_EVENT_TABLE() }; // ---------------------------------------------------------------------------- @@ -126,11 +132,18 @@ enum // menu items Font_Quit = 1, Font_About, + Font_ViewMsg, + Font_IncSize, + Font_DecSize, + Font_Bold, + Font_Italic, + Font_Underlined, Font_Choose = 100, - Font_Create, + Font_EnumFamiliesForEncoding, Font_EnumFamilies, Font_EnumFixedFamilies, Font_EnumEncodings, + Font_CheckNativeToFromString, Font_Max }; @@ -143,9 +156,18 @@ enum // simple menu events like this the static method is much simpler. BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Font_Quit, MyFrame::OnQuit) + EVT_MENU(Font_ViewMsg, MyFrame::OnViewMsg) EVT_MENU(Font_About, MyFrame::OnAbout) + + EVT_MENU(Font_IncSize, MyFrame::OnIncFont) + EVT_MENU(Font_DecSize, MyFrame::OnDecFont) + EVT_MENU(Font_Bold, MyFrame::OnBold) + EVT_MENU(Font_Italic, MyFrame::OnItalic) + EVT_MENU(Font_Underlined, MyFrame::OnUnderline) + EVT_MENU(Font_CheckNativeToFromString, MyFrame::OnCheckNativeToFromString) + EVT_MENU(Font_Choose, MyFrame::OnSelectFont) - EVT_MENU(Font_Create, MyFrame::OnCreateFont) + EVT_MENU(Font_EnumFamiliesForEncoding, MyFrame::OnEnumerateFamiliesForEncoding) EVT_MENU(Font_EnumFamilies, MyFrame::OnEnumerateFamilies) EVT_MENU(Font_EnumFixedFamilies, MyFrame::OnEnumerateFixedFamilies) EVT_MENU(Font_EnumEncodings, MyFrame::OnEnumerateEncodings) @@ -171,7 +193,7 @@ bool MyApp::OnInit() { // Create the main application window MyFrame *frame = new MyFrame("Font wxWindows demo", - wxPoint(50, 50), wxSize(450, 340)); + wxPoint(50, 50), wxSize(600, 400)); // Show it and tell the application that it's our main window frame->Show(TRUE); @@ -189,114 +211,289 @@ bool MyApp::OnInit() // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size) + : wxFrame((wxFrame *)NULL, -1, title, pos, size), m_textctrl(NULL) { + m_fontSize = 12; + // create a menu bar wxMenu *menuFile = new wxMenu; + menuFile->Append(Font_ViewMsg, "&View...\tCtrl-V", + "View an email message file"); + menuFile->AppendSeparator(); menuFile->Append(Font_About, "&About...\tCtrl-A", "Show about dialog"); menuFile->AppendSeparator(); menuFile->Append(Font_Quit, "E&xit\tAlt-X", "Quit this program"); wxMenu *menuFont = new wxMenu; - menuFont->Append(Font_Choose, "&Select font...\tCtrl-S", - "Select a standard font"); - menuFont->Append(Font_Create, "&Create font...\tCtrl-C", - "Create a custom font"); + 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_Bold, "&Bold\tCtrl-B", "Toggle bold state", TRUE); + menuFont->Append(Font_Italic, "&Oblique\tCtrl-O", "Toggle italic state", TRUE); + menuFont->Append(Font_Underlined, "&Underlined\tCtrl-U", + "Toggle underlined state", TRUE); menuFont->AppendSeparator(); - menuFont->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F"); - menuFont->Append(Font_EnumFixedFamilies, - "Enumerate f&ixed font families\tCtrl-I"); - menuFont->Append(Font_EnumEncodings, + menuFont->Append(Font_CheckNativeToFromString, + "Check Native Font Info To/From String"); + + wxMenu *menuSelect = new wxMenu; + menuSelect->Append(Font_Choose, "&Select font...\tCtrl-S", + "Select a standard font"); + menuSelect->AppendSeparator(); + menuSelect->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F"); + menuSelect->Append(Font_EnumFixedFamilies, + "Enumerate fi&xed font families\tCtrl-X"); + menuSelect->Append(Font_EnumEncodings, "Enumerate &encodings\tCtrl-E"); + menuSelect->Append(Font_EnumFamiliesForEncoding, + "Find font for en&coding...\tCtrl-C", + "Find font families for given encoding"); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; menuBar->Append(menuFile, "&File"); menuBar->Append(menuFont, "F&ont"); + menuBar->Append(menuSelect, "&Select"); // ... and attach this menu bar to the frame SetMenuBar(menuBar); - m_canvas = new MyCanvas(this); + wxSplitterWindow *splitter = new wxSplitterWindow(this); + + m_textctrl = new wxTextCtrl(splitter, -1, + "Paste text here to see how it looks\n" + "like in the given font", + wxDefaultPosition, wxDefaultSize, + wxTE_MULTILINE); + + m_canvas = new MyCanvas(splitter); + + splitter->SplitHorizontally(m_textctrl, m_canvas, 100); // create a status bar just for fun (by default with 1 pane only) - CreateStatusBar(2); - SetStatusText("Welcome to wxWindows!"); + CreateStatusBar(); + 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(wxT("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 + MyEncodingEnumerator fontEnumerator; + + fontEnumerator.EnumerateEncodings(); + + wxLogMessage(wxT("Enumerating all available encodings:\n%s"), + 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) { - public: - MyEncodingEnumerator() { m_n = 0; } + m_facenames.Add(facename); + return TRUE; + } - const wxString& GetText() const { return m_text; } + private: + wxArrayString m_facenames; +} fontEnumerator; - protected: - virtual bool OnFontEncoding(const wxString& family, - const wxString& encoding) +bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly, + wxFontEncoding encoding, + bool silent) +{ + MyFontEnumerator fontEnumerator; + + fontEnumerator.EnumerateFacenames(encoding, fixedWidthOnly); + + if ( fontEnumerator.GotAny() ) + { + int nFacenames = fontEnumerator.GetFacenames().GetCount(); + if ( !silent ) { - wxString text; - text.Printf("Encoding %d: %s (available in family '%s')\n", - ++m_n, encoding.c_str(), family.c_str()); - m_text += text; + wxLogStatus(this, wxT("Found %d %sfonts"), + nFacenames, fixedWidthOnly ? wxT("fixed width ") : wxT("")); + } - return TRUE; + wxString facename; + if ( silent ) + { + // choose the first + facename = fontEnumerator.GetFacenames().Item(0); } + else + { + // let the user choose + wxString *facenames = new wxString[nFacenames]; + int n; + for ( n = 0; n < nFacenames; n++ ) + facenames[n] = fontEnumerator.GetFacenames().Item(n); - private: - size_t m_n; + n = wxGetSingleChoiceIndex("Choose a facename", "Font demo", + nFacenames, facenames, this); - wxString m_text; - } fontEnumerator; + if ( n != -1 ) + facename = facenames[n]; - fontEnumerator.EnumerateEncodings(); + delete [] facenames; + } - wxLogMessage("Enumerating all available encodings:\n%s", - fontEnumerator.GetText().c_str()); + if ( !facename.IsEmpty() ) + { + wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL, FALSE, facename, encoding); + + DoChangeFont(font); + } + + return TRUE; + } + else if ( !silent ) + { + wxLogWarning(wxT("No such fonts found.")); + } + + return FALSE; } -void MyFrame::DoEnumerateFamilies(bool fixedWidthOnly) +void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event)) { - class MyFontEnumerator : public wxFontEnumerator + static wxFontEncoding encodings[] = + { + wxFONTENCODING_ISO8859_1, + wxFONTENCODING_ISO8859_2, + wxFONTENCODING_ISO8859_5, + wxFONTENCODING_ISO8859_7, + wxFONTENCODING_ISO8859_15, + wxFONTENCODING_KOI8, + wxFONTENCODING_CP1250, + wxFONTENCODING_CP1251, + wxFONTENCODING_CP1252, + }; + + static const wxString encodingNames[] = + { + "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", + "Windows Central European (CP 1250)", + "Windows Cyrillic (CP 1251)", + "Windows Western European (CP 1252)", + }; + + int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo", + WXSIZEOF(encodingNames), + encodingNames, + this); + + if ( n != -1 ) { - public: - MyFontEnumerator() { m_n = 0; } + DoEnumerateFamilies(FALSE, encodings[n]); + } +} - const wxString& GetText() const { return m_text; } +void MyFrame::OnCheckNativeToFromString(wxCommandEvent& WXUNUSED(event)) +{ + wxString fontInfo = m_canvas->GetTextFont().GetNativeFontInfoDesc(); - protected: - virtual bool OnFontFamily(const wxString& family) - { - wxString text; - text.Printf("Font family %d: %s\n", ++m_n, family.c_str()); - m_text += text; + if ( fontInfo.IsEmpty() ) + { + wxLogError(wxT("Native font info string is empty!")); + } + else + { + wxFont *font = wxFont::New(fontInfo); + if ( fontInfo != font->GetNativeFontInfoDesc() ) + wxLogError(wxT("wxNativeFontInfo ToString()/FromString() broken!")); + else + wxLogMessage(wxT("wxNativeFontInfo works: %s"), fontInfo.c_str()); + + delete font; + } +} - return TRUE; - } +void MyFrame::DoResizeFont(int diff) +{ + wxFont font = m_canvas->GetTextFont(); - private: - size_t m_n; + font.SetPointSize(font.GetPointSize() + diff); + DoChangeFont(font); +} - wxString m_text; - } fontEnumerator; +void MyFrame::OnBold(wxCommandEvent& event) +{ + wxFont font = m_canvas->GetTextFont(); - fontEnumerator.EnumerateFamilies(fixedWidthOnly); + font.SetWeight(event.IsChecked() ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL); + DoChangeFont(font); +} - wxLogMessage("Enumerating %s font families:\n%s", - fixedWidthOnly ? "fixed width" : "all", - fontEnumerator.GetText().c_str()); +void MyFrame::OnItalic(wxCommandEvent& event) +{ + wxFont font = m_canvas->GetTextFont(); + + font.SetStyle(event.IsChecked() ? wxFONTSTYLE_ITALIC : wxFONTSTYLE_NORMAL); + DoChangeFont(font); } -void MyFrame::OnCreateFont(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnUnderline(wxCommandEvent& event) { - MyFontDialog dialog(this); + wxFont font = m_canvas->GetTextFont(); - (void)dialog.ShowModal(); + font.SetUnderlined(event.IsChecked()); + DoChangeFont(font); +} + +void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col) +{ + m_canvas->SetTextFont(font); + if ( col.Ok() ) + m_canvas->SetColour(col); + m_canvas->Refresh(); + + m_textctrl->SetFont(font); + if ( col.Ok() ) + m_textctrl->SetForegroundColour(col); } void MyFrame::OnSelectFont(wxCommandEvent& WXUNUSED(event)) @@ -309,9 +506,19 @@ void MyFrame::OnSelectFont(wxCommandEvent& WXUNUSED(event)) if ( dialog.ShowModal() == wxID_OK ) { wxFontData retData = dialog.GetFontData(); - m_canvas->SetTextFont(retData.GetChosenFont()); - m_canvas->SetColour(retData.GetColour()); - m_canvas->Refresh(); + wxFont font = retData.GetChosenFont(); + wxColour colour = retData.GetColour(); + + DoChangeFont(font, colour); + + // update the state of the bold/italic/underlined menu items + wxMenuBar *mbar = GetMenuBar(); + if ( mbar ) + { + mbar->Check(Font_Bold, font.GetWeight() == wxFONTWEIGHT_BOLD); + mbar->Check(Font_Italic, font.GetStyle() == wxFONTSTYLE_ITALIC); + mbar->Check(Font_Underlined, font.GetUnderlined()); + } } } @@ -321,13 +528,129 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) Close(TRUE); } +void MyFrame::OnViewMsg(wxCommandEvent& WXUNUSED(event)) +{ + // first, choose the file + static wxString s_dir, s_file; + wxFileDialog dialog(this, "Open an email message file", + s_dir, s_file); + if ( dialog.ShowModal() != wxID_OK ) + return; + + // save for the next time + s_dir = dialog.GetDirectory(); + s_file = dialog.GetFilename(); + + wxString filename = dialog.GetPath(); + + // load it and search for Content-Type header + wxTextFile file(filename); + if ( !file.Open() ) + return; + + wxString charset; + + static const char *prefix = "Content-Type: text/plain; charset="; + const size_t len = strlen(prefix); + + size_t n, count = file.GetLineCount(); + for ( n = 0; n < count; n++ ) + { + wxString line = file[n]; + + if ( !line ) + { + // if it is an email message, headers are over, no need to parse + // all the file + break; + } + + if ( line.Left(len) == prefix ) + { + // found! + const wxChar *pc = line.c_str() + len; + if ( *pc == '"' ) + pc++; + + while ( *pc && *pc != '"' ) + { + charset += *pc++; + } + + break; + } + } + + if ( !charset ) + { + wxLogError(wxT("The file '%s' doesn't contain charset information."), + filename.c_str()); + + return; + } + + // ok, now get the corresponding encoding + wxFontEncoding fontenc = wxTheFontMapper->CharsetToEncoding(charset); + if ( fontenc == wxFONTENCODING_SYSTEM ) + { + wxLogError(wxT("Charset '%s' is unsupported."), charset.c_str()); + return; + } + + m_textctrl->LoadFile(filename); + + if ( fontenc == wxFONTENCODING_UTF8 || + !wxTheFontMapper->IsEncodingAvailable(fontenc) ) + { + // try to find some similar encoding: + wxFontEncoding encAlt; + if ( wxTheFontMapper->GetAltForEncoding(fontenc, &encAlt) ) + { + wxEncodingConverter conv; + + if (conv.Init(fontenc, encAlt)) + { + fontenc = encAlt; + m_textctrl -> SetValue(conv.Convert(m_textctrl -> GetValue())); + } + else + { + wxLogWarning(wxT("Cannot convert from '%s' to '%s'."), + wxFontMapper::GetEncodingDescription(fontenc).c_str(), + wxFontMapper::GetEncodingDescription(encAlt).c_str()); + } + } + else + wxLogWarning(wxT("No fonts for encoding '%s' on this system."), + wxFontMapper::GetEncodingDescription(fontenc).c_str()); + } + + // and now create the correct font + if ( !DoEnumerateFamilies(FALSE, fontenc, TRUE /* silent */) ) + { + wxFont font(12, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, + wxFONTWEIGHT_NORMAL, FALSE /* !underlined */, + wxEmptyString /* facename */, fontenc); + if ( font.Ok() ) + { + DoChangeFont(font); + } + else + { + wxLogWarning(wxT("No fonts for encoding '%s' on this system."), + wxFontMapper::GetEncodingDescription(fontenc).c_str()); + } + } +} + void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox("wxWindows font demo.", "About Font", + wxMessageBox("wxWindows font demo\n" + "(c) 1999 Vadim Zeitlin", + "About Font", wxOK | wxICON_INFORMATION, this); } - // ---------------------------------------------------------------------------- // MyCanvas // ---------------------------------------------------------------------------- @@ -337,10 +660,9 @@ BEGIN_EVENT_TABLE(MyCanvas, wxWindow) 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() @@ -353,36 +675,78 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) PrepareDC(dc); // set background - dc.SetBackground(wxBrush("white", wxSOLID)); + dc.SetBackground(wxBrush(wxT("white"), wxSOLID)); dc.Clear(); + // one text line height + wxCoord hLine = dc.GetCharHeight(); + + // the current text origin + wxCoord x = 5, + y = 5; + // output the font name/info wxString fontInfo; - fontInfo.Printf("Font family is '%s', style '%s', weight '%s'", + fontInfo.Printf(wxT("Font size is %d points, family: %s, encoding: %s"), + m_font.GetPointSize(), m_font.GetFamilyString().c_str(), + wxTheFontMapper-> + GetEncodingDescription(m_font.GetEncoding()).c_str()); + + dc.DrawText(fontInfo, x, y); + y += hLine; + + fontInfo.Printf(wxT("Style: %s, weight: %s, fixed width: %s"), m_font.GetStyleString().c_str(), - m_font.GetWeightString().c_str()); + m_font.GetWeightString().c_str(), + m_font.IsFixedWidth() ? _T("yes") : _T("no")); - dc.DrawText(fontInfo, 5, 5); + dc.DrawText(fontInfo, x, y); + y += hLine; + + if ( m_font.Ok() ) + { + wxNativeFontInfo *info = m_font.GetNativeFontInfo(); + if ( info ) + { + delete info; + + wxString fontDesc = m_font.GetNativeFontInfoUserDesc(); + fontInfo.Printf(wxT("Native font info: %s"), fontDesc.c_str()); + + dc.DrawText(fontInfo, x, y); + y += hLine; + } + } + + y += hLine; // prepare to draw the font dc.SetFont(m_font); dc.SetTextForeground(m_colour); - // the size of one cell (char + small margin) - int w = dc.GetCharWidth() + 5, - h = dc.GetCharHeight() + 4; + // the size of one cell (Normally biggest char + small margin) + long maxCharWidth, maxCharHeight; + dc.GetTextExtent(wxT("W"), &maxCharWidth, &maxCharHeight); + int w = maxCharWidth + 5, + h = maxCharHeight + 4; - // the origin for our table - int x = 5, - y = 2*h + 5; // print all font symbols from 32 to 256 in 7 rows of 32 chars each - for ( int i = 1; i < 8; i++ ) + for ( int i = 0; i < 7; i++ ) { for ( int j = 0; j < 32; j++ ) { - dc.DrawText(char(32*i + j), x + w*j, y + h*i); + wxChar c = 32 * (i + 1) + j; + + long charWidth, charHeight; + dc.GetTextExtent(c, &charWidth, &charHeight); + dc.DrawText + ( + c, + x + w*j + (maxCharWidth - charWidth) / 2 + 1, + y + h*i + (maxCharHeight - charHeight) / 2 + ); } } @@ -391,50 +755,16 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) int l; // horizontal - y += h; for ( l = 0; l < 8; l++ ) { int yl = y + h*l - 2; - dc.DrawLine(x - 2, yl, x + 32*w - 2, yl); + dc.DrawLine(x - 2, yl, x + 32*w - 1, yl); } // and vertical for ( l = 0; l < 33; l++ ) { int xl = x + w*l - 2; - dc.DrawLine(xl, y, xl, y + 7*h - 2); - } -} - -// ---------------------------------------------------------------------------- -// MyFontDialog -// ---------------------------------------------------------------------------- - -MyFontDialog::MyFontDialog(MyFrame *frame) - : wxDialog(frame, -1, wxString("Edit font attributes")) -{ - m_canvas = frame->GetCanvas(); - - // create controls - wxSize sizeBtn = wxButton::GetDefaultSize(); - - // TODO - - // position and size the dialog - SetClientSize(4*sizeBtn.x, 10*sizeBtn.y); - Centre(); -} - -void MyFontDialog::DoApply() -{ - wxFont font; //(size, family, style, weight, underlined, face, encoding); - if ( !font.Ok() ) - { - wxLogError("Font creation failed."); - } - else - { - m_canvas->SetTextFont(font); - m_canvas->Refresh(); + dc.DrawLine(xl, y - 2, xl, y + 7*h - 1); } }