← Back to branch summary

~ubuntu-branches/debian/sid/pgadmin3/sid

« back to all changes in this revision

Viewing changes to pgadmin/dlg/dlgClasses.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gerfried Fuchs
  • Date: 2009-07-30 12:27:16 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20090730122716-fddbh42on721bbs2
Tags: 1.10.0-1
* New upstream release.
* Adjusted watch file to match release candidates.
* Updated to Standards-Version 3.8.2:
  - Moved to Section: database.
  - Add DEB_BUILD_OPTIONS support for parallel building.
  - Move from findstring to filter suggestion for DEB_BUILD_OPTIONS parsing.
* pgagent got split into its own separate source package by upstream.
* Exclude Docs.vcproj from installation.
* Move doc-base.enus from pgadmin3 to pgadmin3-data package, the files are
  in there too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pgadmin/dlg/dlgClasses.cpp
1
1
//////////////////////////////////////////////////////////////////////////
2
2
//
3
3
// pgAdmin III - PostgreSQL Tools
4
 
// RCS-ID:      $Id: dlgClasses.cpp 6930 2008-01-02 00:10:01Z dpage $
5
 
// Copyright (C) 2002 - 2008, The pgAdmin Development Team
6
 
// This software is released under the Artistic Licence
 
4
// RCS-ID:      $Id: dlgClasses.cpp 7885 2009-05-27 13:36:54Z dpage $
 
5
// Copyright (C) 2002 - 2009, The pgAdmin Development Team
 
6
// This software is released under the BSD Licence
7
7
//
8
8
// dlgClasses.cpp - Some dialogue base classes 
9
9
//
474
474
 
475
475
void ExecutionDialog::OnOK(wxCommandEvent& ev)
476
476
{
 
477
#ifdef __WXGTK__
 
478
    if (!btnOK->IsEnabled())
 
479
        return;
 
480
#endif
477
481
    if (!thread)
478
482
    {
479
483
        wxString sql=GetSql();
513
517
                txtMessages->AppendText(thread->GetMessagesAndClear());
514
518
 
515
519
            if (thread->DataSet() != NULL)
516
 
                wxLogDebug(wxString::Format(wxT("%d rows."), thread->DataSet()->NumRows()));
 
520
                wxLogInfo(wxString::Format(wxT("%d rows."), thread->DataSet()->NumRows()));
517
521
 
518
522
            if (isOk)
519
523
            {
581
585
 
582
586
void ExternProcessDialog::OnOK(wxCommandEvent& ev)
583
587
{
 
588
#ifdef __WXGTK__
 
589
    if (!btnOK->IsEnabled())
 
590
        return;
 
591
#endif
584
592
    if (!done)
585
593
        Execute(0);
586
594
    else