From c45a4560f8f3f569eeb09a3a2f4fb11ff884a18d Mon Sep 17 00:00:00 2001 From: "Bart A.M. Jourquin" Date: Tue, 1 Feb 2000 09:16:04 +0000 Subject: [PATCH] Add system fonts git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- demos/dbbrowse/dbgrid.cpp | 3 ++- demos/dbbrowse/dbgrid.h | 2 +- demos/dbbrowse/dbtree.cpp | 3 ++- demos/dbbrowse/doc.cpp | 3 ++- demos/dbbrowse/pgmctrl.cpp | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/demos/dbbrowse/dbgrid.cpp b/demos/dbbrowse/dbgrid.cpp index d9263171ac..0d92e60299 100644 --- a/demos/dbbrowse/dbgrid.cpp +++ b/demos/dbbrowse/dbgrid.cpp @@ -60,7 +60,8 @@ BEGIN_EVENT_TABLE(DBGrid, wxGrid) wxGrid(parent, id, pos, size, style) { //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; //---------------------------------------------------------------------------------------------------------------------------- popupMenu1 = new wxMenu(""); diff --git a/demos/dbbrowse/dbgrid.h b/demos/dbbrowse/dbgrid.h index efe053ab3f..c9c3467d57 100644 --- a/demos/dbbrowse/dbgrid.h +++ b/demos/dbbrowse/dbgrid.h @@ -25,7 +25,7 @@ class DBGrid: public wxGrid int i_ViewNr; // View Nummer in Tab / Page int i_Which; // Which View, Database is this/using //------------------------------------------- -// wxFont* f_Temp; + wxFont* f_Temp; mjDoc* pDoc; wxDbInf* ct_BrowserDB; BrowserDB* db_Br; diff --git a/demos/dbbrowse/dbtree.cpp b/demos/dbbrowse/dbtree.cpp index 1d58d98d78..87efc3215d 100644 --- a/demos/dbbrowse/dbtree.cpp +++ b/demos/dbbrowse/dbtree.cpp @@ -61,7 +61,8 @@ DBTree::DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const w : wxTreeCtrl(parent, id, pos, size, style) { //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 p_imageListNormal = new wxImageList(16, 16, TRUE); diff --git a/demos/dbbrowse/doc.cpp b/demos/dbbrowse/doc.cpp index cc036dc878..64305d1f08 100644 --- a/demos/dbbrowse/doc.cpp +++ b/demos/dbbrowse/doc.cpp @@ -116,7 +116,8 @@ bool mjDoc::OnInitView() p_LogWin = new wxTextCtrl(p_PageArea,-1,wxEmptyString, wxDefaultPosition, wxDefaultSize,wxTE_MULTILINE ); //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; //------------------------------------------------------------------ p_LogBook = new wxLogTextCtrl(p_LogWin); // make p_LogWin the LogBook diff --git a/demos/dbbrowse/pgmctrl.cpp b/demos/dbbrowse/pgmctrl.cpp index 46562e9d0a..5522bd9e8b 100644 --- a/demos/dbbrowse/pgmctrl.cpp +++ b/demos/dbbrowse/pgmctrl.cpp @@ -65,7 +65,8 @@ PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const : wxTreeCtrl(parent, id, pos, size, style) { //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 p_imageListNormal = new wxImageList(16, 16, TRUE); -- 2.45.2