← Back to branch summary

~ubuntu-branches/ubuntu/vivid/lazarus/vivid-proposed

« back to all changes in this revision

Viewing changes to lcl/include/dbcombobox.inc

  • Committer: Package Import Robot
  • Author(s): Paul Gevers, Abou Al Montacir, Paul Gevers
  • Date: 2013-06-22 13:31:45 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20130622133145-kf2awlf322usnrfv
Tags: 1.0.10+dfsg-1
http://bugs.debian.org/712834
[ Abou Al Montacir ]
* New upstream maintenance release offering many fixes improving the IDE and
  the LCL stability level.
  - The detailed list of changes can be found here:
    http://wiki.lazarus.freepascal.org/Lazarus_1.0_fixes_branch#Fixes_for_1.0.10
* Use compiler configuration file to pass debian custom compiler flags.
* Recover FTBFS on arm machines fix, dropped unintentionally when upgrading
  to 1.0.8. QT4 based LCL WS could not use QTOPIA. (Closes: Bug#712834)
* Update copyright notice to highlight that upstream source where repacked.

[ Paul Gevers ]
* Update Standard to 3.9.4 (no changes needed)
* Remove obsolete DM-Upload-Allowed
* Update lintian overrides
* Add myself to uploaders
* Update Vsc-Browser URL to the browse interface

Show diffs side-by-side

added added

removed removed

Lines of Context:
lcl/include/dbcombobox.inc
67
67
begin
68
68
  //avoid reseting text when calling select
69
69
  FDataLink.OnDataChange := nil;
70
 
  FDataLink.Edit;
71
 
  FDataLink.Modified;
72
 
  FDataLink.OnDataChange := @DataChange;
73
 
  inherited Select;
 
70
  try
 
71
    if FDataLink.Edit then
 
72
    begin
 
73
       FDataLink.Modified;
 
74
       inherited Select;
 
75
    end
 
76
    else
 
77
    begin
 
78
       // if cannot modify, let it reset
 
79
       FDatalink.Reset;
 
80
       DataChange(Self);
 
81
    end;
 
82
  finally
 
83
    FDataLink.OnDataChange := @DataChange;
 
84
  end;
74
85
end;