Index: pgAdmin3.cpp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.103 -r1.104
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -348,6 +348,7 @@
         chkXRC(wxID_HELP) &&
         chkXRC(wxID_APPLY) &&
         chkXRC(wxID_ADD) &&
+        chkXRC(wxID_STOP) &&
         chkXRC(wxID_REMOVE)&&
         chkXRC(wxID_REFRESH) &&
         chkXRC(wxID_CLOSE), 
Index: frmStatus.h
===================================================================
RCS file: /projects/pgadmin3/src/include/frmStatus.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lsrc/include/frmStatus.h -Lsrc/include/frmStatus.h -u -w -r1.16 -r1.17
--- src/include/frmStatus.h
+++ src/include/frmStatus.h
@@ -60,6 +60,8 @@
     
     frmMain *mainForm;
 	wxStatusBar *statusBar;
+    wxButton *btnCancelSt, *btnTerminateSt,*btnCancelLk, *btnTerminateLk;
+
     wxString logFormat;
     bool logHasTimestamp, logFormatKnown;
     int logFmtPos;
Index: frmStatus.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.43 -r1.44
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -28,10 +28,8 @@
 BEGIN_EVENT_TABLE(frmStatus, pgDialog)
     EVT_BUTTON(wxID_REFRESH,	     				frmStatus::OnRefresh)
     EVT_BUTTON(wxID_CLOSE,	  				        frmStatus::OnCloseBtn)
-    EVT_BUTTON(XRCID("btnCancelSt"),				frmStatus::OnCancelBtn)
-    EVT_BUTTON(XRCID("btnTerminateSt"),				frmStatus::OnTerminateBtn)
-    EVT_BUTTON(XRCID("btnCancelLk"),				frmStatus::OnCancelBtn)
-    EVT_BUTTON(XRCID("btnTerminateLk"),				frmStatus::OnTerminateBtn)
+    EVT_BUTTON(wxID_CANCEL,          				frmStatus::OnCancelBtn)
+    EVT_BUTTON(wxID_STOP,            				frmStatus::OnTerminateBtn)
     EVT_CLOSE(										frmStatus::OnClose)
     EVT_SPINCTRL(XRCID("spnRefreshRate"),			frmStatus::OnRateChangeSpin)
     EVT_TEXT(XRCID("spnRefreshRate"),				frmStatus::OnRateChange)
@@ -51,10 +49,6 @@
 #define logList         CTRL_LISTVIEW("lstLog")
 #define spnRefreshRate  CTRL_SPIN("spnRefreshRate")
 #define nbStatus		CTRL_NOTEBOOK("nbStatus")
-#define btnCancelSt		CTRL_BUTTON("btnCancelSt")
-#define btnTerminateSt	CTRL_BUTTON("btnTerminateSt")
-#define btnCancelLk		CTRL_BUTTON("btnCancelLk")
-#define btnTerminateLk	CTRL_BUTTON("btnTerminateLk")
 #define cbLogfiles      CTRL_COMBOBOX("cbLogfiles")
 #define btnRotateLog    CTRL_BUTTON("btnRotateLog")
 
@@ -69,6 +63,14 @@
     Destroy();
 }
 
+
+void ChangeButtonId(wxButton *btn, int id, const wxChar *txt)
+{
+    btn->SetId(id);
+    btn->SetLabel(txt);
+}
+
+
 frmStatus::frmStatus(frmMain *form, const wxString& _title, pgConn *conn)
 {
     wxLogInfo(wxT("Creating server status box"));
@@ -89,6 +91,14 @@
     connection=conn;
     logHasTimestamp = false;
     logFormatKnown = false;
+    btnCancelSt = CTRL_BUTTON("btnCancelSt");
+    btnCancelLk = CTRL_BUTTON("btnCancelLk");
+    btnTerminateSt = CTRL_BUTTON("btnTerminateSt");
+    btnTerminateLk = CTRL_BUTTON("btnTerminateLk");
+    ChangeButtonId(btnCancelSt, wxID_CANCEL, _("Cancel"));
+    ChangeButtonId(btnCancelLk, wxID_CANCEL, _("Cancel"));
+    ChangeButtonId(btnTerminateSt, wxID_STOP, _("Terminate"));
+    ChangeButtonId(btnTerminateLk, wxID_STOP, _("Terminate"));
 
     logfileLength = 0;
     backend_pid=conn->GetBackendPID();