[3depict] 01/01: * Fix modal dialog not working when patch applied - strip filter dialog doesnt't work due to patch

[D Haley]

This is an automated email from the git hooks/post-receive script.

mycae-guest pushed a commit to branch master
in repository 3depict.

commit 4c85e1c37363422c18b79266851c56613743e2a5
Author: D Haley <mycae at gmx.com>
Date:   Tue Jun 3 04:16:52 2014 +0200

    * Fix modal dialog not working when patch applied
    	- strip filter dialog doesnt't work due to patch
---
 debian/changelog           |  4 ++--
 debian/patches/wx3-startup | 55 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9cc69f..3a16459 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 3depict (0.0.16-2) UNRELEASED; urgency=medium
 
-  * Add wx 3.0 startup patch (Closes #746609)
+  * Add wx 3.0 startup patch (Closes: #746609)
 
- -- D Haley <mycae at gmx.com>  Wed, 07 May 2014 22:26:00 +0100
+ -- D Haley <mycae at gmx.com>  Mon, 09 Jun 2014 22:54:00 +0100
 
 3depict (0.0.16-1) unstable; urgency=medium
 
diff --git a/debian/patches/wx3-startup b/debian/patches/wx3-startup
index ee183be..a79cbc4 100644
--- a/debian/patches/wx3-startup
+++ b/debian/patches/wx3-startup
@@ -1,8 +1,8 @@
 Index: 3depict-0.0.16/src/3Depict.cpp
 ===================================================================
---- 3depict-0.0.16.orig/src/3Depict.cpp	2014-05-07 23:43:00.214805185 +0200
-+++ 3depict-0.0.16/src/3Depict.cpp	2014-05-07 23:43:40.750295585 +0200
-@@ -457,7 +457,11 @@
+--- 3depict-0.0.16.orig/src/3Depict.cpp	2014-06-03 04:15:59.421246388 +0200
++++ 3depict-0.0.16/src/3Depict.cpp	2014-06-03 04:16:03.689192733 +0200
+@@ -457,11 +457,17 @@
  
  
      MainFrame->Show();
@@ -15,10 +15,16 @@ Index: 3depict-0.0.16/src/3Depict.cpp
      if(commandLineFiles.GetCount())
      	MainFrame->SetCommandLineFiles(commandLineFiles);
  
+     MainFrame->fixSplitterWindow();
++
++    MainFrame->finaliseStartup();
+     return true;
+ }
+ 
 Index: 3depict-0.0.16/src/gui/mainFrame.cpp
 ===================================================================
---- 3depict-0.0.16.orig/src/gui/mainFrame.cpp	2014-05-07 23:43:00.286804280 +0200
-+++ 3depict-0.0.16/src/gui/mainFrame.cpp	2014-05-07 23:43:40.750295585 +0200
+--- 3depict-0.0.16.orig/src/gui/mainFrame.cpp	2014-06-03 04:15:59.421246388 +0200
++++ 3depict-0.0.16/src/gui/mainFrame.cpp	2014-06-03 04:16:03.693192682 +0200
 @@ -727,12 +727,6 @@
  	    restoreConfigDefaults();
  	
@@ -32,7 +38,29 @@ Index: 3depict-0.0.16/src/gui/mainFrame.cpp
  	//Try to set the window size to a nice size
  	SetSize(getNiceWindowSize());
  
-@@ -5376,6 +5370,16 @@
+@@ -742,8 +736,6 @@
+ 
+ 
+ 
+-	updateTimer->Start(UPDATE_TIMER_DELAY,wxTIMER_CONTINUOUS);
+-	autoSaveTimer->Start(AUTOSAVE_DELAY*1000,wxTIMER_CONTINUOUS);
+ 
+ #ifndef DISABLE_ONLINE_UPDATE
+         wxDateTime datetime = wxDateTime::Today();	
+@@ -808,6 +800,12 @@
+ }
+ 
+ 
++void MainWindowFrame::finaliseStartup()
++{
++	updateTimer->Start(UPDATE_TIMER_DELAY,wxTIMER_CONTINUOUS);
++	autoSaveTimer->Start(AUTOSAVE_DELAY*1000,wxTIMER_CONTINUOUS);
++}
++
+ BEGIN_EVENT_TABLE(MainWindowFrame, wxFrame)
+     EVT_GRID_CMD_EDITOR_SHOWN(ID_GRID_FILTER_PROPERTY,MainWindowFrame::OnFilterGridCellEditorShow)
+     EVT_GRID_CMD_EDITOR_HIDDEN(ID_GRID_FILTER_PROPERTY,MainWindowFrame::OnFilterGridCellEditorHide)
+@@ -5376,6 +5374,16 @@
  		visControl.setIonDisplayLimit(configFile.getMaxPoints());
  	}
  
@@ -49,7 +77,7 @@ Index: 3depict-0.0.16/src/gui/mainFrame.cpp
  	//Show startup tip dialog as needed
  	if(configFile.wantStartupTips())
  	{
-@@ -5402,12 +5406,6 @@
+@@ -5402,12 +5410,6 @@
  			WARN(false,"Tip file not found at startup, but user wanted it...");
  		}
  	}
@@ -64,8 +92,8 @@ Index: 3depict-0.0.16/src/gui/mainFrame.cpp
  void MainWindowFrame::restoreConfigPanelDefaults()
 Index: 3depict-0.0.16/src/gui/mainFrame.h
 ===================================================================
---- 3depict-0.0.16.orig/src/gui/mainFrame.h	2014-05-07 23:42:53.170893739 +0200
-+++ 3depict-0.0.16/src/gui/mainFrame.h	2014-05-07 23:43:40.750295585 +0200
+--- 3depict-0.0.16.orig/src/gui/mainFrame.h	2014-06-03 04:15:59.421246388 +0200
++++ 3depict-0.0.16/src/gui/mainFrame.h	2014-06-03 04:16:03.693192682 +0200
 @@ -382,6 +382,10 @@
      //return type of file, based upon heuristic check
      static unsigned int guessFileType(const std::string &file);
@@ -77,3 +105,12 @@ Index: 3depict-0.0.16/src/gui/mainFrame.h
      //See if the user wants to save the current state
      void checkAskSaveState();
      
+@@ -397,6 +401,8 @@
+     void onPanelSpectraUpdate() {plotUpdates=true;} ;
+ 
+     bool initOK() const {return initedOK;}
++    
++    void finaliseStartup();
+ 
+     //This is isolated from the layout code, due to "bug" 4815 in wx. The splitter window
+     //does not know how to choose a good size until the window is shown

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/3depict.git