[Scummvm-cvs-logs] CVS: scummex wxwindows.cpp,1.28,1.29

[Max Horn]

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

Modified Files:
	wxwindows.cpp 
Log Message:
menu bar cleanup

Index: wxwindows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/wxwindows.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- wxwindows.cpp	28 Sep 2003 09:51:03 -0000	1.28
+++ wxwindows.cpp	28 Sep 2003 10:33:23 -0000	1.29
@@ -596,33 +596,48 @@
 	wxBitmap FileIcon = wxBitmap(file_icon);
 	wxBitmap HexIcon = wxBitmap(hex_icon);
 	
-	wxMenuBar *menuBar = new wxMenuBar;
-	wxMenu *menuFile = new wxMenu;
-	
-	wxMenuItem *OpenItem = new wxMenuItem(menuFile, wxID_OPEN, "Open...", "Open resource file", wxITEM_NORMAL, NULL );
-	OpenItem->SetBitmap(OpenIcon);
-	menuFile->Append(OpenItem);
+
+	//
+	// File menu
+	//
+	wxMenu *fileMenu = new wxMenu();
 	
-	menuFile->AppendSeparator();
+	fileMenu->Append(wxID_OPEN, "&Open...\tCtrl-O", "Open resource file");
+	fileMenu->Append(wxID_CLOSE, "Close\tCtrl-W", "Close resource file");
+	fileMenu->AppendSeparator();
+	fileMenu->Append(ID_FileInfo, "File Info", "Show File Info");
+	fileMenu->AppendSeparator();
+	fileMenu->Append(wxID_EXIT, "Exit\tCtrl-X");
+	// FIXME: On Mac you *always* say "Quit", but on Windows/Linux, "Exit" is more common, I think?
+	// So maybe we'll have to make this compile conditionally...
 	
-	wxMenuItem *QuitItem = new wxMenuItem(menuFile, wxID_EXIT, "Exit", "Exit ScummEX", wxITEM_NORMAL, NULL );
-	QuitItem->SetBitmap(ExitIcon);
-	menuFile->Append(QuitItem);
 
-	menuBar->Append(menuFile,"&File");
+	//
+	// Tools menu
+	//
+	wxMenu *toolsMenu = new wxMenu();
 
-	wxMenu *menuTools = new wxMenu;
-	wxMenuItem *DumpItem = new wxMenuItem(menuTools, ID_Dump, "File Dump...", "Dump block to disk", wxITEM_NORMAL, NULL );
-	DumpItem->SetBitmap(SaveIcon);
-	menuTools->Append(DumpItem);
-	menuTools->Append(ID_SoundStop, "Stop Sounds");
-	menuBar->Append(menuTools, "&Tools");
+	toolsMenu->Append(ID_Dump, "File Dump...", "Dump block to disk");
+	toolsMenu->Append(ID_View, "Hex Viewer...", "View block as hex");
+	toolsMenu->AppendSeparator();
+	toolsMenu->Append(ID_SoundStop, "Stop Sounds");
+	toolsMenu->AppendSeparator();
+	toolsMenu->Append(Button_Options, "Options...", "ScummEX Options");
 
-	wxMenu *menuHelp = new wxMenu;
-	menuHelp->Append(wxID_HELP, "Contents");
-	menuHelp->Append(wxID_ABOUT,"About...");
-	menuBar->Append(menuHelp, "&Help");
-	
+	//
+	// Help menu
+	//
+	wxMenu *helpMenu = new wxMenu();
+	helpMenu->Append(wxID_HELP, "Contents");
+	helpMenu->Append(wxID_ABOUT, "About...");
+
+	//
+	// Add the menus to a menu bar
+	//
+	wxMenuBar *menuBar = new wxMenuBar();
+	menuBar->Append(fileMenu, "&File");
+	menuBar->Append(toolsMenu, "&Tools");
+	menuBar->Append(helpMenu, "&Help");
 	SetMenuBar(menuBar);
 
 	SetThemeEnabled(true);
@@ -638,7 +653,7 @@
 	ToolBar->EnableTool(ID_FileInfo, FALSE);
 	ToolBar->AddTool(wxID_EXIT, ExitIcon, "Exit", "Exit ScummEX");
 	ToolBar->AddSeparator();
-	ToolBar->AddTool(ID_Dump, SaveIcon, "File Dump", "Dump block to disk");
+	ToolBar->AddTool(ID_Dump, SaveIcon, "File Dump...", "Dump block to disk");
 	ToolBar->EnableTool(ID_Dump, FALSE);
 	ToolBar->AddTool(ID_View, HexIcon, "Hex Viewer...", "View block as hex");
 	ToolBar->EnableTool(ID_View, FALSE);