A couple of improvements. I can compile without the wx/regex.h header on
Ubuntu 14.04, and also the WXK_SPACE works.

I still haven't fully grasped how the completion works. If you use the
psql command tool, completion happens at more places than what is
offered by pgadmin, e.g., join. I found the utils/tabcomplete.c file.
-- 
Med Venlig Hilsen / Kind regards,
Mads Jensen

Max Jerry Horovitz: "Unfortunately, in America, babies are not found in
cola cans. I asked my mother when I was four and she said they came from
eggs laid by rabbis. If you aren't Jewish, they're laid by Catholic
nuns. If you're an atheist, they're laid by dirty, lonely prostitutes."
         -- Mary and Max (2009)
>From d978627e17add0b6b0db18305e3a5b17fa496041 Mon Sep 17 00:00:00 2001
From: Mads Jensen <m...@inducks.org>
Date: Mon, 3 Nov 2014 09:47:16 +0100
Subject: [PATCH] removing unused header file, and using macro for space key

---
 pgadmin/ctl/ctlSQLBox.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pgadmin/ctl/ctlSQLBox.cpp b/pgadmin/ctl/ctlSQLBox.cpp
index cf33207..5c87173 100644
--- a/pgadmin/ctl/ctlSQLBox.cpp
+++ b/pgadmin/ctl/ctlSQLBox.cpp
@@ -22,9 +22,6 @@
 #include "dlg/dlgFindReplace.h"
 #include "frm/menu.h"
 
-// Must be last for reasons I haven't fully grokked...
-#include <wx/regex.h>
-
 wxString ctlSQLBox::sqlKeywords;
 
 // Additional pl/pgsql keywords we should highlight
@@ -159,7 +156,7 @@ void ctlSQLBox::Create(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
 	// Setup accelerators
 	wxAcceleratorEntry entries[2];
 	entries[0].Set(wxACCEL_CTRL, (int)'F', MNU_FIND);
-	entries[1].Set(wxACCEL_CTRL, (int)' ', MNU_AUTOCOMPLETE);
+	entries[1].Set(wxACCEL_CTRL, WXK_SPACE, MNU_AUTOCOMPLETE);
 	wxAcceleratorTable accel(2, entries);
 	SetAcceleratorTable(accel);
 
@@ -740,4 +737,3 @@ CharacterRange ctlSQLBox::RegexFindText(int minPos, int maxPos, const wxString &
 
 	return ft.chrgText;
 }
-
-- 
1.9.1

-- 
Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers

Reply via email to