From: | Dave Page <dpage(at)pgadmin(dot)org> |
---|---|
To: | Peter Geoghegan <peter(dot)geoghegan86(at)gmail(dot)com> |
Cc: | Thom Brown <thom(at)linux(dot)com>, pgadmin-hackers(at)postgresql(dot)org |
Subject: | Re: pgAdmin III commit: Somehow forgot to commit this. |
Date: | 2011-02-16 13:28:54 |
Message-ID: | AANLkTi=J4XWxPnu+ScAdAOfckUi7H0nCkEBH30KTXxSX@mail.gmail.com |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgadmin-hackers |
On Wed, Feb 16, 2011 at 1:21 PM, Peter Geoghegan
<peter(dot)geoghegan86(at)gmail(dot)com> wrote:
> uh, what about the patch I sent you last night,
> patch_with_ogl.patch.gz? It integrated OGL into our tree.
>
Gimme a chance - that was code which was in my tree when I applied
Nikhil's patch from last week! Yours is further back in the queue :-(
> By the way, this shouldn't have been changed, and has been changed
> back in that patch:
> //Create SQL editor notebook
> sqlNotebook = new ctlAuiNotebook(this, CTL_NTBKCENTER,
> wxDefaultPosition, wxDefaultSize, wxAUI_NB_TOP | wxAUI_NB_TAB_SPLIT |
> wxAUI_NB_TAB_MOVE | wxAUI_NB_SCROLL_BUTTONS |
> wxAUI_NB_WINDOWLIST_BUTTON);
> @@ -994,7 +994,7 @@ void frmQuery::OnChangeConnection(wxCommandEvent &ev)
> pgConn *newconn = dlg.CreateConn(applicationname, createdNewConn);
> if (newconn && createdNewConn)
> {
> - cbConnection->Insert(newconn->GetName(),
> CreateBitmap(GetServerColour(newconn)), sel, (void *)newconn);
> + cbConnection->Insert(newconn->GetName(),
> CreateBitmap(GetServerColour(newconn)), sel, (wxClientData *)newconn);
Fixed, thanks.
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
From | Date | Subject | |
---|---|---|---|
Next Message | Peter Geoghegan | 2011-02-16 13:38:57 | Re: pgAdmin III commit: Somehow forgot to commit this. |
Previous Message | Dave Page | 2011-02-16 13:28:15 | pgAdmin III commit: Revert change to cast, per Peter. |