add busycursors and remove fonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
13b59a33b4
commit
b3630c4fb4
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;x<ct_BrowserDB->numTables;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;
|
||||
}
|
||||
//---------------------------------------------------------------------------
|
||||
|
@ -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
|
||||
|
@ -1,2 +0,0 @@
|
||||
DBBrowse
|
||||
|
@ -1,2 +0,0 @@
|
||||
set WXWIN=F:\wxWindows
|
||||
nmake -f makefile.vc FINAL=1
|
@ -1,5 +0,0 @@
|
||||
set WXWIN=F:/wxWindows22B
|
||||
set WXWIN=F:/wxWindows
|
||||
make -f makefile.g95
|
||||
rem st
|
||||
set WXWIN=F:\wxWindows
|
@ -1,3 +0,0 @@
|
||||
set WXWIN=F:\wxWindows22B
|
||||
set WXWIN=F:\wxWindows
|
||||
nmake -f makefile.vc FINAL=1
|
@ -1,4 +0,0 @@
|
||||
erase *.res
|
||||
erase *.obj
|
||||
erase *.o
|
||||
go
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user