SVN Commit by dpage: r4782 - branches/REL-1_4_0_PATCHES/pgadmin3/src/ui - Mailing list pgadmin-hackers

Author: dpage
Date: 2005-12-02 09:36:59 +0000 (Fri, 02 Dec 2005)
New Revision: 4782

Modified:
   branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/dlgColumn.xrc
   branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/xrcDialogs.cpp
Log:
Fix (hopefully) the last of the combobox bug.

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/dlgColumn.xrc
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/dlgColumn.xrc    2005-12-02 09:34:49 UTC (rev 4781)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/dlgColumn.xrc    2005-12-02 09:36:59 UTC (rev 4782)
@@ -24,7 +24,7 @@

             <pos>5,22d</pos>
           </object>
-          <object class="wxComboBox" name="cbDatatype">
+          <object class="ctlComboBox" name="cbDatatype">

             <content/>


Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/xrcDialogs.cpp
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/xrcDialogs.cpp    2005-12-02 09:34:49 UTC (rev 4781)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/ui/xrcDialogs.cpp    2005-12-02 09:36:59 UTC (rev 4782)
@@ -8,9 +8,6 @@
     #pragma hdrstop
 #endif

-#ifndef WX_PRECOMP
-    #include <wx/wx.h>
-#endif
 #include <wx/filesys.h>
 #include <wx/fs_mem.h>
 #include <wx/xrc/xmlres.h>
@@ -520,7 +517,7 @@
 115,116,121,108,101,47,62,10,32,32,60,47,111,98,106,101,99,116,62,10,60,
 47,114,101,115,111,117,114,99,101,62,10};

-static size_t xml_res_size_3 = 3958;
+static size_t xml_res_size_3 = 3959;
 static unsigned char xml_res_file_3[] = {
 60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
 110,99,111,100,105,110,103,61,34,73,83,79,45,56,56,53,57,45,49,34,63,62,
@@ -555,19 +552,19 @@
 47,108,97,98,101,108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,
 115,62,53,44,50,50,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,
 32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,
-111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,67,111,109,98,
-111,66,111,120,34,32,110,97,109,101,61,34,99,98,68,97,116,97,116,121,112,
-101,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,110,116,101,
-110,116,47,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,
-55,48,44,50,48,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,
-32,32,60,115,105,122,101,62,49,51,53,44,49,50,100,60,47,115,105,122,101,
-62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,119,
-120,67,66,95,68,82,79,80,68,79,87,78,60,47,115,116,121,108,101,62,10,32,
-32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,32,
-32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,
-120,83,116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,61,34,115,
-116,76,101,110,103,116,104,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,
-60,108,97,98,101,108,62,76,101,110,103,116,104,60,47,108,97,98,101,108,
+111,98,106,101,99,116,32,99,108,97,115,115,61,34,99,116,108,67,111,109,
+98,111,66,111,120,34,32,110,97,109,101,61,34,99,98,68,97,116,97,116,121,
+112,101,34,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,99,111,110,116,
+101,110,116,47,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,
+62,55,48,44,50,48,100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,
+32,32,32,60,115,105,122,101,62,49,51,53,44,49,50,100,60,47,115,105,122,
+101,62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,116,121,108,101,62,
+119,120,67,66,95,68,82,79,80,68,79,87,78,60,47,115,116,121,108,101,62,10,
+32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116,62,10,32,32,32,
+32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,
+119,120,83,116,97,116,105,99,84,101,120,116,34,32,110,97,109,101,61,34,
+115,116,76,101,110,103,116,104,34,62,10,32,32,32,32,32,32,32,32,32,32,32,
+32,60,108,97,98,101,108,62,76,101,110,103,116,104,60,47,108,97,98,101,108,
 62,10,32,32,32,32,32,32,32,32,32,32,32,32,60,112,111,115,62,53,44,51,55,
 100,60,47,112,111,115,62,10,32,32,32,32,32,32,32,32,32,32,60,47,111,98,
 106,101,99,116,62,10,32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,