Index: frmMain.h
===================================================================
RCS file: /projects/pgadmin3/src/include/frmMain.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -Lsrc/include/frmMain.h -Lsrc/include/frmMain.h -u -w -r1.56 -r1.57
--- src/include/frmMain.h
+++ src/include/frmMain.h
@@ -69,7 +69,7 @@
     ctlListView *referencedBy, *dependsOn;
     wxNotebook *listViews;
     ctlSQLBox *sqlPane;
-    wxMenu *editMenu, *newMenu, *toolsMenu, *viewMenu, *treeContextMenu, *newContextMenu;
+    wxMenu *newMenu, *toolsMenu, *viewMenu, *treeContextMenu, *newContextMenu;
     wxTreeItemId servers;
 	wxImageList *images;
     wxSplitterWindow *horizontal, *vertical;
@@ -82,12 +82,10 @@
     pgObject *currentObject;
     pgDatabase *m_database;
 
-    void OnAbout(wxCommandEvent& event);
     void OnContents(wxCommandEvent& event);
     void OnHelp(wxCommandEvent& event);
     void OnPgsqlHelp(wxCommandEvent& event);
     void OnFaq(wxCommandEvent& event);
-    void OnBugreport(wxCommandEvent& event);
     void OnAddServer(wxCommandEvent &ev);
     void OnExit(wxCommandEvent& event);
     void OnViewData(wxCommandEvent& event);
Index: dlgClasses.h
===================================================================
RCS file: /projects/pgadmin3/src/include/dlgClasses.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/include/dlgClasses.h -Lsrc/include/dlgClasses.h -u -w -r1.12 -r1.13
--- src/include/dlgClasses.h
+++ src/include/dlgClasses.h
@@ -57,6 +57,9 @@
     void OnKeyDown(wxKeyEvent& event);
     void OnExit(wxCommandEvent& event);
     void OnRecent(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+    void OnBugreport(wxCommandEvent& event);
+
     virtual void OpenLastFile() {}
 
     void UpdateRecentFiles();
@@ -64,7 +67,7 @@
     wxString dlgName;
     wxString lastFilename, lastDir, lastPath;
     wxString recentKey;
-    wxMenu *fileMenu, *recentFileMenu, *helpMenu;
+    wxMenu *fileMenu, *editMenu, *recentFileMenu, *helpMenu;
     wxStatusBar *statusBar;
     wxMenuBar *menuBar;
     wxToolBar *toolBar;
Index: menu.h
===================================================================
RCS file: /projects/pgadmin3/src/include/menu.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lsrc/include/menu.h -Lsrc/include/menu.h -u -w -r1.19 -r1.20
--- src/include/menu.h
+++ src/include/menu.h
@@ -81,6 +81,9 @@
     MNU_CLEARHISTORY,
     MNU_SAVEHISTORY,
     MNU_CHECKALIVE,
+    MNU_CONFIG,
+    MNU_HBACONFIG,
+    MNU_HINT,
     MNU_RECENT, // leave space for recent file entries
     MNU_NEW=MNU_RECENT+15
 };
Index: frmQuery.h
===================================================================
RCS file: /projects/pgadmin3/src/include/frmQuery.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -Lsrc/include/frmQuery.h -Lsrc/include/frmQuery.h -u -w -r1.26 -r1.27
--- src/include/frmQuery.h
+++ src/include/frmQuery.h
@@ -70,7 +70,7 @@
     void showMessage(const wxString& msg, const wxString &msgShort=wxT(""));
     void setExtendedTitle();
     wxWindow *currentControl();
-    wxMenu *editMenu, *queryMenu;
+    wxMenu *queryMenu;
     wxString title;
     wxString lastFilename, lastDir;