--- src/ui/dlgOperator.cpp.orig	Wed Sep 10 01:16:47 2003
+++ src/ui/dlgOperator.cpp	Wed Sep 10 02:36:00 2003
@@ -104,6 +104,15 @@
         AddType(wxT(" "), oper->GetLeftTypeOid());
         AddType(wxT(" "), oper->GetRightTypeOid());
 
+        cbCommutator->Append(oper->GetCommutator());
+        cbNegator->Append(oper->GetNegator());
+        cbLeftSort->Append(oper->GetLeftSortOperator());
+        cbRightSort->Append(oper->GetRightSortOperator());
+        cbLess->Append(oper->GetLessOperator());
+        cbGreater->Append(oper->GetGreaterOperator());
+        chkCanHash->SetValue(oper->GetHashJoins());
+
+
 	txtComment->SetValue(oper->GetComment());
         txtName->Disable();
         cbProcedure->Disable();
@@ -150,7 +159,7 @@
 pgObject *dlgOperator::CreateObject(pgCollection *collection)
 {
     pgObject *obj=pgOperator::ReadObjects(collection, 0,
-         wxT("\n   AND op.oprname=") + GetName() +
+         wxT("\n   AND op.oprname=") + qtString(GetName()) +
          wxT("\n   AND op.oprnamespace=") + schema->GetOidStr() +
          wxT("\n   AND op.oprleft = ") + GetTypeOid(cbLeftType->GetSelection()) +
          wxT("\n   AND op.oprright = ") + GetTypeOid(cbRightType->GetSelection()));
@@ -361,10 +370,10 @@
                 sql += wxT(",\n   RESTRICT=") + procedures.Item(cbRestrict->GetSelection()-1);
             if (cbJoin->GetSelection() > 0)
                 sql += wxT(",\n   JOIN=") + procedures.Item(cbJoin->GetSelection()-1);
-            AppendIfFilled(sql, wxT(",\n   SORT1="), cbLeftSort->GetValue().Trim());
-            AppendIfFilled(sql, wxT(",\n   SORT2="), cbRightSort->GetValue().Trim());
-            AppendIfFilled(sql, wxT(",\n   LTCMP="), cbLess->GetValue().Trim());
-            AppendIfFilled(sql, wxT(",\n   GTCMP="), cbGreater->GetValue().Trim());
+            AppendIfFilled(sql, wxT(",\n   SORT1="), qtString(cbLeftSort->GetValue().Trim()));
+            AppendIfFilled(sql, wxT(",\n   SORT2="), qtString(cbRightSort->GetValue().Trim()));
+            AppendIfFilled(sql, wxT(",\n   LTCMP="), qtString(cbLess->GetValue().Trim()));
+            AppendIfFilled(sql, wxT(",\n   GTCMP="), qtString(cbGreater->GetValue().Trim()));
 
             if (chkCanMerge->GetValue() || chkCanHash->GetValue())
             {