--- src/schema/pgObject.cpp.orig	Tue Jul 15 12:52:52 2003
+++ src/schema/pgObject.cpp	Tue Jul 15 12:53:32 2003
@@ -454,7 +454,7 @@
 {
     if (!schema)
         return false;
-    return schema->GetOid() < 100;
+	return schema->GetOid() <= ((pgServer*)this)->GetLastSystemOID();
 }
 
 
--- src/include/pgCast.h.orig	Tue Jul 15 14:17:33 2003
+++ src/include/pgCast.h	Tue Jul 15 14:18:13 2003
@@ -52,6 +52,8 @@
     wxString GetSql(wxTreeCtrl *browser);
     pgObject *Refresh(wxTreeCtrl *browser, const wxTreeItemId item);
 
+    bool GetSystemObject() const;
+
 private:
     wxString sourceType, targetType, castFunction, castContext, castNamespace;
     OID sourceTypeOid, targetTypeOid;
--- src/schema/pgCast.cpp.orig	Tue Jul 15 14:18:53 2003
+++ src/schema/pgCast.cpp	Tue Jul 15 14:24:51 2003
@@ -119,6 +119,9 @@
                 ct == wxT("i") ? wxT("IMPLICIT") :
                 ct == wxT("a") ? wxT("ASSIGNMENT") : wxT("EXPLICIT"));
 
+            if (settings->GetShowSystemObjects() || 
+                (cast->GetOid() > collection->GetServer()->GetLastSystemOID()))
+            {
             if (browser)
             {
                 collection->AppendBrowserItem(browser, cast);
@@ -127,8 +130,16 @@
             else
                 break;
         }
-
+            else
+                break;
+        }
 		delete casts;
     }
     return cast;
 }
+
+bool pgCast::GetSystemObject() const
+{
+        return (this->GetOid() <= ((pgServer*)this)->GetLastSystemOID());
+}
+