CVS Commit by andreas: fixed gtk focus/caret issues

[cvs(at)cvs(dot)pgadmin(dot)org]

Log Message:
-----------
fixed gtk focus/caret issues

Modified Files:
--------------
    pgadmin3:
        BUGS.txt (r1.49 -> r1.50)
    pgadmin3/src/ui:
        events.cpp (r1.96 -> r1.97)
        frmQuery.cpp (r1.70 -> r1.71)

Index: BUGS.txt
===================================================================
RCS file: /projects/pgadmin3/BUGS.txt,v
retrieving revision 1.49
retrieving revision 1.50
diff -LBUGS.txt -LBUGS.txt -u -w -r1.49 -r1.50
--- BUGS.txt
+++ BUGS.txt
@@ -1,16 +1,14 @@
 <ul>
     <li>Known issues
     <ul>
-	<li>[gtk] retrieving current focus in QueryWindow failes (needed for toolbar enabling)
 	<li>[Object Tree] missing schema for function return type if table type (are there more cases?)
-	<li>[gtk] cursor problem with wxSTC (disappears every second focus change)
 	<li>[Query Builder] Menu item 'Query Browser' causes Segfault under unix - crash after qbForm->Show() in frmQueryBuilder::OnSize() at layout.LayoutMDIFrame(this). QB currently disabled.
 	<li>[Object Tree] Adding an unnamed constraint isn't reflected immediately in the tree.
 	<li>[Windows] Alt+Tab Icon is system default.
-	<li>[gtk] Segfault when refreshing a schema in the treeview that has been dropped through SQL. Works in XP.
     </ul>
     <li>Known wxWindows issues
     <ul>
+	<li>[gtk Query Tool] copy from msg or history window using toolbar doesn't work (patch pending)
 	<li>[Object Tree] Scrollbar doesn scroll page by page under gtk
 	<li>[Main listview] Background behind the tabs doesn't redraw on Win XP and 2003.
 	<li>[Edit Grid] several platform-dependent misbehaviours when
@@ -25,6 +23,9 @@
     </ul>
     <li>Fixed issues
     <ul>
+	<li>AP 2004-07-11 [gtk] Segfault when refreshing a schema in the treeview that has been dropped through SQL. seems fixed by wx
+	<li>AP 2004-07-11 [gtk] retrieving current focus in QueryWindow failes (needed for toolbar enabling)
+	<li>AP 2004-07-11 [gtk] cursor problem with wxSTC (disappears every second focus change)
 	<li>AP 2004-06-04 [all] Multi-value variables (db and user) handled incorrectly (e.g. search_path)
 	<li>AP 2004-06-04 [Object Tree/Columns]check for dependencies on column type change
 	<li>A= 2004-01-01 [all Controls with gtk] Paste from other apps will fail for non-unicode apps (fixed in pgadmin3-wx snapshot, submitted to wx as 776217).
Index: frmQuery.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmQuery.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -Lsrc/ui/frmQuery.cpp -Lsrc/ui/frmQuery.cpp -u -w -r1.70 -r1.71
--- src/ui/frmQuery.cpp
+++ src/ui/frmQuery.cpp
@@ -511,6 +511,7 @@
 void frmQuery::OnSetFocus(wxFocusEvent& event)
 {
 	sqlQuery->SetFocus();
+	event.Skip();
 }
 
 
@@ -538,7 +539,7 @@
 
 void frmQuery::OnCut(wxCommandEvent& ev)
 {
-    if (FindFocus() == sqlQuery)
+    if (currentControl() == sqlQuery)
     {
         sqlQuery->Cut();
         updateMenu();
@@ -599,6 +600,7 @@
 
 void frmQuery::OnPaste(wxCommandEvent& ev)
 {
+	if (currentControl() == sqlQuery)
     sqlQuery->Paste();
 }
 
@@ -648,7 +650,6 @@
 {
     bool canCut=false;
     bool canPaste=false;
-    bool canSqlStuff=false;
     bool canUndo=false;
     bool canRedo=false;
     bool canClear=false;
@@ -1000,7 +1001,7 @@
             elapsedQuery=wxGetLocalTimeMillis() - startTimeQuery;
             SetStatusText(elapsedQuery.ToString() + wxT(" ms"), STATUSPOS_SECS);
             wxYield();
-            wxUsleep(10);
+            wxMilliSleep(10);
             str=sqlResult->GetMessagesAndClear();
             if (!str.IsEmpty())
             {
Index: events.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/events.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -Lsrc/ui/events.cpp -Lsrc/ui/events.cpp -u -w -r1.96 -r1.97
--- src/ui/events.cpp
+++ src/ui/events.cpp
@@ -555,16 +555,24 @@
     // Warn the user
     int rc;
 
+	wxMessageDialog *dlg;
     if (settings->GetShowSystemObjects())
-        rc=wxMessageBox(
+	{
+		dlg=new wxMessageDialog(this, 
             _("System objects will not be removed from the object tree until a refresh is performed.\nClose all connections now?"),
             _("Hide system objects"),
             wxYES_NO|wxCANCEL | wxICON_QUESTION);
+	}
     else
-        rc=wxMessageBox(
+	{
+        dlg=new wxMessageDialog(this,
             _("System objects will not show in the the object tree until a refresh is performed.\nClose all connections now?"),
             _("Show system objects"),
             wxYES_NO|wxCANCEL | wxICON_QUESTION);
+	}
+	dlg->CenterOnParent();
+	rc=dlg->ShowModal();
+	delete dlg;
 
     if (rc == wxID_CANCEL)
     {