← Back to branch summary

~ubuntu-branches/debian/stretch/3depict/stretch

« back to all changes in this revision

Viewing changes to src/gui/mainFrame.cpp

  • Committer: Package Import Robot
  • Author(s): D Haley
  • Date: 2014-06-09 22:54:00 UTC
  • Revision ID: package-import@ubuntu.com-20140609225400-mxteq4a0xq9cfws3
Tags: 0.0.16-2
http://bugs.debian.org/746609
Add wx 3.0 startup patch (Closes: #746609)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/mainFrame.cpp
727
727
            restoreConfigDefaults();
728
728
        
729
729
        
730
 
        
731
 
        //Attempt to load the auto-save file, if it exists
732
 
        //-----------------
733
 
        checkReloadAutosave();
734
 
        //-----------------
735
 
 
736
730
        //Try to set the window size to a nice size
737
731
        SetSize(getNiceWindowSize());
738
732
 
742
736
 
743
737
 
744
738
 
745
 
        updateTimer->Start(UPDATE_TIMER_DELAY,wxTIMER_CONTINUOUS);
746
 
        autoSaveTimer->Start(AUTOSAVE_DELAY*1000,wxTIMER_CONTINUOUS);
747
739
 
748
740
#ifndef DISABLE_ONLINE_UPDATE
749
741
        wxDateTime datetime = wxDateTime::Today();      
808
800
}
809
801
 
810
802
 
 
803
void MainWindowFrame::finaliseStartup()
 
804
{
 
805
        updateTimer->Start(UPDATE_TIMER_DELAY,wxTIMER_CONTINUOUS);
 
806
        autoSaveTimer->Start(AUTOSAVE_DELAY*1000,wxTIMER_CONTINUOUS);
 
807
}
 
808
 
811
809
BEGIN_EVENT_TABLE(MainWindowFrame, wxFrame)
812
810
    EVT_GRID_CMD_EDITOR_SHOWN(ID_GRID_FILTER_PROPERTY,MainWindowFrame::OnFilterGridCellEditorShow)
813
811
    EVT_GRID_CMD_EDITOR_HIDDEN(ID_GRID_FILTER_PROPERTY,MainWindowFrame::OnFilterGridCellEditorHide)
5376
5374
                visControl.setIonDisplayLimit(configFile.getMaxPoints());
5377
5375
        }
5378
5376
 
 
5377
        
 
5378
        if(configFile.getWantStartupOrthoCam())
 
5379
        {
 
5380
                visControl.setCamProperties(visControl.getActiveCamId(), 
 
5381
                                        CAMERA_KEY_LOOKAT_PROJECTIONMODE,TRANS("Orthogonal"));
 
5382
        }
 
5383
}
 
5384
 
 
5385
void MainWindowFrame::checkShowTips()
 
5386
{
5379
5387
        //Show startup tip dialog as needed
5380
5388
        if(configFile.wantStartupTips())
5381
5389
        {
5402
5410
                        WARN(false,"Tip file not found at startup, but user wanted it...");
5403
5411
                }
5404
5412
        }
5405
 
        
5406
 
        if(configFile.getWantStartupOrthoCam())
5407
 
        {
5408
 
                visControl.setCamProperties(visControl.getActiveCamId(), 
5409
 
                                        CAMERA_KEY_LOOKAT_PROJECTIONMODE,TRANS("Orthogonal"));
5410
 
        }
5411
5413
}
5412
5414
 
5413
5415
void MainWindowFrame::restoreConfigPanelDefaults()