Description: Fix to make loch nearly work with wxWidgets 3.0
Author: Olly Betts <olly@survex.com>
Origin: debian
Forwarded: no
Last-Update: 2013-11-15

Index: therion-5.3.11/loch/lxGLC.cxx
===================================================================
--- therion-5.3.11.orig/loch/lxGLC.cxx	2013-11-15 12:29:04.041293275 +0000
+++ therion-5.3.11/loch/lxGLC.cxx	2013-11-15 12:53:59.832104482 +0000
@@ -84,7 +84,7 @@
 lxGLCanvas::lxGLCanvas(struct lxSetup * stp, struct lxData * dat, 
                        wxWindow *parent, wxWindowID id,
                        const wxPoint& pos, const wxSize& size, long style, const wxString& name)
-                       : wxGLCanvas(parent, (wxGLCanvas*) NULL, id, pos, size, style, name)
+                       : wxGLCanvas(parent, id, NULL, pos, size, style, name)
 {
   this->frame = NULL;
   this->data = dat;
@@ -1539,7 +1538,7 @@
 
   glPopMatrix();
 
-  this->GetFontNumeric()->draw((-2.0) * lxFNTSW, this->m_indRes * (-size - 1.0) - lxFNTSH, wxString::Format(_("%03d\260"), int(this->setup->cam_dir)));
+  this->GetFontNumeric()->draw((-2.0) * lxFNTSW, this->m_indRes * (-size - 1.0) - lxFNTSH, wxString::Format(_("%03d\xc2\xb0"), int(this->setup->cam_dir)));
 
 }
 
@@ -1626,7 +1625,7 @@
   glPopMatrix();
   glPopMatrix();
 
-  this->GetFontNumeric()->draw(this->m_indRes * (-size) / 2.0 - 1.5 * lxFNTSW, this->m_indRes * (-1.0) - lxFNTSH, wxString::Format(_("%+03d\260"), int(this->setup->cam_tilt)));
+  this->GetFontNumeric()->draw(this->m_indRes * (-size) / 2.0 - 1.5 * lxFNTSW, this->m_indRes * (-1.0) - lxFNTSH, wxString::Format(_("%+03d\xc2\xb0"), int(this->setup->cam_tilt)));
 }
 
 
Index: therion-5.3.11/loch/lxGUI.cxx
===================================================================
--- therion-5.3.11.orig/loch/lxGUI.cxx	2013-11-15 12:29:04.041293275 +0000
+++ therion-5.3.11/loch/lxGUI.cxx	2013-11-15 12:29:04.037293350 +0000
@@ -1099,7 +1099,7 @@
 bool lxApp::OnInit()
 {
 
-    m_locale.Init(wxLANGUAGE_DEFAULT, wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
+    m_locale.Init(wxLANGUAGE_DEFAULT, wxLOCALE_LOAD_DEFAULT);
     m_locale.AddCatalog(wxT("loch"));
     m_path = wxFileName(this->argv[0]);
 
Index: therion-5.3.11/loch/lxSView.cxx
===================================================================
--- therion-5.3.11.orig/loch/lxSView.cxx	2013-11-15 12:29:04.041293275 +0000
+++ therion-5.3.11/loch/lxSView.cxx	2013-11-15 12:29:04.037293350 +0000
@@ -310,7 +310,7 @@
 
 	lxGBSizer = new wxGridBagSizer();
 
-  lxGBSizer->AddGrowableCol(1, 1);
+  lxGBSizer->AddGrowableCol(0, 1);
 
 	lxGBSizer->Add(
 		new wxStaticText(lxPanel, wxID_ANY, _("Facing (deg)")),
@@ -387,7 +387,7 @@
   
 	lxGBSizer = new wxGridBagSizer();
 
-  lxGBSizer->AddGrowableCol(1, 1);
+  lxGBSizer->AddGrowableCol(0, 1);
 
 	lxGBSizer->Add(
 	  new wxStaticText(lxPanel, wxID_ANY, _("Distance (m)")),
@@ -430,7 +430,7 @@
   ADDST(wxID_ANY, _("Rotation speed"))
 
   wxSlider * rspeed = new wxSlider(lxPanel, LXVSTP_ROTSPEED, 0, -1000, 1000, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_AUTOTICKS);
-  rspeed->SetTickFreq(1000,0);
+  rspeed->SetTickFreq(1000);
 
   lxBoxSizer->Add(
 		rspeed,