[ShareDaemon-CVS] ui-wx/src Images.cpp,1.18,1.19 MainDlg.cpp,1.8,1.9

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

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

Modified Files:
	Images.cpp MainDlg.cpp 
Log Message:
Well, toolbar now looks decent both in WinXP and SuSE9.

Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Images.cpp	23 Nov 2003 20:15:28 -0000	1.18
+++ Images.cpp	24 Nov 2003 06:18:21 -0000	1.19
@@ -40,6 +40,7 @@
 void CImages::LoadImages() {
 	wxString path, apppath;
 	wxChar sep;
+	tool_img_width = 32;
 
 	/**
 	 * We get the application binary path from argv[0], remove the binary

Index: MainDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- MainDlg.cpp	23 Nov 2003 20:15:28 -0000	1.8
+++ MainDlg.cpp	24 Nov 2003 06:18:21 -0000	1.9
@@ -105,7 +105,9 @@
 	LoadAndShowDialogPages();
 
 	/* Generate images for toolbar */
+	#if !defined(__WXGTK__)
 	img->MakeToolImages();
+	#endif
 
 	/**
 	 * Toolbar and Menubar must be created AFTER loading dialog pages,
@@ -231,6 +233,11 @@
 	wxToolBar *tb = new wxToolBar(
 		this, -1, wxDefaultPosition, wxDefaultSize,
 		tool_align|wxNO_BORDER|wxTB_3DBUTTONS
+	#if defined(__WXGTK__)
+		|wxTB_TEXT
+	#else
+		|wxTB_FLAT
+	#endif
 	);
 
 	tb->SetToolBitmapSize(wxSize(img->tool_img_width, 52));