File: wx3.2-compat.patch

package info (click to toggle)
eviacam 2.1.4-2.1
  • links: PTS
  • area: main
  • in suites: bookworm
  • size: 12,396 kB
  • sloc: xml: 29,876; cpp: 17,253; ansic: 3,032; makefile: 333; sh: 46; sed: 16
file content (29 lines) | stat: -rw-r--r-- 998 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
Description: Fixes for compatibility with wxWidgets 3.2
Author: Olly Betts <olly@survex.com>
Bug-Debian: https://bugs.debian.org/1019790
Forwarded: no
Last-Update: 2022-11-08

--- a/src/wviacam.cpp
+++ b/src/wviacam.cpp
@@ -598,7 +598,8 @@
 		case (wxLANGUAGE_SPANISH_GUATEMALA):
 		case (wxLANGUAGE_SPANISH_HONDURAS):
 		case (wxLANGUAGE_SPANISH_MEXICAN):
-		case (wxLANGUAGE_SPANISH_MODERN):
+		// Same value as wxLANGUAGE_SPANISH in wx3.2:
+		// case (wxLANGUAGE_SPANISH_MODERN):
 		case (wxLANGUAGE_SPANISH_NICARAGUA):
 		case (wxLANGUAGE_SPANISH_PANAMA):
 		case (wxLANGUAGE_SPANISH_PARAGUAY):
--- a/src/viacamcontroller.cpp
+++ b/src/viacamcontroller.cpp
@@ -230,7 +230,7 @@
 
 			wxSingleChoiceDialog choiceDlg(
 				NULL, _("Choose the camera to use"), _T("Enable Viacam"), strArray, 
-				(char**)NULL, wxDEFAULT_DIALOG_STYLE | wxOK | wxCANCEL | wxCENTRE);
+				(void**)NULL, wxDEFAULT_DIALOG_STYLE | wxOK | wxCANCEL | wxCENTRE);
 
 			if (choiceDlg.ShowModal ()!= wxID_OK) return NULL;