[ShareDaemon-CVS] ui-wx/src GUISettingsDlg.cpp,1.31,1.32 MainDlg.cpp,1.41,1.42

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

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

Modified Files:
	GUISettingsDlg.cpp MainDlg.cpp 
Log Message:
Fixed toolbar images updating after iconset change. Removed mainframe flickering during iconset changing.

Index: GUISettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- GUISettingsDlg.cpp	26 Dec 2003 11:36:32 -0000	1.31
+++ GUISettingsDlg.cpp	27 Dec 2003 07:39:54 -0000	1.32
@@ -245,18 +245,15 @@
 
 	/* If iconset setting was changed update the images in gui */
 	if (old_icon_set != icon_set) {
-		/* Reload images */
+		mainframe->Freeze();
+
 		img->LoadImages();
-		/* Update static bitmaps */
 		img->UpdateImages(mainframe);
-		/* Recreate toolbar */
 		mainframe->CreateMyToolBar(true);
-		/* Update server page logbook */
 		serverwnd->SetLogBookImages();
-		/* Update statistics tree */
 		statisticswnd->GetTree()->GetTreeImages();
 		statisticswnd->GetTree()->GenerateTree();
-		/* Main frame and systray icons */
+
 		wxIcon icon;
 		icon.CopyFromBitmap(img->GetImage(wxT("mule")));
 		mainframe->SetIcon(icon);
@@ -265,6 +262,8 @@
 		systray->SetIcon(icon);
 	#endif
 #endif
+
+		mainframe->Thaw();
 	}
 }
 

Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- MainDlg.cpp	27 Dec 2003 07:18:20 -0000	1.41
+++ MainDlg.cpp	27 Dec 2003 07:39:54 -0000	1.42
@@ -315,7 +315,7 @@
 		tool_align|wxNO_BORDER|wxTB_3DBUTTONS|wxTB_FLAT|wxCLIP_CHILDREN
 	);
 
-	if (start_up) {
+	if (start_up || gen_images) {
 		wxArrayString names;
 		for (i=0;i<pages.GetCount();i++) {
 			if (pages.IsEmpty()) {