[ShareDaemon-CVS] ui-wx/src Images.cpp,1.17,1.18 Images.h,1.12,1.13 MainDlg.cpp,1.7,1.8

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

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

Modified Files:
	Images.cpp Images.h MainDlg.cpp 
Log Message:
Fixed toolbar images for win32.

Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Images.cpp	23 Nov 2003 18:55:08 -0000	1.17
+++ Images.cpp	23 Nov 2003 20:15:28 -0000	1.18
@@ -161,6 +161,9 @@
 			width = x;
 		}
 	}
+	tool_img_width = width+6;
+
+	mdc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID));
 
 	tmp_new = wxBitmap(width+6, y+36);
 	mdc.SelectObject(tmp_new);

Index: Images.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Images.h	23 Nov 2003 15:53:17 -0000	1.12
+++ Images.h	23 Nov 2003 20:15:28 -0000	1.13
@@ -43,6 +43,7 @@
 		btn_statistics, btn_guisettings, btn_preferences, logo,
 		leftarrow, rightarrow;
 	void MakeToolImages();
+	int tool_img_width;
 private:
 	void LoadImages();
 };

Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MainDlg.cpp	23 Nov 2003 15:53:17 -0000	1.7
+++ MainDlg.cpp	23 Nov 2003 20:15:28 -0000	1.8
@@ -233,7 +233,7 @@
 		tool_align|wxNO_BORDER|wxTB_3DBUTTONS
 	);
 
-	tb->SetToolBitmapSize(wxSize(40, 40));
+	tb->SetToolBitmapSize(wxSize(img->tool_img_width, 52));
 	tb->SetMargins(2, 2);
 
 	/* Add the buttons */