Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.160
retrieving revision 1.161
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.160 -r1.161
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
 </ul>
 <br>
 <ul>
+    <li>2004-11-05 AP 1.2RC2 Fix GTK comboboxes (r: Tim Booth)
     <li>2004-11-05 AP 1.2RC2 Disable changing parameters of connected servers
     <li>2004-11-04 AP 1.2RC2 Fix duplicate functions in Cast dialog (r: Alexander Borkowski)
     <li>2004-11-03 AP 1.2RC1 MSW Combobox Workaround: missing EVT_TEXT events
Index: ctlComboBox.h
===================================================================
RCS file: /projects/pgadmin3/src/include/ctlComboBox.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/include/ctlComboBox.h -Lsrc/include/ctlComboBox.h -u -w -r1.3 -r1.4
--- src/include/ctlComboBox.h
+++ src/include/ctlComboBox.h
@@ -31,7 +31,7 @@
 {
 public:
     ctlComboBox(wxWindow *wnd, int id, wxPoint pos, wxSize siz, long attr=0);
-    int GuessSelection();
+    int GuessSelection(wxCommandEvent &ev);
     int GetGuessedSelection() const;
     wxString GetGuessedStringSelection() const;
 #ifdef __WXMSW__
Index: dlgTable.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgTable.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -Lsrc/ui/dlgTable.cpp -Lsrc/ui/dlgTable.cpp -u -w -r1.47 -r1.48
--- src/ui/dlgTable.cpp
+++ src/ui/dlgTable.cpp
@@ -58,7 +58,6 @@
     EVT_TEXT(XRCID("cbTablespace"),                 dlgProperty::OnChange)
     EVT_COMBOBOX(XRCID("cbTablespace"),             dlgProperty::OnChange)
     EVT_TEXT(XRCID("cbTables"),                     dlgTable::OnChangeTable)
-    EVT_COMBOBOX(XRCID("cbTables"),                 dlgTable::OnChangeTable)
     EVT_BUTTON(XRCID("btnAddTable"),                dlgTable::OnAddTable)
     EVT_BUTTON(XRCID("btnRemoveTable"),             dlgTable::OnRemoveTable)
     EVT_LISTBOX(XRCID("lbTables"),                  dlgTable::OnSelChangeTable)
@@ -496,7 +495,7 @@
 
 void dlgTable::OnChangeTable(wxCommandEvent &ev)
 {
-    cbTables->GuessSelection();
+    cbTables->GuessSelection(ev);
 }
 
 
Index: dlgDomain.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgDomain.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -Lsrc/ui/dlgDomain.cpp -Lsrc/ui/dlgDomain.cpp -u -w -r1.26 -r1.27
--- src/ui/dlgDomain.cpp
+++ src/ui/dlgDomain.cpp
@@ -35,6 +35,7 @@
     EVT_TEXT(XRCID("txtLength"),                    dlgProperty::OnChange)
     EVT_TEXT(XRCID("txtPrecision"),                 dlgProperty::OnChange)
     EVT_TEXT(XRCID("cbDatatype"),                   dlgDomain::OnSelChangeTyp)
+    EVT_COMBOBOX(XRCID("cbDatatype"),               dlgDomain::OnSelChangeTyp)
     EVT_TEXT(XRCID("txLength"),                     dlgProperty::OnChange)
     EVT_TEXT(XRCID("txtDefault"),                   dlgProperty::OnChange)
     EVT_CHECKBOX(XRCID("chkNotNull"),               dlgProperty::OnChange)
@@ -149,7 +150,7 @@
 {
     if (!domain)
     {
-        cbDatatype->GuessSelection();
+        cbDatatype->GuessSelection(ev);
         CheckLenEnable();
         txtLength->Enable(isVarLen);
         CheckChange();
Index: dlgDatabase.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgDatabase.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -Lsrc/ui/dlgDatabase.cpp -Lsrc/ui/dlgDatabase.cpp -u -w -r1.36 -r1.37
--- src/ui/dlgDatabase.cpp
+++ src/ui/dlgDatabase.cpp
@@ -220,7 +220,8 @@
 
 void dlgDatabase::OnVarnameSelChange(wxCommandEvent &ev)
 {
-    int sel=cbVarname->GuessSelection();
+    int sel=cbVarname->GuessSelection(ev);
+
     if (sel >= 0)
     {
         wxStringTokenizer vals(varInfo.Item(sel));
Index: ctlComboBox.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/ctlComboBox.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/ui/ctlComboBox.cpp -Lsrc/ui/ctlComboBox.cpp -u -w -r1.5 -r1.6
--- src/ui/ctlComboBox.cpp
+++ src/ui/ctlComboBox.cpp
@@ -25,8 +25,11 @@
 }
 
 
-int ctlComboBox::GuessSelection()
+int ctlComboBox::GuessSelection(wxCommandEvent &ev)
 {
+    if (ev.GetEventType() != wxEVT_COMMAND_TEXT_UPDATED)
+        return GetGuessedSelection();
+
     wxString str=wxComboBox::GetValue();
     if (str.Length())
     {
Index: dlgUser.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgUser.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -Lsrc/ui/dlgUser.cpp -Lsrc/ui/dlgUser.cpp -u -w -r1.34 -r1.35
--- src/ui/dlgUser.cpp
+++ src/ui/dlgUser.cpp
@@ -264,7 +264,8 @@
 
 void dlgUser::OnVarnameSelChange(wxCommandEvent &ev)
 {
-    int sel=cbVarname->GuessSelection();
+    int sel=cbVarname->GuessSelection(ev);
+
     if (sel >= 0)
     {
         wxStringTokenizer vals(varInfo.Item(sel));
Index: dlgOperator.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgOperator.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lsrc/ui/dlgOperator.cpp -Lsrc/ui/dlgOperator.cpp -u -w -r1.23 -r1.24
--- src/ui/dlgOperator.cpp
+++ src/ui/dlgOperator.cpp
@@ -211,13 +211,13 @@
 
 void dlgOperator::OnChangeTypeLeft(wxCommandEvent &ev)
 {
-    cbLeftType->GuessSelection();
+    cbLeftType->GuessSelection(ev);
     CheckChangeType();
 }
 
 void dlgOperator::OnChangeTypeRight(wxCommandEvent &ev)
 {
-    cbRightType->GuessSelection();
+    cbRightType->GuessSelection(ev);
     CheckChangeType();
 }
 
Index: dlgAggregate.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgAggregate.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -Lsrc/ui/dlgAggregate.cpp -Lsrc/ui/dlgAggregate.cpp -u -w -r1.20 -r1.21
--- src/ui/dlgAggregate.cpp
+++ src/ui/dlgAggregate.cpp
@@ -37,9 +37,9 @@
 
 BEGIN_EVENT_TABLE(dlgAggregate, dlgTypeProperty)
     EVT_TEXT(XRCID("cbBaseType"),                   dlgAggregate::OnChangeTypeBase)
-    EVT_COMBOBOX(XRCID("cbBaseType"),               dlgAggregate::OnChangeTypeBase)
+    EVT_COMBOBOX(XRCID("cbBaseType"),               dlgProperty::OnChange)
     EVT_TEXT(XRCID("cbStateType"),                  dlgAggregate::OnChangeTypeState)
-    EVT_COMBOBOX(XRCID("cbStateType"),              dlgAggregate::OnChangeTypeState)
+    EVT_COMBOBOX(XRCID("cbStateType"),              dlgProperty::OnChange)
     EVT_COMBOBOX(XRCID("cbStateFunc"),              dlgProperty::OnChange)
     EVT_TEXT(XRCID("cbStateFunc"),                  dlgProperty::OnChange)
 END_EVENT_TABLE();
@@ -135,13 +135,13 @@
 
 void dlgAggregate::OnChangeTypeBase(wxCommandEvent &ev)
 {
-    cbBaseType->GuessSelection();
+    cbBaseType->GuessSelection(ev);
     CheckChange();
 }
 
 void dlgAggregate::OnChangeTypeState(wxCommandEvent &ev)
 {
-    cbStateType->GuessSelection();
+    cbStateType->GuessSelection(ev);
     CheckChange();
 }
 
Index: dlgColumn.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgColumn.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -Lsrc/ui/dlgColumn.cpp -Lsrc/ui/dlgColumn.cpp -u -w -r1.35 -r1.36
--- src/ui/dlgColumn.cpp
+++ src/ui/dlgColumn.cpp
@@ -41,8 +41,8 @@
     EVT_TEXT(XRCID("txtDefault"),                   dlgProperty::OnChange)
     EVT_CHECKBOX(XRCID("chkNotNull"),               dlgProperty::OnChange)
     EVT_TEXT(XRCID("txtAttstattarget"),             dlgProperty::OnChange)
-    EVT_COMBOBOX(XRCID("cbDatatype"),               dlgColumn::OnSelChangeTyp)
     EVT_TEXT(XRCID("cbDatatype"),                   dlgColumn::OnSelChangeTyp)
+    EVT_COMBOBOX(XRCID("cbDatatype"),               dlgColumn::OnSelChangeTyp)
 END_EVENT_TABLE();
 
 
@@ -370,7 +370,7 @@
 
 void dlgColumn::OnSelChangeTyp(wxCommandEvent &ev)
 {
-    cbDatatype->GuessSelection();
+    cbDatatype->GuessSelection(ev);
 
     CheckLenEnable();
     if (column && column->GetLength() <= 0)
Index: dlgProperty.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgProperty.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.105 -r1.106
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -70,7 +70,7 @@
 
     EVT_TEXT(XRCID("txtName"),                      dlgProperty::OnChange)
     EVT_TEXT(XRCID("cbOwner"),                      dlgProperty::OnChangeOwner)
-    EVT_COMBOBOX(XRCID("cbOwner"),                  dlgProperty::OnChangeOwner)
+    EVT_COMBOBOX(XRCID("cbOwner"),                  dlgProperty::OnChange)
     EVT_TEXT(XRCID("txtComment"),                   dlgProperty::OnChange)
     
     EVT_BUTTON(wxID_HELP,                           dlgProperty::OnHelp)
@@ -384,7 +384,7 @@
 {
     ctlComboBox *cb=cbOwner;
     if (cb)
-        cb->GuessSelection();
+        cb->GuessSelection(ev);
     CheckChange();
 }
 
Index: dlgTrigger.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgTrigger.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lsrc/ui/dlgTrigger.cpp -Lsrc/ui/dlgTrigger.cpp -u -w -r1.23 -r1.24
--- src/ui/dlgTrigger.cpp
+++ src/ui/dlgTrigger.cpp
@@ -41,7 +41,7 @@
     EVT_CHECKBOX(XRCID("chkUpdate"),                dlgProperty::OnChange)
     EVT_CHECKBOX(XRCID("chkDelete"),                dlgProperty::OnChange)
     EVT_TEXT(XRCID("cbFunction"),                   dlgTrigger::OnChangeFunc)
-    EVT_COMBOBOX(XRCID("cbFunction"),               dlgTrigger::OnChangeFunc)
+    EVT_COMBOBOX(XRCID("cbFunction"),               dlgProperty::OnChange)
     EVT_TEXT(XRCID("txtArguments"),                 dlgProperty::OnChange)
 END_EVENT_TABLE();
 
@@ -181,7 +181,7 @@
 
 void dlgTrigger::OnChangeFunc(wxCommandEvent &ev)
 {
-    cbFunction->GuessSelection();
+    cbFunction->GuessSelection(ev);
     CheckChange();
 }
 
Index: dlgType.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgType.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lsrc/ui/dlgType.cpp -Lsrc/ui/dlgType.cpp -u -w -r1.28 -r1.29
--- src/ui/dlgType.cpp
+++ src/ui/dlgType.cpp
@@ -206,7 +206,7 @@
 
 void dlgType::OnSelChangeTyp(wxCommandEvent &ev)
 {
-    cbDatatype->GuessSelection();
+    cbDatatype->GuessSelection(ev);
     OnSelChangeTypOrLen(ev);
 }
 
Index: ctlSecurityPanel.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/ctlSecurityPanel.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lsrc/ui/ctlSecurityPanel.cpp -Lsrc/ui/ctlSecurityPanel.cpp -u -w -r1.7 -r1.8
--- src/ui/ctlSecurityPanel.cpp
+++ src/ui/ctlSecurityPanel.cpp
@@ -28,6 +28,7 @@
     EVT_BUTTON(CTL_ADDPRIV,             ctlSecurityPanel::OnAddPriv)
     EVT_BUTTON(CTL_DELPRIV,             ctlSecurityPanel::OnDelPriv)
     EVT_TEXT(CTL_CBGROUP,               ctlSecurityPanel::OnGroupChange)
+    EVT_COMBOBOX(CTL_CBGROUP,           ctlSecurityPanel::OnGroupChange)
     EVT_CHECKBOX(CTL_ALLPRIV,           ctlSecurityPanel::OnPrivCheckAll)
     EVT_CHECKBOX(CTL_ALLPRIVGRANT,      ctlSecurityPanel::OnPrivCheckAllGrant)
     EVT_CHECKBOX(CTL_PRIVCB,            ctlSecurityPanel::OnPrivCheck)
@@ -218,7 +219,7 @@
 
 void ctlSecurityPanel::OnGroupChange(wxCommandEvent &ev)
 {
-    cbGroups->GuessSelection();
+    cbGroups->GuessSelection(ev);
     wxString name=cbGroups->GetGuessedStringSelection();
 
     btnAddPriv->Enable(!name.Strip(wxString::both).IsEmpty());
Index: dlgCast.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgCast.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lsrc/ui/dlgCast.cpp -Lsrc/ui/dlgCast.cpp -u -w -r1.16 -r1.17
--- src/ui/dlgCast.cpp
+++ src/ui/dlgCast.cpp
@@ -37,9 +37,9 @@
 
 BEGIN_EVENT_TABLE(dlgCast, dlgTypeProperty)
     EVT_TEXT(XRCID("cbSourceType"),                 dlgCast::OnChangeTypeSrc)
-    EVT_COMBOBOX(XRCID("cbSourceType"),             dlgCast::OnChangeTypeSrc)
+    EVT_COMBOBOX(XRCID("cbSourceType"),             dlgProperty::OnChange)
     EVT_TEXT(XRCID("cbTargetType"),                 dlgCast::OnChangeTypeTrg)
-    EVT_COMBOBOX(XRCID("cbTargetType"),             dlgCast::OnChangeTypeTrg)
+    EVT_COMBOBOX(XRCID("cbTargetType"),             dlgProperty::OnChange)
 END_EVENT_TABLE();
 
 
@@ -130,13 +130,13 @@
 
 void dlgCast::OnChangeTypeSrc(wxCommandEvent &ev)
 {
-    cbSourceType->GuessSelection();
+    cbSourceType->GuessSelection(ev);
     OnChangeType(ev);
 }
 
 void dlgCast::OnChangeTypeTrg(wxCommandEvent &ev)
 {
-    cbTargetType->GuessSelection();
+    cbTargetType->GuessSelection(ev);
     OnChangeType(ev);
 }
 
Index: dlgFunction.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgFunction.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -Lsrc/ui/dlgFunction.cpp -Lsrc/ui/dlgFunction.cpp -u -w -r1.44 -r1.45
--- src/ui/dlgFunction.cpp
+++ src/ui/dlgFunction.cpp
@@ -62,8 +62,11 @@
     EVT_STC_MODIFIED(XRCID("txtSqlBox"),            dlgProperty::OnChangeStc)
 
     EVT_TEXT(XRCID("cbReturntype"),                 dlgFunction::OnChangeReturn)
+    EVT_COMBOBOX(XRCID("cbReturntype"),             dlgFunction::OnChangeReturn)
     EVT_TEXT(XRCID("cbDatatype"),                   dlgFunction::OnSelChangeType)
+    EVT_COMBOBOX(XRCID("cbDatatype"),               dlgFunction::OnSelChangeType)
     EVT_TEXT(XRCID("cbLanguage"),                   dlgFunction::OnSelChangeLanguage)
+    EVT_COMBOBOX(XRCID("cbLanguage"),               dlgFunction::OnSelChangeLanguage)
 
     EVT_LIST_ITEM_SELECTED(XRCID("lstArguments"),   dlgFunction::OnSelChangeArg)
     EVT_TEXT(XRCID("txtArgName"),                   dlgFunction::OnChangeArgName)
@@ -344,14 +347,14 @@
 
 void dlgFunction::OnChangeReturn(wxCommandEvent &ev)
 {
-    cbReturntype->GuessSelection();
+    cbReturntype->GuessSelection(ev);
     CheckChange();
 }
 
 
 void dlgFunction::OnSelChangeType(wxCommandEvent &ev)
 {
-    cbDatatype->GuessSelection();
+    cbDatatype->GuessSelection(ev);
     OnChangeArgName(ev);
 }