[ShareDaemon-CVS] ui-wx/src Images.cpp,1.24,1.25 Images.h,1.14,1.15 MainDlg.cpp,1.16,1.17

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

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

Modified Files:
	Images.cpp Images.h MainDlg.cpp 
Log Message:
toolimage height is also now stored globally accessibly

Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Images.cpp	27 Nov 2003 12:54:27 -0000	1.24
+++ Images.cpp	27 Nov 2003 13:52:51 -0000	1.25
@@ -178,10 +178,12 @@
 			width = x;
 		}
 	}
-	tool_img_width = width+6;
-
+	/* local storage */
 	width = width+6;
 	height = y+38;
+	/* global, for accessing from outside */
+	tool_img_width = width;
+	tool_img_height = height;
 
 	wxString background;
 	m_config->Read(wxT("/General/ToolButtonBackground"), &background, wxT("LIGHT BLUE"));

Index: Images.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Images.h	27 Nov 2003 08:23:11 -0000	1.14
+++ Images.h	27 Nov 2003 13:52:51 -0000	1.15
@@ -38,7 +38,7 @@
 	CImages();
 	virtual ~CImages();
 	void MakeToolImages();
-	int tool_img_width;
+	int tool_img_width, tool_img_height;
 	void LoadImages();
 	wxBitmap& GetImage(const wxString &name);
 	void UpdateImages(wxWindow *parent);

Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- MainDlg.cpp	27 Nov 2003 13:43:43 -0000	1.16
+++ MainDlg.cpp	27 Nov 2003 13:52:51 -0000	1.17
@@ -242,7 +242,7 @@
 	/* Generate toolbar images */
 	img->MakeToolImages();
 
-	tb->SetToolBitmapSize(wxSize(img->tool_img_width, 52));
+	tb->SetToolBitmapSize(wxSize(img->tool_img_width, img->tool_img_height));
 	tb->SetMargins(2, 2);
 
 	/* Add the buttons */