Log Message:
-----------
gtk GRANT fixes

Modified Files:
--------------
    pgadmin3/src:
        pgAdmin3.cpp (r1.95 -> r1.96)
    pgadmin3/src/include:
        ctlSecurityPanel.h (r1.1 -> r1.2)
    pgadmin3/src/ui:
        ctlSecurityPanel.cpp (r1.1 -> r1.2)
        dlgProperty.cpp (r1.71 -> r1.72)

Index: pgAdmin3.cpp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.95 -r1.96
Index: ctlSecurityPanel.h
===================================================================
RCS file: /projects/pgadmin3/src/include/ctlSecurityPanel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/include/ctlSecurityPanel.h -Lsrc/include/ctlSecurityPanel.h -u -w -r1.1 
-r1.2
Index: dlgProperty.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgProperty.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.71 -r1.72
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -97,7 +97,7 @@
     page->GetClientSize(&width, &height);
 #else
     nbNotebook->GetClientSize(&width, &height);
-       height -= 35;   // sizes of tabs
+       height -= ConvertDialogToPixels(wxPoint(0, 20)).y;   // sizes of tabs
 #endif
 
     numericValidator.SetStyle(wxFILTER_NUMERIC);
Index: ctlSecurityPanel.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/ctlSecurityPanel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ui/ctlSecurityPanel.cpp -Lsrc/ui/ctlSecurityPanel.cpp -u -w -r1.1 -r1.2
--- src/ui/ctlSecurityPanel.cpp
+++ src/ui/ctlSecurityPanel.cpp
@@ -47,7 +47,7 @@
 : wxPanel(nb, -1, wxDefaultPosition, wxDefaultSize)
 {
     nbNotebook = nb;
-    nbNotebook->AddPage(this, _("Security"));
+    nbNotebook->AddPage(this, _("Privileges"));
 
     connection = 0;
     privilegeChars=privChars;
@@ -65,9 +65,14 @@
         privCheckboxes = new wxCheckBox*[privilegeCount*2];
         int i=0;
 
-        long chkFlags=0;
         int width, height;
+
+#ifdef __WIN32__
         GetClientSize(&width, &height);
+#else
+               nbNotebook->GetClientSize(&width, &height);
+               height -= ConvertDialogToPixels(wxPoint(0, 20)).y;   // sizes of tabs
+#endif
 
         wxPoint zeroPos=ConvertDialogToPixels(wxPoint(5, 5));
         wxSize chkSize=ConvertDialogToPixels(wxSize(65,12));
---------------------------(end of broadcast)---------------------------
TIP 6: Have you searched our list archives?

               http://archives.postgresql.org

Reply via email to