Add system fonts

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/dbbrowse/dbgrid.cpp b/demos/dbbrowse/dbgrid.cpp
index d9263171aca584ccddcd2f60ef0c590a282e0182..0d92e602994ec7054b33a55ad27a89552b1c9e44 100644 (file)
--- 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");
     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("");
   b_EditModus = TRUE;
   //----------------------------------------------------------------------------------------------------------------------------
   popupMenu1 = new wxMenu("");

diff --git a/demos/dbbrowse/dbgrid.h b/demos/dbbrowse/dbgrid.h
index efe053ab3f434975f3a00a32a1fb518c71407598..c9c3467d577efc1d97d03ed6de2bc5d3f168c409 100644 (file)
--- 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
  //-------------------------------------------
   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;
   mjDoc*     pDoc;
   wxDbInf*   ct_BrowserDB;
   BrowserDB* db_Br;

diff --git a/demos/dbbrowse/dbtree.cpp b/demos/dbbrowse/dbtree.cpp
index 1d58d98d78c36018b806030330a8a690c5360bbc..87efc3215da70a5cff27ab60cce87124f945a110 100644 (file)
--- 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");
   : 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);
   
   // 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 cc036dc8788f4a05d8c5bc8ed8274ee5f7d59c5d..64305d1f0874f4463628ae112d0db2a45923b0a4 100644 (file)
--- 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 = 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
   // 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 46562e9d0a49ef621639ab63064d89c90088a60e..5522bd9e8b6ccc3643402a344b4003f21d9bbee8 100644 (file)
--- 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");
   : 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);
   
   // Make an image list containing small icons
   p_imageListNormal = new wxImageList(16, 16, TRUE);