android fixes

rgleason · May 20, 2018 · 52675f2 · 52675f2
1 parent 4c19f48
commit 52675f2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,9 +10,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
 # This should be 2.8.0 to have FindGTK2 module
 
 PROJECT(plots_pi)
-
-SET(PLUGIN_SOURCE_DIR .)
-
 SET(PACKAGE_NAME plots_pi)
 SET(VERBOSE_NAME Plots)
 SET(TITLE_NAME Plots)

diff --git a/src/PlotConfigurationDialog.cpp b/src/PlotConfigurationDialog.cpp
@@ -67,7 +67,7 @@ PlotConfigurationDialog::PlotConfigurationDialog(wxWindow* parent, PlotsDialog &
     m_tVMGCourse->SetValue(wxString::Format(_T("%f"), vmgcourse));
 
 #if wxCHECK_VERSION(3,0,0)
-    m_fpPlotFont->SetSelectedFont(pConf->Read(_T("PlotFont"), wxToString(m_fpPlotFont->GetSelectedFont())));
+//    m_fpPlotFont->SetSelectedFont(pConf->Read(_T("PlotFont"), wxToString(m_fpPlotFont->GetSelectedFont())));
 #else
     wxLogMessage(_T("plots_pi: cannot save and load fonts using wxwidgets version < 3"));
 #endif    

diff --git a/src/PlotsUI.cpp b/src/PlotsUI.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Feb 20 2018)
+// C++ code generated with wxFormBuilder (version May 19 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -20,19 +20,17 @@ PlotsDialogBase::PlotsDialogBase( wxWindow* parent, wxWindowID id, const wxStrin
 	fgSizer8->SetFlexibleDirection( wxBOTH );
 	fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	m_scrollWindow = NULL;//new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-//	m_scrollWindow->SetScrollRate( 5, 5 );
-//	wxFlexGridSizer* fgSizer10;
-//	fgSizer10 = new wxFlexGridSizer( 0, 2, 0, 0 );
-//	fgSizer10->AddGrowableCol( 0 );
-//	fgSizer10->AddGrowableRow( 0 );
-//	fgSizer10->SetFlexibleDirection( wxBOTH );
-//	fgSizer10->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-	//m_swPlots = new wxScrolledWindow( m_scrollWindow, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-        //	m_swPlots->SetScrollRate( 5, 5 );
-        m_swPlots = new wxWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize);
-
+	m_scrollWindow = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_scrollWindow->SetScrollRate( 5, 5 );
+	wxFlexGridSizer* fgSizer10;
+	fgSizer10 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer10->AddGrowableCol( 0 );
+	fgSizer10->AddGrowableRow( 0 );
+	fgSizer10->SetFlexibleDirection( wxBOTH );
+	fgSizer10->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+	m_swPlots = new wxScrolledWindow( m_scrollWindow, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_swPlots->SetScrollRate( 5, 5 );
 	m_menu1 = new wxMenu();
 	m_mt1 = new wxMenuItem( m_menu1, wxID_ANY, wxString( _("5 m") ) , wxEmptyString, wxITEM_RADIO );
 	m_menu1->Append( m_mt1 );
@@ -73,13 +71,13 @@ PlotsDialogBase::PlotsDialogBase( wxWindow* parent, wxWindowID id, const wxStrin
 
 	m_swPlots->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( PlotsDialogBase::m_swPlotsOnContextMenu ), NULL, this ); 
 
-//	fgSizer10->Add( m_swPlots, 1, wxEXPAND | wxALL, 5 );
+	fgSizer10->Add( m_swPlots, 1, wxEXPAND | wxALL, 5 );
 
 
-//	m_scrollWindow->SetSizer( fgSizer10 );
-//	m_scrollWindow->Layout();
-//	fgSizer10->Fit( m_scrollWindow );
-	fgSizer8->Add( m_swPlots, 1, wxEXPAND | wxALL, 5 );
+	m_scrollWindow->SetSizer( fgSizer10 );
+	m_scrollWindow->Layout();
+	fgSizer10->Fit( m_scrollWindow );
+	fgSizer8->Add( m_scrollWindow, 1, wxEXPAND | wxALL, 5 );
 
 
 	this->SetSizer( fgSizer8 );

diff --git a/src/PlotsUI.h b/src/PlotsUI.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Feb 20 2018)
+// C++ code generated with wxFormBuilder (version May 19 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -46,7 +46,7 @@ class PlotsDialogBase : public wxDialog
 	private:
 
 	protected:
-		wxWindow* m_swPlots;
+		wxScrolledWindow* m_swPlots;
 		wxMenu* m_menu1;
 		wxMenuItem* m_mt1;
 		wxMenuItem* m_mt2;