Add system fonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
b8365facc3
commit
c45a4560f8
@ -60,7 +60,8 @@ BEGIN_EVENT_TABLE(DBGrid, wxGrid)
|
|||||||
wxGrid(parent, id, pos, size, style)
|
wxGrid(parent, id, pos, size, style)
|
||||||
{
|
{
|
||||||
//f_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
|
//f_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
|
||||||
//wxPanel::SetFont(* f_Temp);
|
f_Temp = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
|
||||||
|
wxPanel::SetFont(* f_Temp);
|
||||||
b_EditModus = TRUE;
|
b_EditModus = TRUE;
|
||||||
//----------------------------------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------------------------------
|
||||||
popupMenu1 = new wxMenu("");
|
popupMenu1 = new wxMenu("");
|
||||||
|
@ -25,7 +25,7 @@ class DBGrid: public wxGrid
|
|||||||
int i_ViewNr; // View Nummer in Tab / Page
|
int i_ViewNr; // View Nummer in Tab / Page
|
||||||
int i_Which; // Which View, Database is this/using
|
int i_Which; // Which View, Database is this/using
|
||||||
//-------------------------------------------
|
//-------------------------------------------
|
||||||
// wxFont* f_Temp;
|
wxFont* f_Temp;
|
||||||
mjDoc* pDoc;
|
mjDoc* pDoc;
|
||||||
wxDbInf* ct_BrowserDB;
|
wxDbInf* ct_BrowserDB;
|
||||||
BrowserDB* db_Br;
|
BrowserDB* db_Br;
|
||||||
|
@ -61,7 +61,8 @@ DBTree::DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const w
|
|||||||
: wxTreeCtrl(parent, id, pos, size, style)
|
: wxTreeCtrl(parent, id, pos, size, style)
|
||||||
{
|
{
|
||||||
//wxFont* ft_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
|
//wxFont* ft_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
|
||||||
//SetFont(* ft_Temp);
|
wxFont* ft_Temp = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
|
||||||
|
SetFont(* ft_Temp);
|
||||||
|
|
||||||
// Make an image list containing small icons
|
// Make an image list containing small icons
|
||||||
p_imageListNormal = new wxImageList(16, 16, TRUE);
|
p_imageListNormal = new wxImageList(16, 16, TRUE);
|
||||||
|
@ -116,7 +116,8 @@ bool mjDoc::OnInitView()
|
|||||||
p_LogWin = new wxTextCtrl(p_PageArea,-1,wxEmptyString,
|
p_LogWin = new wxTextCtrl(p_PageArea,-1,wxEmptyString,
|
||||||
wxDefaultPosition, wxDefaultSize,wxTE_MULTILINE );
|
wxDefaultPosition, wxDefaultSize,wxTE_MULTILINE );
|
||||||
//wxFont* ft_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
|
//wxFont* ft_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
|
||||||
//p_LogWin->SetFont(* ft_Temp);
|
wxFont* ft_Temp = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
|
||||||
|
p_LogWin->SetFont(* ft_Temp);
|
||||||
// Don't forget ! This is always : i_TabArt = 0 ; i_ViewNr = 1;
|
// Don't forget ! This is always : i_TabArt = 0 ; i_ViewNr = 1;
|
||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
p_LogBook = new wxLogTextCtrl(p_LogWin); // make p_LogWin the LogBook
|
p_LogBook = new wxLogTextCtrl(p_LogWin); // make p_LogWin the LogBook
|
||||||
|
@ -65,7 +65,8 @@ PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const
|
|||||||
: wxTreeCtrl(parent, id, pos, size, style)
|
: wxTreeCtrl(parent, id, pos, size, style)
|
||||||
{
|
{
|
||||||
//wxFont* ft_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
|
//wxFont* ft_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
|
||||||
//SetFont(* ft_Temp);
|
wxFont* ft_Temp = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
|
||||||
|
SetFont(* ft_Temp);
|
||||||
|
|
||||||
// Make an image list containing small icons
|
// Make an image list containing small icons
|
||||||
p_imageListNormal = new wxImageList(16, 16, TRUE);
|
p_imageListNormal = new wxImageList(16, 16, TRUE);
|
||||||
|
Loading…
Reference in New Issue
Block a user