Hugin

branch:     
details:    http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/511d26502cc8
changeset:  6018:511d26502cc8
user:       tmodes
date:       Fri Nov 09 20:19:03 2012 +0100
description:

Use WXK_CONTROL with "older" wxWidgets version
WXK_COMMAND is not correctly handled by older wxWidgets version
WXK_COMMAND implements a better handling for Mac

diffstat:

 src/hugin1/hugin/ImagesPanel.cpp    |  4 ++++
 src/hugin1/hugin/PanoPanel.cpp      |  4 ++++
 src/hugin1/ptbatcher/BatchFrame.cpp |  4 ++++
 3 files changed, 12 insertions(+), 0 deletions(-)

diffs (45 lines):

diff -r 7c6a1ffd9b1f -r 511d26502cc8 src/hugin1/hugin/ImagesPanel.cpp
--- a/src/hugin1/hugin/ImagesPanel.cpp	Fri Nov 09 20:17:14 2012 +0100
+++ b/src/hugin1/hugin/ImagesPanel.cpp	Fri Nov 09 20:19:03 2012 +0100
@@ -301,7 +301,11 @@
 
     wxConfigBase* config=wxConfigBase::Get();
     long nFeatures = HUGIN_ASS_NCONTROLPOINTS;
+#if wxCHECK_VERSION(2,9,4)
     if(wxGetKeyState(WXK_COMMAND))
+#else
+    if(wxGetKeyState(WXK_CONTROL))
+#endif
     {
         nFeatures = config->Read(wxT("/MainFrame/nControlPoints"), HUGIN_ASS_NCONTROLPOINTS);
         nFeatures = wxGetNumberFromUser(
diff -r 7c6a1ffd9b1f -r 511d26502cc8 src/hugin1/hugin/PanoPanel.cpp
--- a/src/hugin1/hugin/PanoPanel.cpp	Fri Nov 09 20:17:14 2012 +0100
+++ b/src/hugin1/hugin/PanoPanel.cpp	Fri Nov 09 20:19:03 2012 +0100
@@ -1228,7 +1228,11 @@
 void PanoPanel::OnDoStitch ( wxCommandEvent & e )
 {
     long t;
+#if wxCHECK_VERSION(2,9,4)
     if(wxGetKeyState(WXK_COMMAND))
+#else
+    if(wxGetKeyState(WXK_CONTROL))
+#endif
     {
         t=1;
     }
diff -r 7c6a1ffd9b1f -r 511d26502cc8 src/hugin1/ptbatcher/BatchFrame.cpp
--- a/src/hugin1/ptbatcher/BatchFrame.cpp	Fri Nov 09 20:17:14 2012 +0100
+++ b/src/hugin1/ptbatcher/BatchFrame.cpp	Fri Nov 09 20:19:03 2012 +0100
@@ -180,7 +180,11 @@
 #endif
     m_batch = new Batch(this,wxTheApp->argv[0],true);
     m_batch->gui = true;
+#if wxCHECK_VERSION(2,9,4)
     if(wxGetKeyState(WXK_COMMAND))
+#else
+    if(wxGetKeyState(WXK_CONTROL))
+#endif
     {
 #ifdef __WXMAC__
         wxString text(_("You have pressed the Command key."));