Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.144
retrieving revision 1.145
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.144 -r1.145
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
 </ul>
 <br>
 <ul>
+    <li>2004-10-11 DP  1.2B3 Don't save dialogue sizes or positions if maximised or iconised.
     <li>2004-10-08 AP  1.2B3 review object owner code regarding pgsql versions
     <li>2004-10-08 AP  1.2B3 remove maximize button on MSW
     <li>2004-10-07 AP  1.2B3 Fix new server ssl option duplication on connect failure (r: Alexander Borkowski)
Index: dlgClasses.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgClasses.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lsrc/ui/dlgClasses.cpp -Lsrc/ui/dlgClasses.cpp -u -w -r1.14 -r1.15
--- src/ui/dlgClasses.cpp
+++ src/ui/dlgClasses.cpp
@@ -96,6 +96,7 @@
 
 void pgDialog::SavePosition()
 {
+	if (!IsMaximized() && !IsIconized())
     settings->Write(dlgName, GetSize(), GetPosition());
 }
 
@@ -255,6 +256,7 @@
 
 void pgFrame::SavePosition()
 {
+	if (!IsMaximized() && !IsIconized())
     settings->Write(dlgName, GetSize(), GetPosition());
 }
 
Index: dlgProperty.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgProperty.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.98 -r1.99
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -89,10 +89,6 @@
     wxWindowBase::SetFont(settings->GetSystemFont());
     LoadResource(frame, resName);
 
-#ifdef __WXMSW__
-    SetWindowStyleFlag(GetWindowStyleFlag() & ~wxMAXIMIZE_BOX);
-#endif
-
     nbNotebook = CTRL_NOTEBOOK("nbNotebook");
     if (!nbNotebook)
     {
@@ -118,9 +114,11 @@
 dlgProperty::~dlgProperty()
 {
     wxString prop = wxT("Properties/") + wxString(typesList[objectType].typName);
+
+	if (!IsMaximized() && !IsIconized())
     settings->Write(prop, GetPosition());
 
-    if (GetWindowStyle() & wxTHICK_FRAME)
+    if ((GetWindowStyle() & wxTHICK_FRAME) && !IsMaximized() && !IsIconized())
         settings->Write(prop, GetSize());
 }