show the standard wxWin fonts (modified patch 530698)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,7 +17,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// for all others, include the necessary headers (this file is usually all you
|
// for all others, include the necessary headers (this file is usually all you
|
||||||
// need because it includes almost all <standard< wxWindows headers
|
// need because it includes almost all standard wxWindows headers
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/wx.h"
|
#include "wx/wx.h"
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ class MyCanvas: public wxWindow
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MyCanvas( wxWindow *parent );
|
MyCanvas( wxWindow *parent );
|
||||||
~MyCanvas();
|
virtual ~MyCanvas();
|
||||||
|
|
||||||
// accessors for the frame
|
// accessors for the frame
|
||||||
const wxFont& GetTextFont() const { return m_font; }
|
const wxFont& GetTextFont() const { return m_font; }
|
||||||
@@ -93,6 +93,8 @@ public:
|
|||||||
void OnItalic(wxCommandEvent& event);
|
void OnItalic(wxCommandEvent& event);
|
||||||
void OnUnderline(wxCommandEvent& event);
|
void OnUnderline(wxCommandEvent& event);
|
||||||
|
|
||||||
|
void OnwxPointerFont(wxCommandEvent& event);
|
||||||
|
|
||||||
void OnViewMsg(wxCommandEvent& event);
|
void OnViewMsg(wxCommandEvent& event);
|
||||||
void OnSelectFont(wxCommandEvent& event);
|
void OnSelectFont(wxCommandEvent& event);
|
||||||
void OnEnumerateFamiliesForEncoding(wxCommandEvent& event);
|
void OnEnumerateFamiliesForEncoding(wxCommandEvent& event);
|
||||||
@@ -138,6 +140,11 @@ enum
|
|||||||
Font_Bold,
|
Font_Bold,
|
||||||
Font_Italic,
|
Font_Italic,
|
||||||
Font_Underlined,
|
Font_Underlined,
|
||||||
|
Font_wxNORMAL_FONT,
|
||||||
|
Font_wxSMALL_FONT,
|
||||||
|
Font_wxITALIC_FONT,
|
||||||
|
Font_wxSWISS_FONT,
|
||||||
|
|
||||||
Font_Choose = 100,
|
Font_Choose = 100,
|
||||||
Font_EnumFamiliesForEncoding,
|
Font_EnumFamiliesForEncoding,
|
||||||
Font_EnumFamilies,
|
Font_EnumFamilies,
|
||||||
@@ -164,6 +171,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
|||||||
EVT_MENU(Font_Bold, MyFrame::OnBold)
|
EVT_MENU(Font_Bold, MyFrame::OnBold)
|
||||||
EVT_MENU(Font_Italic, MyFrame::OnItalic)
|
EVT_MENU(Font_Italic, MyFrame::OnItalic)
|
||||||
EVT_MENU(Font_Underlined, MyFrame::OnUnderline)
|
EVT_MENU(Font_Underlined, MyFrame::OnUnderline)
|
||||||
|
|
||||||
|
EVT_MENU(Font_wxNORMAL_FONT, MyFrame::OnwxPointerFont)
|
||||||
|
EVT_MENU(Font_wxSMALL_FONT, MyFrame::OnwxPointerFont)
|
||||||
|
EVT_MENU(Font_wxITALIC_FONT, MyFrame::OnwxPointerFont)
|
||||||
|
EVT_MENU(Font_wxSWISS_FONT, MyFrame::OnwxPointerFont)
|
||||||
|
|
||||||
EVT_MENU(Font_CheckNativeToFromString, MyFrame::OnCheckNativeToFromString)
|
EVT_MENU(Font_CheckNativeToFromString, MyFrame::OnCheckNativeToFromString)
|
||||||
|
|
||||||
EVT_MENU(Font_Choose, MyFrame::OnSelectFont)
|
EVT_MENU(Font_Choose, MyFrame::OnSelectFont)
|
||||||
@@ -233,6 +246,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
|||||||
menuFont->Append(Font_Italic, "&Oblique\tCtrl-O", "Toggle italic state", TRUE);
|
menuFont->Append(Font_Italic, "&Oblique\tCtrl-O", "Toggle italic state", TRUE);
|
||||||
menuFont->Append(Font_Underlined, "&Underlined\tCtrl-U",
|
menuFont->Append(Font_Underlined, "&Underlined\tCtrl-U",
|
||||||
"Toggle underlined state", TRUE);
|
"Toggle underlined state", TRUE);
|
||||||
|
|
||||||
menuFont->AppendSeparator();
|
menuFont->AppendSeparator();
|
||||||
menuFont->Append(Font_CheckNativeToFromString,
|
menuFont->Append(Font_CheckNativeToFromString,
|
||||||
"Check Native Font Info To/From String");
|
"Check Native Font Info To/From String");
|
||||||
@@ -240,6 +254,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
|||||||
wxMenu *menuSelect = new wxMenu;
|
wxMenu *menuSelect = new wxMenu;
|
||||||
menuSelect->Append(Font_Choose, "&Select font...\tCtrl-S",
|
menuSelect->Append(Font_Choose, "&Select font...\tCtrl-S",
|
||||||
"Select a standard font");
|
"Select a standard font");
|
||||||
|
|
||||||
|
wxMenu *menuStdFonts = new wxMenu;
|
||||||
|
menuStdFonts->Append(Font_wxNORMAL_FONT, "wxNORMAL_FONT", "Normal font used by wxWindows");
|
||||||
|
menuStdFonts->Append(Font_wxSMALL_FONT, "wxSMALL_FONT", "Small font used by wxWindows");
|
||||||
|
menuStdFonts->Append(Font_wxITALIC_FONT, "wxITALIC_FONT", "Italic font used by wxWindows");
|
||||||
|
menuStdFonts->Append(Font_wxSWISS_FONT, "wxSWISS_FONT", "Swiss font used by wxWindows");
|
||||||
|
menuSelect->Append(-2, "Standar&d fonts", menuStdFonts);
|
||||||
|
|
||||||
menuSelect->AppendSeparator();
|
menuSelect->AppendSeparator();
|
||||||
menuSelect->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F");
|
menuSelect->Append(Font_EnumFamilies, "Enumerate font &families\tCtrl-F");
|
||||||
menuSelect->Append(Font_EnumFixedFamilies,
|
menuSelect->Append(Font_EnumFixedFamilies,
|
||||||
@@ -484,6 +506,26 @@ void MyFrame::OnUnderline(wxCommandEvent& event)
|
|||||||
DoChangeFont(font);
|
DoChangeFont(font);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MyFrame::OnwxPointerFont(wxCommandEvent& event)
|
||||||
|
{
|
||||||
|
wxFont font;
|
||||||
|
|
||||||
|
switch (event.GetId())
|
||||||
|
{
|
||||||
|
case Font_wxNORMAL_FONT : font = wxFont(*wxNORMAL_FONT); break;
|
||||||
|
case Font_wxSMALL_FONT : font = wxFont(*wxSMALL_FONT); break;
|
||||||
|
case Font_wxITALIC_FONT : font = wxFont(*wxITALIC_FONT); break;
|
||||||
|
case Font_wxSWISS_FONT : font = wxFont(*wxSWISS_FONT); break;
|
||||||
|
default : font = wxFont(*wxNORMAL_FONT); break;
|
||||||
|
}
|
||||||
|
|
||||||
|
GetMenuBar()->Check(Font_Bold, FALSE);
|
||||||
|
GetMenuBar()->Check(Font_Italic, FALSE);
|
||||||
|
GetMenuBar()->Check(Font_Underlined, FALSE);
|
||||||
|
|
||||||
|
DoChangeFont(font);
|
||||||
|
}
|
||||||
|
|
||||||
void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
|
void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
|
||||||
{
|
{
|
||||||
m_canvas->SetTextFont(font);
|
m_canvas->SetTextFont(font);
|
||||||
|
Reference in New Issue
Block a user