From b3630c4fb4af766d972b5b70df7ea4d5a2e10472 Mon Sep 17 00:00:00 2001 From: "Bart A.M. Jourquin" Date: Mon, 31 Jan 2000 15:02:05 +0000 Subject: [PATCH 1/1] add busycursors and remove fonts git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- demos/dbbrowse/dbgrid.cpp | 9 ++++++--- demos/dbbrowse/dbgrid.h | 2 +- demos/dbbrowse/dbtree.cpp | 12 +++++++----- demos/dbbrowse/doc.cpp | 4 ++-- demos/dbbrowse/g.cmd | 2 -- demos/dbbrowse/go.cmd | 2 -- demos/dbbrowse/gogcc.cmd | 5 ----- demos/dbbrowse/govc.cmd | 3 --- demos/dbbrowse/o.cmd | 4 ---- demos/dbbrowse/pgmctrl.cpp | 4 ++-- 10 files changed, 18 insertions(+), 29 deletions(-) delete mode 100755 demos/dbbrowse/g.cmd delete mode 100755 demos/dbbrowse/go.cmd delete mode 100755 demos/dbbrowse/gogcc.cmd delete mode 100755 demos/dbbrowse/govc.cmd delete mode 100755 demos/dbbrowse/o.cmd diff --git a/demos/dbbrowse/dbgrid.cpp b/demos/dbbrowse/dbgrid.cpp index 0c5369ffae..d9263171ac 100644 --- a/demos/dbbrowse/dbgrid.cpp +++ b/demos/dbbrowse/dbgrid.cpp @@ -59,8 +59,8 @@ BEGIN_EVENT_TABLE(DBGrid, wxGrid) DBGrid::DBGrid(wxWindow *parent, const wxWindowID id,const wxPoint& pos,const wxSize& size, long style): 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(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS"); + //wxPanel::SetFont(* f_Temp); b_EditModus = TRUE; //---------------------------------------------------------------------------------------------------------------------------- popupMenu1 = new wxMenu(""); @@ -78,7 +78,9 @@ int DBGrid::OnTableView(wxString Table) //--------------------------------------------------------------------------- int i=0,x,y,z, ValidTable=0; wxString Temp0; - SetLabelFont(* f_Temp); + //SetLabelFont(* f_Temp); + + wxBeginBusyCursor(); //--------------------------------------------------------------------------- ct_BrowserDB = (db_Br+i_Which)->ct_BrowserDB; // Get the DSN Pointer //---------------------------------------------------------------------------- @@ -135,6 +137,7 @@ int DBGrid::OnTableView(wxString Table) //--------------------------------------------------------------------------- Weiter: SetEditInPlace(b_EditModus); // Activate in-place Editing (FALSE) + wxEndBusyCursor(); //--------------------------------------------------------------------------- wxLogMessage(_("-I-> DBGrid::OnTableView() - End")); return 0; diff --git a/demos/dbbrowse/dbgrid.h b/demos/dbbrowse/dbgrid.h index 72ada4019e..e6191d2ed7 100644 --- a/demos/dbbrowse/dbgrid.h +++ b/demos/dbbrowse/dbgrid.h @@ -20,7 +20,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 e5b8303a7c..daacec77bf 100644 --- a/demos/dbbrowse/dbtree.cpp +++ b/demos/dbbrowse/dbtree.cpp @@ -60,8 +60,8 @@ BEGIN_EVENT_TABLE(DBTree, wxTreeCtrl) DBTree::DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size, long style) : 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(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS"); + //SetFont(* ft_Temp); // Make an image list containing small icons p_imageListNormal = new wxImageList(16, 16, TRUE); @@ -111,10 +111,11 @@ int DBTree::OnPopulate() wxTreeItemId Root, Folder, Docu, Funkt; int i,x,y; wxString SQL_TYPE, DB_TYPE; - wxBeginBusyCursor(); + //---------------------------------------------------------------------------------------------------------------------------- if((pDoc->db_Br+i_Which)->Initialize(FALSE)) { + wxBeginBusyCursor(); ct_BrowserDB = (pDoc->db_Br+i_Which)->OnGetCatalog(FALSE); if (ct_BrowserDB) { // Use the wxDatabase Information @@ -122,6 +123,7 @@ int DBTree::OnPopulate() Root = AddRoot(Temp0,TreeIc_DsnOpen,TreeIc_DsnOpen,new DBTreeData("Root")); for (x=0;xnumTables;x++) { + wxYield(); if (!wxStrcmp((ct_BrowserDB->pTableInf+x)->tableType,"TABLE")) // only TABLES { Temp0.Printf(_("Tablename(%s) with (%d)Columns ; Remarks(%s)"), (ct_BrowserDB->pTableInf+x)->tableName, @@ -187,10 +189,10 @@ int DBTree::OnPopulate() } // if (ct_BrowserDB) else wxLogMessage(_("\n-E-> DBTree::OnPopulate() : Invalid Catalog Pointer : Failed")); + wxEndBusyCursor(); } // if((pDoc->db_Br+i_Which)->Initialize(FALSE)) else { - wxEndBusyCursor(); return 0; //wxLogMessage(_("\n-E-> DBTree::OnPopulate() : A valid Pointer could not be created : Failed")); } @@ -208,7 +210,7 @@ int DBTree::OnPopulate() popupMenu2->AppendSeparator(); popupMenu2->Append(DATA_TABLE, _("Make wxTable.cpp/h ")); //---------------------------------------------------------------------------------------------------------------------------- - wxEndBusyCursor(); + return 0; } //--------------------------------------------------------------------------- diff --git a/demos/dbbrowse/doc.cpp b/demos/dbbrowse/doc.cpp index 10b7d1d311..5a3c0cdb2a 100644 --- a/demos/dbbrowse/doc.cpp +++ b/demos/dbbrowse/doc.cpp @@ -115,8 +115,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(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS"); + //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/g.cmd b/demos/dbbrowse/g.cmd deleted file mode 100755 index 164b338e58..0000000000 --- a/demos/dbbrowse/g.cmd +++ /dev/null @@ -1,2 +0,0 @@ - DBBrowse - diff --git a/demos/dbbrowse/go.cmd b/demos/dbbrowse/go.cmd deleted file mode 100755 index b5db2de141..0000000000 --- a/demos/dbbrowse/go.cmd +++ /dev/null @@ -1,2 +0,0 @@ - set WXWIN=F:\wxWindows - nmake -f makefile.vc FINAL=1 diff --git a/demos/dbbrowse/gogcc.cmd b/demos/dbbrowse/gogcc.cmd deleted file mode 100755 index 25605df667..0000000000 --- a/demos/dbbrowse/gogcc.cmd +++ /dev/null @@ -1,5 +0,0 @@ - set WXWIN=F:/wxWindows22B - set WXWIN=F:/wxWindows - make -f makefile.g95 - rem st - set WXWIN=F:\wxWindows diff --git a/demos/dbbrowse/govc.cmd b/demos/dbbrowse/govc.cmd deleted file mode 100755 index 11bfe912c7..0000000000 --- a/demos/dbbrowse/govc.cmd +++ /dev/null @@ -1,3 +0,0 @@ - set WXWIN=F:\wxWindows22B - set WXWIN=F:\wxWindows - nmake -f makefile.vc FINAL=1 diff --git a/demos/dbbrowse/o.cmd b/demos/dbbrowse/o.cmd deleted file mode 100755 index 2d8f01386e..0000000000 --- a/demos/dbbrowse/o.cmd +++ /dev/null @@ -1,4 +0,0 @@ - erase *.res - erase *.obj - erase *.o - go diff --git a/demos/dbbrowse/pgmctrl.cpp b/demos/dbbrowse/pgmctrl.cpp index 1b55d2d0aa..46562e9d0a 100644 --- a/demos/dbbrowse/pgmctrl.cpp +++ b/demos/dbbrowse/pgmctrl.cpp @@ -64,8 +64,8 @@ BEGIN_EVENT_TABLE(PgmCtrl, wxTreeCtrl) PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size, long style) : 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(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS"); + //SetFont(* ft_Temp); // Make an image list containing small icons p_imageListNormal = new wxImageList(16, 16, TRUE); -- 2.47.2