Index: dlgClasses.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgClasses.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lsrc/ui/dlgClasses.cpp -Lsrc/ui/dlgClasses.cpp -u -w -r1.20 -r1.21
--- src/ui/dlgClasses.cpp
+++ src/ui/dlgClasses.cpp
@@ -36,6 +36,8 @@
 
 void pgDialog::AddStatusBar()
 {
+    if (!statusBar)
+    {
     long flags=0;
     if (GetWindowStyle() & wxTHICK_FRAME)
         flags = wxST_SIZEGRIP;
@@ -58,6 +60,7 @@
         statusBar->Move(0, size.y-sbHeight);
     }
 }
+}
 
 
 void pgDialog::PostCreation()
Index: dlgRepCluster.xrc
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/dlgRepCluster.xrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ui/common/dlgRepCluster.xrc -Lsrc/ui/common/dlgRepCluster.xrc -u -w -r1.2 -r1.3
--- src/ui/common/dlgRepCluster.xrc
+++ src/ui/common/dlgRepCluster.xrc
@@ -42,7 +42,7 @@
           </object>
           <object class="wxComboBox" name="cbClusterName">
             <pos>70,50d</pos>
-            <size>135,-12d</size>
+            <size>135,12d</size>
             <content/>
             <style>wxCB_READONLY|wxCB_DROPDOWN</style>
           </object>
Index: dlgRepClusterUpgrade.xrc
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/dlgRepClusterUpgrade.xrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ui/common/dlgRepClusterUpgrade.xrc -Lsrc/ui/common/dlgRepClusterUpgrade.xrc -u -w -r1.1 -r1.2
--- src/ui/common/dlgRepClusterUpgrade.xrc
+++ src/ui/common/dlgRepClusterUpgrade.xrc
@@ -6,43 +6,51 @@
       <object class="notebookpage">
         <label>Properties</label>
         <object class="wxPanel" name="pnlProperties">
+          <object class="wxStaticText" name="stCurrentVersion">
+            <label>Current version</label>
+            <pos>5,7d</pos>
+          </object>
+          <object class="wxTextCtrl" name="txtCurrentVersion">
+            <pos>70,5d</pos>
+            <size>135,-1d</size>
+          </object>
           <object class="wxStaticText" name="stServer">
             <label>Server</label>
-            <pos>5,7d</pos>
+            <pos>5,22d</pos>
           </object>
           <object class="wxComboBox" name="cbServer">
             <content/>
-            <pos>70,5d</pos>
+            <pos>70,20d</pos>
             <size>135,12d</size>
             <style>wxCB_READONLY|wxCB_DROPDOWN</style>
           </object>
           <object class="wxStaticText" name="stDatabase">
             <label>Database</label>
-            <pos>5,22d</pos>
+            <pos>5,35d</pos>
           </object>
           <object class="wxComboBox" name="cbDatabase">
             <content/>
-            <pos>70,20d</pos>
+            <pos>70,35d</pos>
             <size>135,12d</size>
             <style>wxCB_READONLY|wxCB_DROPDOWN</style>
           </object>
           <object class="wxStaticText" name="stClusterName">
             <label>Cluster</label>
-            <pos>5,37d</pos>
+            <pos>5,52d</pos>
           </object>
           <object class="wxComboBox" name="cbClusterName">
             <content/>
-            <pos>70,35d</pos>
+            <pos>70,50d</pos>
             <size>135,12d</size>
             <style>wxCB_READONLY|wxCB_DROPDOWN</style>
           </object>
           <object class="wxStaticText" name="stVersion">
             <label>Version</label>
-            <pos>5,52d</pos>
+            <pos>5,67d</pos>
             <style></style>
           </object>
           <object class="wxTextCtrl" name="txtVersion">
-            <pos>70,50d</pos>
+            <pos>70,65d</pos>
             <size>27,-1d</size>
           </object>
         </object>