- old useless helpers removed from the Options module;

- mir_app functions introduced instead of them;
- OPENOPTIONSDIALOG structure removed from m_options.h

2 files changed, 3 insertions, 9 deletions

diff --git a/plugins/mRadio/i_myservice.inc b/plugins/mRadio/i_myservice.inc
index 303aef72c1..d6d7eaa9d9 100644
--- a/plugins/mRadio/i_myservice.inc
+++ b/plugins/mRadio/i_myservice.inc
@@ -63,15 +63,9 @@ begin
 end;

 

 function Service_RadioSettings(wParam:WPARAM;lParam:LPARAM):int;cdecl;

-var

-  ood:TOPENOPTIONSDIALOG;

 begin

   result:=0;

-  ood.cbSize:=SizeOf(ood);

-  ood.pszGroup:='Network';

-  ood.pszPage :=PluginName;

-  ood.pszTab  :=Translate('Advanced');

-  CallService(MS_OPT_OPENOPTIONS,0,tlparam(@ood));

+  Options_Open('Network','mRadio','Advanced');

 end;

 

 function Service_RadioRecord(wParam:WPARAM;lParam:LPARAM):int;cdecl;

diff --git a/plugins/mRadio/i_optdlg.inc b/plugins/mRadio/i_optdlg.inc
index 69e9ab3971..a48d987989 100644
--- a/plugins/mRadio/i_optdlg.inc
+++ b/plugins/mRadio/i_optdlg.inc
@@ -629,12 +629,12 @@ begin
   odp.pszTemplate:=MAKEINTRESOURCEA(IDD_SETTING);

   odp.pfnDlgProc :=@DlgProcOpt;

   odp.szTab.a    :='Common';

-  CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));

+  Options_AddPage(wParam,@odp);

 

   odp.pszTemplate:=MAKEINTRESOURCEA(IDD_SETTING_TECH);

   odp.pfnDlgProc :=@DlgProcOptTech;//!!

   odp.szTab.a    :=Translate('Advanced');

-  CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));

+  Options_AddPage(wParam,@odp);

 

   result:=0;

 end;