Merge branch 'master' of github.com:OpenCPN/OpenCPN

Author: bdbcat

gui/src/options.cpp

@@ -2969,10 +2969,9 @@ void options::CreatePanel_Advanced(size_t parent, int border_size,
     OpenGLSizer->Add(pOpenGL, inputFlags);
     pOpenGL->Enable(!g_bdisable_opengl && g_Platform->IsGLCapable());
 
-    wxButton* bOpenGL = new wxButton(m_ChartDisplayPage, ID_OPENGLOPTIONS,
-                                     _("OpenGL Options") + "...");
+    auto* bOpenGL = new wxButton(m_ChartDisplayPage, ID_OPENGLOPTIONS,
+                                 _("OpenGL Options") + "...");
     OpenGLSizer->Add(bOpenGL, inputFlags);
-    bOpenGL->Enable(!g_bdisable_opengl && g_Platform->IsGLCapable());
 
     pOpenGL->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED,
                      wxCommandEventHandler(options::OnGLClicked), NULL, this);
@@ -3309,10 +3308,9 @@ With a higher value, the same zoom level shows a more detailed chart."));
     pOpenGL->Disable();
 #endif
 
-    wxButton* bOpenGL = new wxButton(m_ChartDisplayPage, ID_OPENGLOPTIONS,
-                                     _("Options") + "...");
+    auto* bOpenGL = new wxButton(m_ChartDisplayPage, ID_OPENGLOPTIONS,
+                                 _("Options") + "...");
     OpenGLSizer->Add(bOpenGL, inputFlags);
-    bOpenGL->Enable(!g_bdisable_opengl && g_Platform->IsGLCapable());
 
     // spacer
     itemBoxSizerUI->Add(0, border_size * 3);
@@ -6303,6 +6301,8 @@ void options::SetInitialSettings() {
   pInlandEcdis->SetValue(g_bInlandEcdis);
 #ifdef ocpnUSE_GL
   pOpenGL->SetValue(g_bopengl);
+  if (auto* w = wxWindow::FindWindowById(ID_OPENGLOPTIONS))
+    w->Enable(pOpenGL->IsChecked());
 #endif
   if (pSmoothPanZoom) pSmoothPanZoom->SetValue(g_bsmoothpanzoom);
   pCBTrueShow->SetValue(g_bShowTrue);
@@ -6912,6 +6912,8 @@ void options::OnWaypointRangeRingSelect(wxCommandEvent& event) {
 void options::OnGLClicked(wxCommandEvent& event) {
   //   if (!g_bTransparentToolbarInOpenGLOK)
   //     pTransparentToolbar->Enable(!pOpenGL->GetValue());
+  if (auto* w = wxWindow::FindWindowById(ID_OPENGLOPTIONS))
+    w->Enable(pOpenGL->IsChecked());
 }
 
 void options::OnOpenGLOptions(wxCommandEvent& event) {