Thread: pgAdmin III commit: Somehow forgot to commit this.
Somehow forgot to commit this. Branch ------ master Details ------- http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=9b1673f4efc1ebcbf40750af1cfaede2da753380 Author: Peter Geoghegan <peter.geoghegan86@gmail.com> Modified Files -------------- acinclude.m4 | 4 ++-- pgadmin/frm/frmQuery.cpp | 4 ++-- pgadmin/utils/sysLogger.cpp | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-)
On 16 February 2011 12:54, Dave Page <dpage@pgadmin.org> wrote: > Somehow forgot to commit this. > > Branch > ------ > master > > Details > ------- > http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=9b1673f4efc1ebcbf40750af1cfaede2da753380 > Author: Peter Geoghegan <peter.geoghegan86@gmail.com> > > Modified Files > -------------- > acinclude.m4 | 4 ++-- > pgadmin/frm/frmQuery.cpp | 4 ++-- > pgadmin/utils/sysLogger.cpp | 3 +++ > 3 files changed, 7 insertions(+), 4 deletions(-) And what is "this"? -- Thom Brown Twitter: @darkixion IRC (freenode): dark_ixion Registered Linux user: #516935
On Wed, Feb 16, 2011 at 12:56 PM, Thom Brown <thom@linux.com> wrote: > On 16 February 2011 12:54, Dave Page <dpage@pgadmin.org> wrote: >> Somehow forgot to commit this. >> >> Branch >> ------ >> master >> >> Details >> ------- >> http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=9b1673f4efc1ebcbf40750af1cfaede2da753380 >> Author: Peter Geoghegan <peter.geoghegan86@gmail.com> >> >> Modified Files >> -------------- >> acinclude.m4 | 4 ++-- >> pgadmin/frm/frmQuery.cpp | 4 ++-- >> pgadmin/utils/sysLogger.cpp | 3 +++ >> 3 files changed, 7 insertions(+), 4 deletions(-) > > And what is "this"? Sorry - some wx2.9 related cleanups. -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
On 16 February 2011 13:03, Dave Page <dpage@pgadmin.org> wrote: > On Wed, Feb 16, 2011 at 12:56 PM, Thom Brown <thom@linux.com> wrote: >> On 16 February 2011 12:54, Dave Page <dpage@pgadmin.org> wrote: >>> Somehow forgot to commit this. >>> >>> Branch >>> ------ >>> master >>> >>> Details >>> ------- >>> http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=9b1673f4efc1ebcbf40750af1cfaede2da753380 >>> Author: Peter Geoghegan <peter.geoghegan86@gmail.com> >>> >>> Modified Files >>> -------------- >>> acinclude.m4 | 4 ++-- >>> pgadmin/frm/frmQuery.cpp | 4 ++-- >>> pgadmin/utils/sysLogger.cpp | 3 +++ >>> 3 files changed, 7 insertions(+), 4 deletions(-) >> >> And what is "this"? > > Sorry - some wx2.9 related cleanups. Ah, boring stuff then ;) -- Thom Brown Twitter: @darkixion IRC (freenode): dark_ixion Registered Linux user: #516935
On Wed, Feb 16, 2011 at 1:04 PM, Thom Brown <thom@linux.com> wrote: > On 16 February 2011 13:03, Dave Page <dpage@pgadmin.org> wrote: >> On Wed, Feb 16, 2011 at 12:56 PM, Thom Brown <thom@linux.com> wrote: >>> On 16 February 2011 12:54, Dave Page <dpage@pgadmin.org> wrote: >>>> Somehow forgot to commit this. >>>> >>>> Branch >>>> ------ >>>> master >>>> >>>> Details >>>> ------- >>>> http://git.postgresql.org/gitweb?p=pgadmin3.git;a=commitdiff;h=9b1673f4efc1ebcbf40750af1cfaede2da753380 >>>> Author: Peter Geoghegan <peter.geoghegan86@gmail.com> >>>> >>>> Modified Files >>>> -------------- >>>> acinclude.m4 | 4 ++-- >>>> pgadmin/frm/frmQuery.cpp | 4 ++-- >>>> pgadmin/utils/sysLogger.cpp | 3 +++ >>>> 3 files changed, 7 insertions(+), 4 deletions(-) >>> >>> And what is "this"? >> >> Sorry - some wx2.9 related cleanups. > > Ah, boring stuff then ;) Boring... but important. -- Dave Page Blog: http://pgsnake.blogspot.com Twitter: @pgsnake EnterpriseDB UK: http://www.enterprisedb.com The Enterprise PostgreSQL Company
uh, what about the patch I sent you last night,
patch_with_ogl.patch.gz? It integrated OGL into our tree.
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);
--
Regards,
Peter Geoghegan
On Wed, Feb 16, 2011 at 1:21 PM, Peter Geoghegan
<peter.geoghegan86@gmail.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
Oh, okay.
It doesn't actually build against 2.9 yet, due to a lack of this,
because someone subsequently broke 2.9 compatibility:
// Handle, and pass up child focus events
void ctlAuiNotebook::OnChildFocus(wxChildFocusEvent &event)
{
+
+#if wxCHECK_VERSION(2, 9, 0)
+ wxAuiNotebook::OnChildFocusNotebook(event);
+ GetParent()->GetEventHandler()->AddPendingEvent(event);
+#else
wxAuiNotebook::OnChildFocus(event);
GetParent()->AddPendingEvent(event);
+#endif
+
}
The next patch of mine you commit should be last night's, which is a
superset of this patch. There will be merge conflicts. Would you like
me to produce a new patch without merge conflicts for your
convenience?
--
Regards,
Peter Geoghegan
On Wed, Feb 16, 2011 at 1:38 PM, Peter Geoghegan
<peter.geoghegan86@gmail.com> wrote:
> Oh, okay.
>
> It doesn't actually build against 2.9 yet, due to a lack of this,
> because someone subsequently broke 2.9 compatibility:
That would be me :-p
> // Handle, and pass up child focus events
> void ctlAuiNotebook::OnChildFocus(wxChildFocusEvent &event)
> {
> +
> +#if wxCHECK_VERSION(2, 9, 0)
> + wxAuiNotebook::OnChildFocusNotebook(event);
> + GetParent()->GetEventHandler()->AddPendingEvent(event);
> +#else
> wxAuiNotebook::OnChildFocus(event);
> GetParent()->AddPendingEvent(event);
> +#endif
> +
> }
>
> The next patch of mine you commit should be last night's, which is a
> superset of this patch. There will be merge conflicts. Would you like
> me to produce a new patch without merge conflicts for your
> convenience?
That would be helpful - thanks.
--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake
EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company