Move activate to correct method, update formbuilder project

Author: Ravbug

CMakeLists.txt

@@ -127,4 +127,6 @@ macro(enable_unity targets)
 endmacro()
 
 set(all_unity "wxcore;wxbase;fmt;wxpng;")
-enable_unity("${all_unity}")
+if(MSVC)
+enable_unity("${all_unity}")
+endif()

source/activation.cpp

@@ -2,6 +2,7 @@
 #include "activation.hpp"
 #include "fmt/format.h"
 #include <wx/process.h>
+#include <wx/filedlg.h>
 
 wxBEGIN_EVENT_TABLE(PersonalActivationDlg, wxDialog)
 EVT_BUTTON(PAD_CREATE, PersonalActivationDlg::OnCreateHit)
@@ -45,11 +46,6 @@ void PersonalActivationDlg::OnCreateHit(wxCommandEvent& evt)
 }
 
 void PersonalActivationDlg::OnActivateHit(wxCommandEvent&)
-{
-
-}
-
-void PlusProActivationDlg::OnActivateHit(wxCommandEvent&)
 {
 	wxFileDialog openFileDialog(this, _("Open License file"), "", "", "ULF files (*.ulf)|*.ulf", wxFD_OPEN | wxFD_FILE_MUST_EXIST);
 	if (openFileDialog.ShowModal() == wxID_CANCEL) {}
@@ -59,3 +55,8 @@ void PlusProActivationDlg::OnActivateHit(wxCommandEvent&)
 		wxExecute(cmd, wxEXEC_SYNC);
 	}
 }
+
+void PlusProActivationDlg::OnActivateHit(wxCommandEvent&)
+{
+	
+}