CVS Commit by andreas: dlg parent fix for gtk
CVS Commit by andreas: dlg parent fix for gtk
Log Message:
-----------
dlg parent fix for gtk
Modified Files:
--------------
pgadmin3/src/include:
dlgClasses.h (r1.4 -> r1.5)
pgadmin3/src/ui:
dlgAddTableView.cpp (r1.14 -> r1.15)
dlgClasses.cpp (r1.4 -> r1.5)
dlgEditGridOptions.cpp (r1.19 -> r1.20)
dlgProperty.cpp (r1.82 -> r1.83)
frmBackup.cpp (r1.4 -> r1.5)
frmConnect.cpp (r1.24 -> r1.25)
frmExport.cpp (r1.10 -> r1.11)
frmGrantWizard.cpp (r1.3 -> r1.4)
frmIndexcheck.cpp (r1.8 -> r1.9)
frmMaintenance.cpp (r1.11 -> r1.12)
frmOptions.cpp (r1.42 -> r1.43)
frmPassword.cpp (r1.15 -> r1.16)
frmQBJoin.cpp (r1.11 -> r1.12)
frmRestore.cpp (r1.6 -> r1.7)
frmStatus.cpp (r1.33 -> r1.34)
Index: dlgClasses.h
===================================================================
RCS file: /projects/pgadmin3/src/include/dlgClasses.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/include/dlgClasses.h -Lsrc/include/dlgClasses.h -u -w -r1.4 -r1.5
--- src/include/dlgClasses.h
+++ src/include/dlgClasses.h
@@ -29,7 +29,7 @@
public:
void RestorePosition(int defaultX=-1, int defaultY=-1, int defaultW=-1, int defaultH=-1, int minW=100, int minH=70);
void SavePosition();
- void LoadResource(const wxChar *name=0);
+ void LoadResource(wxWindow *parent, const wxChar *name=0);
protected:
void OnCancel(wxCommandEvent& ev);
Index: frmGrantWizard.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmGrantWizard.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lsrc/ui/frmGrantWizard.cpp -Lsrc/ui/frmGrantWizard.cpp -u -w -r1.3 -r1.4
--- src/ui/frmGrantWizard.cpp
+++ src/ui/frmGrantWizard.cpp
@@ -44,7 +44,7 @@
nbNotebook = 0;
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(wxT("frmGrantWizard"));
+ LoadResource(form, wxT("frmGrantWizard"));
RestorePosition();
SetTitle(wxString::Format(_("Privileges for %s %s"), object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
Index: dlgClasses.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgClasses.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/ui/dlgClasses.cpp -Lsrc/ui/dlgClasses.cpp -u -w -r1.4 -r1.5
--- src/ui/dlgClasses.cpp
+++ src/ui/dlgClasses.cpp
@@ -51,11 +51,11 @@
settings->Write(dlgName, GetSize(), GetPosition());
}
-void pgDialog::LoadResource(const wxChar *name)
+void pgDialog::LoadResource(wxWindow *parent, const wxChar *name)
{
if (name)
dlgName = name;
- wxXmlResource::Get()->LoadDialog(this, GetParent(), dlgName);
+ wxXmlResource::Get()->LoadDialog(this, parent, dlgName);
}
Index: frmPassword.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmPassword.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lsrc/ui/frmPassword.cpp -Lsrc/ui/frmPassword.cpp -u -w -r1.15 -r1.16
--- src/ui/frmPassword.cpp
+++ src/ui/frmPassword.cpp
@@ -39,7 +39,7 @@
wxLogInfo(wxT("Creating a change password dialogue"));
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(wxT("frmPassword"));
+ LoadResource(parent, wxT("frmPassword"));
// Icon
SetIcon(wxIcon(pgAdmin3_xpm));
Index: frmExport.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmExport.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/ui/frmExport.cpp -Lsrc/ui/frmExport.cpp -u -w -r1.10 -r1.11
--- src/ui/frmExport.cpp
+++ src/ui/frmExport.cpp
@@ -56,7 +56,7 @@
wxLogInfo(wxT("Creating the export dialogue"));
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(wxT("frmExport"));
+ LoadResource(p, wxT("frmExport"));
// Icon
SetIcon(wxIcon(pgAdmin3_xpm));
Index: frmQBJoin.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmQBJoin.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/ui/frmQBJoin.cpp -Lsrc/ui/frmQBJoin.cpp -u -w -r1.11 -r1.12
--- src/ui/frmQBJoin.cpp
+++ src/ui/frmQBJoin.cpp
@@ -43,7 +43,7 @@
wxLogInfo(wxT("Creating a Query Builder Join dialogue"));
// Load the XML resource for this dialog
- LoadResource(wxT("frmQBJoin"));
+ LoadResource(frame, wxT("frmQBJoin"));
// Set the Icon
SetIcon(wxIcon(pgAdmin3_xpm));
Index: frmOptions.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmOptions.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -Lsrc/ui/frmOptions.cpp -Lsrc/ui/frmOptions.cpp -u -w -r1.42 -r1.43
--- src/ui/frmOptions.cpp
+++ src/ui/frmOptions.cpp
@@ -67,7 +67,7 @@
wxLogInfo(wxT("Creating an options dialogue"));
mainForm=parent;
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(wxT("frmOptions"));
+ LoadResource(parent, wxT("frmOptions"));
// Icon
SetIcon(wxIcon(pgAdmin3_xpm));
Index: frmMaintenance.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmMaintenance.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/ui/frmMaintenance.cpp -Lsrc/ui/frmMaintenance.cpp -u -w -r1.11 -r1.12
--- src/ui/frmMaintenance.cpp
+++ src/ui/frmMaintenance.cpp
@@ -49,7 +49,7 @@
wxLogInfo(wxT("Creating a maintenance dialogue for %s %s"), object->GetTypeName().c_str(), object->GetFullName().c_str());
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(wxT("frmMaintenance"));
+ LoadResource(form, wxT("frmMaintenance"));
RestorePosition();
SetTitle(wxString::Format(_("Maintain %s %s"), object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
Index: frmIndexcheck.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmIndexcheck.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/ui/frmIndexcheck.cpp -Lsrc/ui/frmIndexcheck.cpp -u -w -r1.8 -r1.9
--- src/ui/frmIndexcheck.cpp
+++ src/ui/frmIndexcheck.cpp
@@ -43,7 +43,7 @@
nbNotebook = 0;
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(wxT("frmIndexCheck"));
+ LoadResource(form, wxT("frmIndexCheck"));
RestorePosition();
SetTitle(wxString::Format(_("Check Foreign Key indexes on %s %s"), object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
Index: frmStatus.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.33 -r1.34
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -76,7 +76,7 @@
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(wxT("frmStatus"));
+ LoadResource(form, wxT("frmStatus"));
RestorePosition(-1, -1, 400, 240, 200, 150);
SetTitle(_title);
Index: frmConnect.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmConnect.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -Lsrc/ui/frmConnect.cpp -Lsrc/ui/frmConnect.cpp -u -w -r1.24 -r1.25
--- src/ui/frmConnect.cpp
+++ src/ui/frmConnect.cpp
@@ -52,7 +52,7 @@
wxLogInfo(wxT("Creating a connect dialogue"));
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(wxT("frmConnect"));
+ LoadResource(form, wxT("frmConnect"));
// Icon
SetIcon(wxIcon(pgAdmin3_xpm));
Index: dlgAddTableView.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgAddTableView.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lsrc/ui/dlgAddTableView.cpp -Lsrc/ui/dlgAddTableView.cpp -u -w -r1.14 -r1.15
--- src/ui/dlgAddTableView.cpp
+++ src/ui/dlgAddTableView.cpp
@@ -43,7 +43,7 @@
wxLogInfo(wxT("Creating the Query Builder Add Table/View dialogue"));
// Load the XML resource for this dialog
- LoadResource(wxT("frmAddTableView"));
+ LoadResource(frame, wxT("frmAddTableView"));
// Set the Icon
SetIcon(wxIcon(pgAdmin3_xpm));
Index: frmBackup.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmBackup.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsrc/ui/frmBackup.cpp -Lsrc/ui/frmBackup.cpp -u -w -r1.4 -r1.5
--- src/ui/frmBackup.cpp
+++ src/ui/frmBackup.cpp
@@ -61,7 +61,7 @@
wxLogInfo(wxT("Creating a backup dialogue for %s %s"), object->GetTypeName().c_str(), object->GetFullName().c_str());
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(wxT("frmBackup"));
+ LoadResource(form, wxT("frmBackup"));
RestorePosition();
SetTitle(wxString::Format(_("Backup %s %s"), object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
Index: dlgProperty.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgProperty.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.82 -r1.83
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -86,7 +86,7 @@
mainForm=frame;
database=0;
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(resName);
+ LoadResource(frame, resName);
nbNotebook = CTRL_NOTEBOOK("nbNotebook");
if (!nbNotebook)
Index: frmRestore.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmRestore.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/ui/frmRestore.cpp -Lsrc/ui/frmRestore.cpp -u -w -r1.6 -r1.7
--- src/ui/frmRestore.cpp
+++ src/ui/frmRestore.cpp
@@ -61,7 +61,7 @@
wxLogInfo(wxT("Creating a restore dialogue for %s %s"), object->GetTypeName().c_str(), object->GetFullName().c_str());
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(wxT("frmRestore"));
+ LoadResource(_form, wxT("frmRestore"));
RestorePosition();
SetTitle(wxString::Format(_("Restore %s %s"), object->GetTranslatedTypeName().c_str(), object->GetFullIdentifier().c_str()));
Index: dlgEditGridOptions.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgEditGridOptions.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lsrc/ui/dlgEditGridOptions.cpp -Lsrc/ui/dlgEditGridOptions.cpp -u -w -r1.19 -r1.20
--- src/ui/dlgEditGridOptions.cpp
+++ src/ui/dlgEditGridOptions.cpp
@@ -65,7 +65,7 @@
relation=rel;
parent=win;
wxWindowBase::SetFont(settings->GetSystemFont());
- LoadResource(wxT("dlgEditGridOptions"));
+ LoadResource(win, wxT("dlgEditGridOptions"));
conv = &wxConvLibc;
// Icon
Home |
Main Index |
Thread Index
