Index: dlgClasses.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgClasses.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lsrc/ui/dlgClasses.cpp -Lsrc/ui/dlgClasses.cpp -u -w -r1.13 -r1.14
--- src/ui/dlgClasses.cpp
+++ src/ui/dlgClasses.cpp
@@ -20,6 +20,7 @@
 #include "wx/process.h"
 #include "frmMain.h"
 #include "pgConn.h"
+#include "frmAbout.h"
 
 #include "menu.h"
 
@@ -140,6 +141,8 @@
     EVT_MENU(MNU_RECENT+7,              pgFrame::OnRecent)
     EVT_MENU(MNU_RECENT+8,              pgFrame::OnRecent)
     EVT_MENU(MNU_RECENT+9,              pgFrame::OnRecent)
+    EVT_MENU(MNU_BUGREPORT,             pgFrame::OnBugreport)
+    EVT_MENU(MNU_ABOUT,                 pgFrame::OnAbout)
 #ifdef __WXGTK__
     EVT_KEY_DOWN(                       pgFrame::OnKeyDown)
 #endif
@@ -160,6 +163,19 @@
 }
 
 
+void pgFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+    frmAbout *winAbout = new frmAbout(this);
+    winAbout->Show(TRUE);
+}
+
+
+void pgFrame::OnBugreport(wxCommandEvent& event)
+{
+    DisplayHelp(this, wxT("bugreport"));
+}
+
+
 void pgFrame::OnRecent(wxCommandEvent& event)
 {
     int fileNo=event.GetId() - MNU_RECENT;
Index: events.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/events.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -Lsrc/ui/events.cpp -Lsrc/ui/events.cpp -u -w -r1.117 -r1.118
--- src/ui/events.cpp
+++ src/ui/events.cpp
@@ -26,7 +26,6 @@
 #include "misc.h"
 #include "menu.h"
 #include "frmMain.h"
-#include "frmAbout.h"
 #include "dlgServer.h"
 #include "frmOptions.h"
 #include "frmPassword.h"
@@ -64,9 +63,7 @@
     EVT_MENU(MNU_CONTENTS,                  frmMain::OnContents)
     EVT_MENU(MNU_HELP,                      frmMain::OnHelp)
     EVT_MENU(MNU_FAQ,                       frmMain::OnFaq)
-    EVT_MENU(MNU_BUGREPORT,                 frmMain::OnBugreport)
     EVT_MENU(MNU_PGSQLHELP,                 frmMain::OnPgsqlHelp)
-    EVT_MENU(MNU_ABOUT,                     frmMain::OnAbout)
     EVT_MENU(MNU_ADDSERVER,                 frmMain::OnAddServer)
     EVT_MENU(MNU_REFRESH,                   frmMain::OnRefresh)
     EVT_MENU(MNU_CONNECT,                   frmMain::OnConnect)
@@ -119,6 +116,8 @@
     EVT_MENU(MNU_NEW+PGA_SCHEDULE,          frmMain::OnNew)
     EVT_MENU(MNU_CHECKALIVE,                frmMain::OnCheckAlive)
     EVT_MENU(MNU_CONTEXTMENU,               frmMain::OnContextMenu) 
+    EVT_MENU(MNU_CONFIG,                    frmMain::OnConfig)
+    EVT_MENU(MNU_HBACONFIG,                 frmMain::OnHbaConfig)
     EVT_NOTEBOOK_PAGE_CHANGED(CTL_NOTEBOOK, frmMain::OnPageChange)
     EVT_LIST_ITEM_SELECTED(CTL_PROPVIEW,    frmMain::OnPropSelChanged)
     EVT_LIST_ITEM_ACTIVATED(CTL_PROPVIEW,   frmMain::OnPropSelActivated)
@@ -189,13 +188,6 @@
 }
 
 
-void frmMain::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
-    frmAbout *winAbout = new frmAbout(this);
-    winAbout->Show(TRUE);
-}
-
-
 void frmMain::OnTipOfTheDay(wxCommandEvent& WXUNUSED(event))
 {
 extern wxString docPath;
@@ -281,12 +273,6 @@
 }
 
 
-void frmMain::OnBugreport(wxCommandEvent& event)
-{
-    DisplayHelp(this, wxT("bugreport"));
-}
-
-
 void frmMain::OnHelp(wxCommandEvent& event)
 {
     wxString page;
@@ -1094,6 +1080,16 @@
 }
 
     
+void frmMain::OnConfig(wxCommandEvent& event)
+{
+}
+
+
+void frmMain::OnHbaConfig(wxCommandEvent& event)
+{
+}
+
+    
 ////////////////////////////////////////////////////////////////////////////////
 // This handler will display a popup menu for the item at the mouse position
 ////////////////////////////////////////////////////////////////////////////////