← Back to branch summary

~ubuntu-branches/debian/stretch/openbabel/stretch

« back to all changes in this revision

Viewing changes to src/GUI/optswx.cpp

  • Committer: Package Import Robot
  • Author(s): Daniel Leidert
  • Date: 2013-05-22 19:08:27 UTC
  • mfrom: (1.1.11) (7.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20130522190827-72q0fnx5y2nm3bc0
Tags: 2.3.2+dfsg-1
* New upstream release.
* debian/control: Dropped DM-Upload-Allowed field.
  (Standards-Version): Bumped to 3.9.4.
* debian/copyright: Massive update.
* debian/upstream: Author name update.
* debian/get-orig-source.sh: Remove the windows-*/ directory too.
* debian/openbabel.install: Removed roundtrip manpage.
* debian/openbabel-gui.install: Fixed manpage name.
* debian/openbabel-gui.links: Removed unused file.
* debian/rules: Enable OpenMP. Disable tests on `nocheck'.
* debian/patches/gaussformat_nosym.patch: Dropped. Applied upstream.
* debian/patches/moldenformat_coordonly.patch: Ditto.
* debian/patches/obspectrophore_man.patch: Ditto.
* debian/patches/fix_ftbfs.patch: Added.
  - Fix several FTBFS issues in upstream build system.
* debian/patches/series: Adjusted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/GUI/optswx.cpp
247
247
          while(ProvideEditCtl--)
248
248
          {
249
249
            pEd = new wxTextCtrl(parent,wxID_ANY,wxEmptyString,
250
 
                wxDefaultPosition,wxSize(EDWIDTH,16));
 
250
                wxDefaultPosition,wxSize(EDWIDTH,18));
251
251
            OptionMap.push_back(std::make_pair(oname,pEd));
252
252
            if(ProvideEditCtl)
253
253
              oname = _T(' ') + oname;//editboxes except the first have name preceded by one or more spaces
267
267
          while(ProvideEditCtl--)
268
268
          {
269
269
            pEd = new wxTextCtrl(parent,wxID_ANY,wxEmptyString,
270
 
                wxDefaultPosition,wxSize(EDWIDTH,16));
 
270
                wxDefaultPosition,wxSize(EDWIDTH,18));
271
271
            OptionMap.push_back(std::make_pair(oname,pEd));
272
272
            if(ProvideEditCtl)
273
273
              oname = _T(' ') + oname;//editboxes except the first have name preceded by one or more spaces
345
345
      if(!pChk->IsChecked())
346
346
      {
347
347
        // if a checkbox is not checked, ignore the subsidiary editboxes also
348
 
        while((++itr)->first[0]==' ');
 
348
        while(!(++itr)->first.empty()&& itr->first[0]==_T(' '));
349
349
        --itr;
350
350
        continue;
351
351
      }
374
374
    OMapType::iterator itr2 = itr;
375
375
    while(++itr2!= OptionMap.end())
376
376
    {
377
 
      if(itr2->first[0]!=' ') //subsequent editboxes have the name preceded by a space
 
377
      if((itr2->first).empty() || itr2->first[0]!=_T(' ')) //subsequent editboxes have the name preceded by a space
378
378
        break;
379
379
      txt = txt + _T(' ') + static_cast<wxTextCtrl*>(itr2->second)->GetValue();
380
380
      ++itr;