Restricted compilation to wx3.0

src/GUI/Applets/gui_fd_1ms_ha.cpp

@@ -665,13 +665,13 @@ HAPSolverFrame::HAPSolverFrame(wxString const &title)
 
     target_tools_panel->SetSizer(target_tools_sizer);
 
-    #ifndef WX30_RESTRICT
+/*    #ifndef WX30_RESTRICT
     wxGLAttributes attrib;
     attrib.PlatformDefaults().MinRGBA(8,8,8,8).DoubleBuffer().Depth(24).EndList();
     target_graph=new HAMS_GL(target_panel,attrib);
-    #else
+    #else*/
     target_graph=new HAMS_GL(target_panel);
-    #endif
+//    #endif
 
     exposure_slider=new wxSlider(target_exposure_panel,wxID_ANY,0,-400,400,wxDefaultPosition,wxDefaultSize,wxSL_VERTICAL);
     auto_exposure_btn=new wxToggleButton(target_exposure_panel,wxID_ANY,"",wxDefaultPosition,wxDefaultSize,wxBU_EXACTFIT);

src/GUI/Applets/gui_fd_1ms_ha_gl.cpp

@@ -21,13 +21,13 @@ limitations under the License.*/
 
 extern std::ofstream plog;
 
-#ifndef WX30_RESTRICT
+/*#ifndef WX30_RESTRICT
 HAMS_GL::HAMS_GL(wxWindow *parent,wxGLAttributes const &attrib)
     :wxGLCanvas(parent,attrib,wxID_ANY),
-#else
+#else*/
 HAMS_GL::HAMS_GL(wxWindow *parent)
     :wxGLCanvas(parent,wxID_ANY,NULL),
-#endif
+//#endif
      busy(false), target_mode(false), zoom_mode(false),
      pad_xm(2), pad_xp(2),
      pad_ym(2), pad_yp(2),

src/GUI/Applets/gui_fd_ms.h

@@ -174,11 +174,11 @@ class HAMS_GL: public wxGLCanvas
         GLuint target_vao,prog_target,prog_target_outline;
         std::vector<MSTarget> targets;
 
-        #ifndef WX30_RESTRICT
+/*        #ifndef WX30_RESTRICT
         HAMS_GL(wxWindow *parent,wxGLAttributes const &attrib);
-        #else
+        #else*/
         HAMS_GL(wxWindow *parent);
-        #endif
+//        #endif
         ~HAMS_GL();
 
         void add_target(double nr,double ni);