[Scummvm-cvs-logs] CVS: scummex wxwindows.cpp,1.26,1.27

[Max Horn]

Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1:/tmp/cvs-serv2596

Modified Files:
	wxwindows.cpp 
Log Message:
fix toolbar on Mac OS X (now I hope this doesn't cause problems elsewhere...)

Index: wxwindows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- wxwindows.cpp	27 Sep 2003 15:55:45 -0000	1.26
+++ wxwindows.cpp	28 Sep 2003 09:31:11 -0000	1.27
@@ -622,25 +622,25 @@
 
 	SetThemeEnabled(true);
 	
-	ToolBar = CreateToolBar(wxTB_FLAT, -1, "toolBar");
+	ToolBar = CreateToolBar();
 	
 	ToolBar->SetToolBitmapSize(wxSize(16, 16));
 	
-	ToolBar->AddTool(wxID_OPEN, "Open...", OpenIcon, wxNullBitmap, wxITEM_NORMAL, "Open...", "Open resource file", NULL);
-	ToolBar->AddTool(wxID_CLOSE, "Close", CloseIcon, wxNullBitmap, wxITEM_NORMAL, "Close", "Close resource file", NULL);
+	ToolBar->AddTool(wxID_OPEN, OpenIcon, "Open...", "Open resource file");
+	ToolBar->AddTool(wxID_CLOSE, CloseIcon, "Close", "Close resource file");
 	ToolBar->EnableTool(wxID_CLOSE, FALSE);
-	ToolBar->AddTool(ID_FileInfo, "File Info", FileIcon, wxNullBitmap, wxITEM_NORMAL, "File Info", "Show File Info", NULL);
+	ToolBar->AddTool(ID_FileInfo, FileIcon, "File Info", "Show File Info");
 	ToolBar->EnableTool(ID_FileInfo, FALSE);
-	ToolBar->AddTool(wxID_EXIT, "Exit", ExitIcon, wxNullBitmap, wxITEM_NORMAL, "Exit", "Exit ScummEX", NULL);
+	ToolBar->AddTool(wxID_EXIT, ExitIcon, "Exit", "Exit ScummEX");
 	ToolBar->AddSeparator();
-	ToolBar->AddTool(ID_Dump, "File Dump", SaveIcon, wxNullBitmap, wxITEM_NORMAL, "File Dump", "Dump block to disk", NULL);
+	ToolBar->AddTool(ID_Dump, SaveIcon, "File Dump", "Dump block to disk");
 	ToolBar->EnableTool(ID_Dump, FALSE);
-	ToolBar->AddTool(ID_View, "Hex Viewer...", HexIcon, wxNullBitmap, wxITEM_NORMAL, "Hex Viewer...", "View block as hex", NULL);
+	ToolBar->AddTool(ID_View, HexIcon, "Hex Viewer...", "View block as hex");
 	ToolBar->EnableTool(ID_View, FALSE);
-	ToolBar->AddTool(Button_Options, "Options...", OptionsIcon, wxNullBitmap, wxITEM_NORMAL, "Options...", "Options", NULL);
+	ToolBar->AddTool(Button_Options, OptionsIcon, "Options...", "Options");
 	ToolBar->EnableTool(Button_Options, FALSE);
 	ToolBar->AddSeparator();
-	ToolBar->AddTool(wxID_HELP, "Help", HelpIcon, wxNullBitmap, wxITEM_NORMAL, "Help", "View help", NULL);
+	ToolBar->AddTool(wxID_HELP, HelpIcon, "Help", "View help");
 	ToolBar->Realize();
 	
 	panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, "panel");