CW Cyrix's Git Repository Mirror
Browse code

Make the NCSF Sound View dialog always available.

(Before it was only available under Debug builds.)

Naram Qashat authored on 2021/04/06 22:29:00
Showing 1 changed files
src/in_ncsf/XSFConfigDialog_NCSF.h
History View file @ e21d9d0
... ... 
@@ -31,9 +31,7 @@ class XSFConfigDialog_NCSF : public XSFConfigDialog
31 31 
 public:
32 32 
 	XSFConfigDialog_NCSF(XSFConfig &newConfig, wxWindow *parent, const wxString &title);
33 33
34 
-#ifndef NDEBUG
35 34 
 	bool useSoundView;
36 
-#endif
37 35 
 	int interpolation;
38 36 
 	wxArrayInt mute;
39 37 
 };
Browse code

Add warnings to building with GCC/Clang.

* These were mostly copied from the old Makefile.
* The files including wxWidgets need -Wno-old-style-cast done in the code via pragmas because I do not want to disable that warning for the rest of the files. (It might've been overkill for some places where wxWidgets was included, but whatever.)

Naram Qashat authored on 2021/04/04 23:35:09
Showing 1 changed files
src/in_ncsf/XSFConfigDialog_NCSF.h
History View file @ b6d1fc5
... ... 
@@ -7,7 +7,19 @@
7 7
8 8 
 #pragma once
9 9
10 
+#ifdef __GNUC__
11 
+# pragma GCC diagnostic push
12 
+# pragma GCC diagnostic ignored "-Wold-style-cast"
13 
+#elif defined(__clang__)
14 
+# pragma clang diagnostic push
15 
+# pragma clang diagnostic ignored "-Wold-style-cast"
16 
+#endif
10 17 
 #include <wx/dynarray.h>
18 
+#ifdef __GNUC__
19 
+# pragma GCC diagnostic pop
20 
+#elif defined(__clang__)
21 
+# pragma clang diagnostic pop
22 
+#endif
11 23 
 #include "XSFConfigDialog.h"
12 24
13 25 
 class wxString;
... ... 
@@ -17,7 +29,7 @@ class XSFConfig;
17 29 
 class XSFConfigDialog_NCSF : public XSFConfigDialog
18 30 
 {
19 31 
 public:
20 
-	XSFConfigDialog_NCSF(XSFConfig &config, wxWindow *parent, const wxString &title);
32 
+	XSFConfigDialog_NCSF(XSFConfig &newConfig, wxWindow *parent, const wxString &title);
21 33
22 34 
 #ifndef NDEBUG
23 35 
 	bool useSoundView;
Browse code

Add wxWidgets-based configuration dialog boxes.

* Removes the configuration dialog boxes that used my DialogBuilder.
* Move default configuration values to be inlined within the headers.
* Moved 2SF's and GSF's XSFConfig classes to their own headers to accommodate the new wxWidgets dialog boxes.
* Make it so NCSF's SoundView dialog can be toggled on or off from the configuration dialog box.

Naram Qashat authored on 2021/04/04 12:46:14
Showing 1 changed files
src/in_ncsf/XSFConfigDialog_NCSF.h
History View file @ 47760c9
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,27 @@
1 
+/*
2 
+ * xSF - NCSF configuration dialog
3 
+ * By Naram Qashat (CyberBotX) [cyberbotx@cyberbotx.com]
4 
+ *
5 
+ * Partially based on the vio*sf framework
6 
+ */
7 
+
8 
+#pragma once
9 
+
10 
+#include <wx/dynarray.h>
11 
+#include "XSFConfigDialog.h"
12 
+
13 
+class wxString;
14 
+class wxWindow;
15 
+class XSFConfig;
16 
+
17 
+class XSFConfigDialog_NCSF : public XSFConfigDialog
18 
+{
19 
+public:
20 
+	XSFConfigDialog_NCSF(XSFConfig &config, wxWindow *parent, const wxString &title);
21 
+
22 
+#ifndef NDEBUG
23 
+	bool useSoundView;
24 
+#endif
25 
+	int interpolation;
26 
+	wxArrayInt mute;
27 
+};