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
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
|
Description: Fix FTBFS with --disable-xlsxwriter.
Author: Bas Couwenberg <sebastic@debian.org>
Bug: https://www.gaia-gis.it/fossil/spatialite_gui/tktview/de78c7158e87e94dd5a91d86e027569b52e9ef4f
Forwarded: https://www.gaia-gis.it/fossil/spatialite_gui/info/de78c7158e87e94d
--- a/ResultSetView.cpp
+++ b/ResultSetView.cpp
@@ -185,8 +185,10 @@ wxPanel(parent, id, wxDefaultPosition, w
(wxObjectEventFunction) & MyResultSetView::OnCmdExpSylk);
Connect(Grid_ExpDbf, wxEVT_COMMAND_MENU_SELECTED,
(wxObjectEventFunction) & MyResultSetView::OnCmdExpDbf);
+#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
Connect(Grid_ExpXlsx, wxEVT_COMMAND_MENU_SELECTED,
(wxObjectEventFunction) & MyResultSetView::OnCmdExpXlsx);
+#endif // end XlsxWriter
Connect(Grid_Filter, wxEVT_COMMAND_MENU_SELECTED,
(wxObjectEventFunction) & MyResultSetView::OnCmdFilter);
Connect(Grid_MapShow, wxEVT_COMMAND_MENU_SELECTED,
@@ -1976,10 +1978,12 @@ done:
exportMenu->Append(menuItem);
menuItem = new wxMenuItem(exportMenu, Grid_ExpDbf, wxT("as &DBF archive"));
exportMenu->Append(menuItem);
+#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
menuItem =
new wxMenuItem(exportMenu, Grid_ExpXlsx,
wxT("as MS &Excell Spreadsheet (XLSX)"));
exportMenu->Append(menuItem);
+#endif // end XlsxWriter
menu.AppendSubMenu(exportMenu, wxT("&Export ResultSet"));
menu.AppendSeparator();
if (MainFrame->IsValidSqlFilter() == true)
@@ -3670,6 +3674,7 @@ void MyResultSetView::OnCmdExpDbf(wxComm
}
}
+#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
void MyResultSetView::OnCmdExpXlsx(wxCommandEvent & WXUNUSED(event))
{
//
@@ -3705,3 +3710,4 @@ void MyResultSetView::OnCmdExpXlsx(wxCom
::wxEndBusyCursor();
}
}
+#endif // end XlsxWriter
--- a/TableTree.cpp
+++ b/TableTree.cpp
@@ -317,8 +317,10 @@ MyTableTree::MyTableTree(MyFrame * paren
(wxObjectEventFunction) & MyTableTree::OnCmdDumpSylk);
Connect(Tree_DumpDbf, wxEVT_COMMAND_MENU_SELECTED,
(wxObjectEventFunction) & MyTableTree::OnCmdDumpDbf);
+#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
Connect(Tree_DumpXlsx, wxEVT_COMMAND_MENU_SELECTED,
(wxObjectEventFunction) & MyTableTree::OnCmdDumpXlsx);
+#endif // end XlsxWriter
Connect(Tree_DumpPostGIS, wxEVT_COMMAND_MENU_SELECTED,
(wxObjectEventFunction) & MyTableTree::OnCmdDumpPostGIS);
Connect(Tree_Edit, wxEVT_COMMAND_MENU_SELECTED,
@@ -3091,9 +3093,11 @@ void MyTableTree::DoMainTableContextMenu
menu.Append(menuItem);
menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
menu.Append(menuItem);
+#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
menuItem =
new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX Spreadsheet"));
menu.Append(menuItem);
+#endif // end XlsxWriter
menuItem =
new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
menu.Append(menuItem);
@@ -3164,9 +3168,11 @@ void MyTableTree::DoMainViewContextMenu(
menu.Append(menuItem);
menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
menu.Append(menuItem);
+#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
menuItem =
new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX Spreadsheet"));
menu.Append(menuItem);
+#endif // end XlsxWriter
menuItem =
new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
menu.Append(menuItem);
@@ -3243,9 +3249,11 @@ void MyTableTree::DoAttachedTableContext
menu.Append(menuItem);
menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
menu.Append(menuItem);
+#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
menuItem =
new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX Spreadsheet"));
menu.Append(menuItem);
+#endif // end XlsxWriter
menuItem =
new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
menu.Append(menuItem);
@@ -3294,9 +3302,11 @@ void MyTableTree::DoAttachedViewContextM
menu.Append(menuItem);
menuItem = new wxMenuItem(&menu, Tree_DumpDbf, wxT("Export as &DBF"));
menu.Append(menuItem);
+#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
menuItem =
new wxMenuItem(&menu, Tree_DumpXlsx, wxT("Export as MS &XLSX Spreadsheet"));
menu.Append(menuItem);
+#endif // end XlsxWriter
menuItem =
new wxMenuItem(&menu, Tree_DumpPostGIS, wxT("SQL Dump for &PostGIS"));
menu.Append(menuItem);
@@ -7300,6 +7310,7 @@ void MyTableTree::OnCmdDumpDbf(wxCommand
}
}
+#ifdef ENABLE_XLSXWRITER // only if XlsxWriter is supported
void MyTableTree::OnCmdDumpXlsx(wxCommandEvent & WXUNUSED(event))
{
//
@@ -7338,6 +7349,7 @@ void MyTableTree::OnCmdDumpXlsx(wxComman
::wxEndBusyCursor();
}
}
+#endif // end XlsxWriter
void MyTableTree::OnCmdDumpPostGIS(wxCommandEvent & WXUNUSED(event))
{
|
