Index: pgAdmin3.cpp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.102 -r1.103
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -348,7 +348,10 @@
         chkXRC(wxID_HELP) &&
         chkXRC(wxID_APPLY) &&
         chkXRC(wxID_ADD) &&
-        chkXRC(wxID_REMOVE), wxT("XRC ID not correctly assigned."));
+        chkXRC(wxID_REMOVE)&&
+        chkXRC(wxID_REFRESH) &&
+        chkXRC(wxID_CLOSE), 
+        wxT("XRC ID not correctly assigned."));
     // if this assert fires, some event table uses XRCID(...) instead of wxID_... directly
         
 
Index: frmStatus.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.42 -r1.43
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -26,8 +26,8 @@
 
 #define TIMER_ID 333
 BEGIN_EVENT_TABLE(frmStatus, pgDialog)
-    EVT_BUTTON(XRCID("btnRefresh"),					frmStatus::OnRefresh)
-    EVT_BUTTON(XRCID("btnClose"),					frmStatus::OnCloseBtn)
+    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)
@@ -192,7 +192,7 @@
 void frmStatus::OnNotebookPageChanged(wxNotebookEvent& event)
 {
 	if (!loaded) return;
-	wxCommandEvent buttonEvent(wxEVT_COMMAND_BUTTON_CLICKED, XRCID("btnRefresh"));
+	wxCommandEvent buttonEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_REFRESH);
     AddPendingEvent(buttonEvent);
 	
     // Disable the buttons. They'll get re-enabled if a suitable item is selected.
Index: frmStatus.xrc
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/frmStatus.xrc,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lsrc/ui/common/frmStatus.xrc -Lsrc/ui/common/frmStatus.xrc -u -w -r1.14 -r1.15
--- src/ui/common/frmStatus.xrc
+++ src/ui/common/frmStatus.xrc
@@ -163,7 +163,7 @@
             <flag>wxEXPAND|wxGROW|wxALIGN_CENTRE</flag>
           </object>
           <object class="sizeritem">
-            <object class="wxButton" name="btnRefresh">
+            <object class="wxButton" name="wxID_REFRESH">
               <label>Refresh</label>
               <default>1</default>
               <pos>283,4d</pos>
@@ -173,7 +173,7 @@
             <border>5</border>
           </object>
           <object class="sizeritem">
-            <object class="wxButton" name="btnClose">
+            <object class="wxButton" name="wxID_CLOSE">
               <label>Close</label>
               <pos>342,4d</pos>
               <size>53,-1d</size>
Index: frmAddTableView.xrc
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/frmAddTableView.xrc,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/ui/common/frmAddTableView.xrc -Lsrc/ui/common/frmAddTableView.xrc -u -w -r1.4 -r1.5
--- src/ui/common/frmAddTableView.xrc
+++ src/ui/common/frmAddTableView.xrc
@@ -10,7 +10,7 @@
       <pos>10,10</pos>
       <size>280,240</size>
     </object>
-    <object class="wxButton" name="btnClose">
+    <object class="wxButton" name="wxID_CLOSE">
       <label>&amp;Close</label>
       <pos>214,265</pos>
       <size>75,25</size>