Removed email joke.

icculus · Sep 30, 2003 · 581d3c9 · 581d3c9
1 parent 7463934
commit 581d3c9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 8 deletions.
diff --git a/MainWindow.cpp b/MainWindow.cpp
@@ -176,10 +176,6 @@ void MainWindow::OnCloseWindow(wxCommandEvent& event)
 {
     Application::CmdCloseWindow();
 }
-void MainWindow::OnCheckMail(wxCommandEvent& event)
-{
-    wxMessageBox("Hosehead!!  Do you really think MojoMerge should check your e-mail?  Are you going to keep demanding upgrades until we finally put in support for checking e-mail?  Why must all users be so demanding.  Sheez!");
-}
 void MainWindow::OnChangeActiveWindow(wxNotebookEvent& event)
 {
     // Enable/disable the menu/toolbar commands based on the active window
@@ -274,7 +270,6 @@ BEGIN_EVENT_TABLE(MainWindow, wxFrame)
     EVT_MENU(ID_THREEWAYFOLDERCOMPARE_TOOL, MainWindow::OnNewThreeWayFolderComparison)
     EVT_MENU(ID_CLOSEWINDOW_TOOL, MainWindow::OnCloseWindow)
     EVT_MENU(ID_RECOMPARE_TOOL, MainWindow::OnRecompare)
-    EVT_MENU(ID_CHECKMAIL_TOOL, MainWindow::OnCheckMail)
     // Tab Browser menu events
     EVT_NOTEBOOK_PAGE_CHANGED(ID_TAB_BROWSER_NOTEBOOK, MainWindow::OnChangeActiveWindow)
 #ifdef _DEBUG

diff --git a/MainWindow.h b/MainWindow.h
@@ -83,7 +83,6 @@ namespace MojoMerge
         void OnIgnoreCase(wxCommandEvent& event);
         void OnToolbar(wxCommandEvent& event);
         void OnStatusbar(wxCommandEvent& event);
-        void OnCheckMail(wxCommandEvent& event);
         void OnChangeActiveWindow(wxNotebookEvent& event);
 #ifdef _DEBUG
         void OnTestTwoWayDiff(wxCommandEvent& event);

diff --git a/Toolbar.cpp b/Toolbar.cpp
@@ -22,8 +22,6 @@ Toolbar::Toolbar(wxWindow *Parent) : wxToolBar(Parent, ID_TOOLBAR)
     AddSeparator();
     AddTool(ID_RECOMPARE_TOOL, wxT(""), GetBitmap(6), wxT("Perform a recompare for the active window"));
     AddTool(ID_CLOSEWINDOW_TOOL, GetBitmap(4), wxT("Close the current active window"));
-    AddSeparator();
-    AddTool(ID_CHECKMAIL_TOOL, wxT(""), GetBitmap(5), wxT("Check your mail"));
     Realize();
 }