Log Message:
-----------
statusbar fixes
Modified Files:
--------------
pgadmin3/src/ui:
dlgFunction.cpp (r1.34 -> r1.35)
dlgProperty.cpp (r1.83 -> r1.84)
Index: dlgProperty.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgProperty.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.83 -r1.84
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -115,12 +115,12 @@
btnOK->Disable();
wxSize size=GetSize();
+ wxWindow *statusBarContainer=FindWindow(wxT("unkStatusBar_container"));
- if (wxWindowBase::FindWindow(XRCID("unkStatusBar")))
+ if (statusBarContainer)
{
statusBox = 0;
- statusBar = new wxStatusBar(this, -1, wxST_SIZEGRIP);
- wxXmlResource::Get()->AttachUnknownControl(wxT("unkStatusBar"), statusBar);
+ statusBar = new wxStatusBar(statusBarContainer, -1, wxST_SIZEGRIP);
}
else
{
Index: dlgFunction.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgFunction.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -Lsrc/ui/dlgFunction.cpp -Lsrc/ui/dlgFunction.cpp -u -w -r1.34 -r1.35
--- src/ui/dlgFunction.cpp
+++ src/ui/dlgFunction.cpp
@@ -353,9 +353,9 @@
argNameRow = lstArguments->FindItem(-1, txtArgName->GetValue());
int pos=lstArguments->GetSelection();
-
- btnAdd->Enable(argNameRow < 0);
- btnChange->Enable(pos >= 0);
+ int typeno=cbDatatype->GetGuessedSelection();
+ btnAdd->Enable(argNameRow < 0 && typeno >= 0);
+ btnChange->Enable(pos >= 0 && typeno >= 0);
btnRemove->Enable(pos >= 0);
}
---------------------------(end of broadcast)---------------------------
TIP 9: the planner will ignore your desire to choose an index scan if your
joining column's datatypes do not match
