[3depict] 01/02: * Add wx3.0 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 b33dad77a8879c4ccb05bccc5d904635590c2b43
Author: D Haley <mycae at gmx.com>
Date:   Wed May 7 23:44:06 2014 +0200

    * Add wx3.0 patch
---
 debian/patches/series      |  1 +
 debian/patches/wx3-startup | 79 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 6ea1c1c..812bfaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ debian-desktop-naming.patch
 lowercase-textdomain.patch
 upstream-patch
 quilt-is-stupid
+wx3-startup
diff --git a/debian/patches/wx3-startup b/debian/patches/wx3-startup
new file mode 100644
index 0000000..ee183be
--- /dev/null
+++ b/debian/patches/wx3-startup
@@ -0,0 +1,79 @@
+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 @@
+ 
+ 
+     MainFrame->Show();
+-    
++   
++    MainFrame->checkShowTips();
++    MainFrame->checkReloadAutosave();
++
++
+     if(commandLineFiles.GetCount())
+     	MainFrame->SetCommandLineFiles(commandLineFiles);
+ 
+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
+@@ -727,12 +727,6 @@
+ 	    restoreConfigDefaults();
+ 	
+ 	
+-	
+-	//Attempt to load the auto-save file, if it exists
+-	//-----------------
+-	checkReloadAutosave();
+-	//-----------------
+-
+ 	//Try to set the window size to a nice size
+ 	SetSize(getNiceWindowSize());
+ 
+@@ -5376,6 +5370,16 @@
+ 		visControl.setIonDisplayLimit(configFile.getMaxPoints());
+ 	}
+ 
++	
++	if(configFile.getWantStartupOrthoCam())
++	{
++		visControl.setCamProperties(visControl.getActiveCamId(), 
++					CAMERA_KEY_LOOKAT_PROJECTIONMODE,TRANS("Orthogonal"));
++	}
++}
++
++void MainWindowFrame::checkShowTips()
++{
+ 	//Show startup tip dialog as needed
+ 	if(configFile.wantStartupTips())
+ 	{
+@@ -5402,12 +5406,6 @@
+ 			WARN(false,"Tip file not found at startup, but user wanted it...");
+ 		}
+ 	}
+-	
+-	if(configFile.getWantStartupOrthoCam())
+-	{
+-		visControl.setCamProperties(visControl.getActiveCamId(), 
+-					CAMERA_KEY_LOOKAT_PROJECTIONMODE,TRANS("Orthogonal"));
+-	}
+ }
+ 
+ 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
+@@ -382,6 +382,10 @@
+     //return type of file, based upon heuristic check
+     static unsigned int guessFileType(const std::string &file);
+ 
++
++    //Check to see if the user wants a tip file
++    void checkShowTips();
++
+     //See if the user wants to save the current state
+     void checkAskSaveState();
+     

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