Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.145
retrieving revision 1.146
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.145 -r1.146
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,7 +17,6 @@
- - 2004-10-11 DP 1.2B3 Don't save dialogue sizes or positions if maximised or iconised.
- 2004-10-08 AP 1.2B3 review object owner code regarding pgsql versions
- 2004-10-08 AP 1.2B3 remove maximize button on MSW
- 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.15
retrieving revision 1.16
diff -Lsrc/ui/dlgClasses.cpp -Lsrc/ui/dlgClasses.cpp -u -w -r1.15 -r1.16
--- src/ui/dlgClasses.cpp
+++ src/ui/dlgClasses.cpp
@@ -96,7 +96,6 @@
void pgDialog::SavePosition()
{
- if (!IsMaximized() && !IsIconized())
settings->Write(dlgName, GetSize(), GetPosition());
}
@@ -256,7 +255,6 @@
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.99
retrieving revision 1.100
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.99 -r1.100
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -89,6 +89,10 @@
wxWindowBase::SetFont(settings->GetSystemFont());
LoadResource(frame, resName);
+#ifdef __WXMSW__
+ SetWindowStyleFlag(GetWindowStyleFlag() & ~wxMAXIMIZE_BOX);
+#endif
+
nbNotebook = CTRL_NOTEBOOK("nbNotebook");
if (!nbNotebook)
{
@@ -114,11 +118,9 @@
dlgProperty::~dlgProperty()
{
wxString prop = wxT("Properties/") + wxString(typesList[objectType].typName);
-
- if (!IsMaximized() && !IsIconized())
settings->Write(prop, GetPosition());
- if ((GetWindowStyle() & wxTHICK_FRAME) && !IsMaximized() && !IsIconized())
+ if (GetWindowStyle() & wxTHICK_FRAME)
settings->Write(prop, GetSize());
}