[ShareDaemon-CVS] ui-wx/src MainDlg.cpp,1.56,1.57

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1215

Modified Files:
	MainDlg.cpp 
Log Message:
Removed extranous timers

Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- MainDlg.cpp	30 Dec 2003 11:34:31 -0000	1.56
+++ MainDlg.cpp	30 Dec 2003 13:33:11 -0000	1.57
@@ -304,7 +304,6 @@
 /* @gen_images		If true, also (re)generates images                    */
 /******************************************************************************/
 void CMainDlg::CreateMyToolBar(bool gen_images) {
-TIMER_START(wxT("CMainDlg::CreateMyToolBar"));
 int tool_align;                 /* For storing values read from configuration */
 bool show_tool;                 /* For storing values read from configuration */
 unsigned int i;                                               /* Loop counter */
@@ -351,12 +350,11 @@
 	/* There we create actual buttons */
 	GenerateToolBarButtons(tb, gen_images, tool_align);
 
-	tb->Realize();
+	tb->Realize();             /* This one takes 300+ms, causing delay :( */
 	SetToolBar(tb);
 	tb->Refresh();                                /* Fix for wxMac issues */
 	Layout();                           /* Needed after deleting/creation */
 	UpdateToolBar();
-TIMER_STOP();
 }
 
 /***************************************************** GenerateToolBarButtons */
@@ -371,7 +369,6 @@
 void CMainDlg::GenerateToolBarButtons(
 	MyToolBar *tb, bool gen_images, int tool_align
 ) {
-TIMER_START(wxT("CMainDlg::GenerateToolBarButtons"));
 wxArrayString names, images;                 /* Names/images for multibuttons */
 int ids[2];                           /* Identifiers for multibutton controls */
 unsigned int i;                                               /* Loop counter */
@@ -492,7 +489,6 @@
 		wxT("Change GUI Settings")
 	);
 #endif
-TIMER_STOP();
 }
 
 /************************************************************** OnCloseWindow */
@@ -1187,7 +1183,6 @@
 /* through the list of pages and calling images->UpdateImages on each of them.*/
 /******************************************************************************/
 void CMainDlg::UpdateImages() {
-TIMER_START(wxT("CMainDlg::UpdateImages"));
 	img->LoadImages();
 	wxLogDebug(wxT("Updating all pages images..."));
 	for (size_t i=0;i<pages.GetCount();i++) {
@@ -1206,5 +1201,4 @@
 #if defined(wxHAS_TASK_BAR_ICON) && defined(__WXMSW__)
 	systray->SetIcon(icon);
 #endif
-TIMER_STOP();
 }