fix missing GL libs & remove dead code

jundaozhilian · Feb 20, 2019 · 1764e9b · 1764e9b
1 parent f9a86b4
commit 1764e9b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/apps/SceneViewer3D/CAboutBox.cpp b/apps/SceneViewer3D/CAboutBox.cpp
@@ -70,7 +70,7 @@ CAboutBox::CAboutBox(wxWindow* parent, wxWindowID id)
 		this, ID_STATICTEXT1, _("Title"), wxDefaultPosition, wxDefaultSize, 0,
 		_T("ID_STATICTEXT1"));
 	wxFont lbProgNameFont(
-		22, wxSWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
+		22, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false,
 		_T("Times New Roman"), wxFONTENCODING_DEFAULT);
 	lbProgName->SetFont(lbProgNameFont);
 	FlexGridSizer2->Add(
@@ -113,24 +113,24 @@ CAboutBox::CAboutBox(wxWindow* parent, wxWindowID id)
 		wxTE_MULTILINE | wxTE_READONLY | wxTE_AUTO_URL, wxDefaultValidator,
 		_T("ID_TEXTCTRL4"));
 	wxFont TextCtrl2Font(
-		10, wxSWISS, wxFONTSTYLE_NORMAL, wxNORMAL, false, _T("Courier New"),
-		wxFONTENCODING_DEFAULT);
+		10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false,
+		_T("Courier New"), wxFONTENCODING_DEFAULT);
 	TextCtrl2->SetFont(TextCtrl2Font);
 	lbInfo = new wxTextCtrl(
 		Notebook1, ID_TEXTCTRL1, wxEmptyString, wxPoint(4, 24),
 		wxSize(545, 222), wxTE_MULTILINE | wxTE_READONLY | wxTE_AUTO_URL,
 		wxDefaultValidator, _T("ID_TEXTCTRL1"));
 	wxFont lbInfoFont(
-		10, wxSWISS, wxFONTSTYLE_NORMAL, wxNORMAL, false, _T("Courier New"),
-		wxFONTENCODING_DEFAULT);
+		10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false,
+		_T("Courier New"), wxFONTENCODING_DEFAULT);
 	lbInfo->SetFont(lbInfoFont);
 	lbLicense = new wxTextCtrl(
 		Notebook1, ID_TEXTCTRL2, _(""), wxDefaultPosition, wxDefaultSize,
 		wxTE_MULTILINE | wxTE_READONLY | wxTE_AUTO_URL, wxDefaultValidator,
 		_T("ID_TEXTCTRL2"));
 	wxFont lbLicenseFont(
-		10, wxSWISS, wxFONTSTYLE_NORMAL, wxNORMAL, false, _T("Courier New"),
-		wxFONTENCODING_DEFAULT);
+		10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false,
+		_T("Courier New"), wxFONTENCODING_DEFAULT);
 	lbLicense->SetFont(lbLicenseFont);
 	TextCtrl1 = new wxTextCtrl(
 		Notebook1, ID_TEXTCTRL3,
@@ -140,8 +140,8 @@ CAboutBox::CAboutBox(wxWindow* parent, wxWindowID id)
 		wxTE_MULTILINE | wxTE_READONLY | wxTE_AUTO_URL, wxDefaultValidator,
 		_T("ID_TEXTCTRL3"));
 	wxFont TextCtrl1Font(
-		10, wxSWISS, wxFONTSTYLE_NORMAL, wxNORMAL, false, _T("Courier New"),
-		wxFONTENCODING_DEFAULT);
+		10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false,
+		_T("Courier New"), wxFONTENCODING_DEFAULT);
 	TextCtrl1->SetFont(TextCtrl1Font);
 	Notebook1->AddPage(TextCtrl2, _("Keyboard and mouse commands"), false);
 	Notebook1->AddPage(lbInfo, _("Information"), false);

diff --git a/apps/SceneViewer3D/CMakeLists.txt b/apps/SceneViewer3D/CMakeLists.txt
@@ -18,7 +18,6 @@ if(CMAKE_MRPT_HAS_WXWIDGETS AND CMAKE_MRPT_HAS_OPENGL_GLUT)
 		_DSceneViewerApp.cpp _DSceneViewerApp.h
 		_DSceneViewerMain.cpp _DSceneViewerMain.h
 		CDialogOptions.cpp   CDialogOptions.h
-		CAboutBox.cpp        CAboutBox.h
 		CDlgCamTracking.cpp  CDlgCamTracking.h
 		CDlgPLYOptions.cpp   CDlgPLYOptions.h
 	)
@@ -35,7 +34,7 @@ if(CMAKE_MRPT_HAS_WXWIDGETS AND CMAKE_MRPT_HAS_OPENGL_GLUT)
 	include_directories( ${wxWidgets_INCLUDE_DIRS} )
 	target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES} )
 
-	target_link_libraries(${PROJECT_NAME} ${MRPT_LINKER_LIBS})
+	target_link_libraries(${PROJECT_NAME} ${MRPT_LINKER_LIBS} ${MRPT_OPENGL_LIBS})
 
 	target_link_libraries(${PROJECT_NAME} mrptwxthings)
 	add_dependencies(${PROJECT_NAME} mrptwxthings)

diff --git a/apps/SceneViewer3D/_DSceneViewerMain.cpp b/apps/SceneViewer3D/_DSceneViewerMain.cpp
@@ -1832,7 +1832,6 @@ void _DSceneViewerFrame::OnMenuItemImportPLYPointCloud(wxCommandEvent& event)
 }
 
 struct visitor_export_PLY
-	: public unary_function<mrpt::opengl::CRenderizable::Ptr, void>
 {
 	const string& filename;
 	unsigned int& count;

diff --git a/apps/SceneViewer3D/_DSceneViewerMain.h b/apps/SceneViewer3D/_DSceneViewerMain.h
@@ -28,6 +28,7 @@
 #include <mrpt/system/datetime.h>
 #include <mrpt/gui/CWxGLCanvasBase.h>
 #include <mrpt/gui/WxUtils.h>
+#include <optional>
 
 class CDlgCamTracking;
 class CMyGLCanvas : public mrpt::gui::CWxGLCanvasBase