From c226978a105de3cd5f8edbecebc4e5812750498c Mon Sep 17 00:00:00 2001 From: David Freese Date: Wed, 18 Nov 2009 06:28:45 -0600 Subject: [PATCH] Hamlib build fix * Added missing #if USE_HAMLIB pragma in conf.fl source file and in fl_digi.cxx --- src/dialogs/confdialog.cxx | 2 + src/dialogs/confdialog.fl | 6 +- src/dialogs/fl_digi.cxx | 120 +++++++++++++++++++++++++++++-------- 3 files changed, 100 insertions(+), 28 deletions(-) diff --git a/src/dialogs/confdialog.cxx b/src/dialogs/confdialog.cxx index c075dcd5..c13acb30 100644 --- a/src/dialogs/confdialog.cxx +++ b/src/dialogs/confdialog.cxx @@ -1732,7 +1732,9 @@ Fl_Button *btnRevertHAMLIB=(Fl_Button *)0; static void cb_btnRevertHAMLIB(Fl_Button*, void*) { btnInitHAMLIB->labelcolor(FL_FOREGROUND_COLOR); btnInitHAMLIB->redraw_label(); +#if USE_HAMLIB hamlib_restore_defaults(); +#endif } Fl_Group *grpMemmap=(Fl_Group *)0; diff --git a/src/dialogs/confdialog.fl b/src/dialogs/confdialog.fl index f3d7fc7c..314ba5ea 100644 --- a/src/dialogs/confdialog.fl +++ b/src/dialogs/confdialog.fl @@ -82,7 +82,7 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600 code {} {} Fl_Window {} { label {Fldigi configuration} open - xywh {671 172 500 400} type Double color 45 selection_color 51 labelsize 18 align 80 visible + xywh {468 63 500 400} type Double color 45 selection_color 51 labelsize 18 align 80 visible } { Fl_Tabs tabsConfigure {open xywh {-3 0 520 372} color 50 selection_color 50 @@ -2101,7 +2101,9 @@ progdefaults.changed = true;} label Revert callback {btnInitHAMLIB->labelcolor(FL_FOREGROUND_COLOR); btnInitHAMLIB->redraw_label(); -hamlib_restore_defaults();} +\#if USE_HAMLIB +hamlib_restore_defaults(); +\#endif} tooltip {Initialize hamlib interface} xywh {371 294 113 24} deactivate } } diff --git a/src/dialogs/fl_digi.cxx b/src/dialogs/fl_digi.cxx index 1de8d64f..4d514361 100644 --- a/src/dialogs/fl_digi.cxx +++ b/src/dialogs/fl_digi.cxx @@ -504,7 +504,11 @@ void cb_oliviaCustom(Fl_Widget *w, void *arg) modem_config_tab = tabOlivia; tabsConfigure->value(tabModems); tabsModems->value(modem_config_tab); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults();; + dlgConfig->show(); cb_init_mode(w, arg); } @@ -551,7 +555,12 @@ void cb_rttyCustom(Fl_Widget *w, void *arg) modem_config_tab = tabRTTY; tabsConfigure->value(tabModems); tabsModems->value(modem_config_tab); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + cb_init_mode(w, arg); } @@ -905,31 +914,56 @@ void altmacro_cb(Fl_Widget *w, void *v) void cb_mnuConfigOperator(Fl_Menu_*, void*) { progdefaults.loadDefaults(); tabsConfigure->value(tabOperator); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } void cb_mnuConfigWaterfall(Fl_Menu_*, void*) { progdefaults.loadDefaults(); tabsConfigure->value(tabWaterfall); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } void cb_mnuConfigID(Fl_Menu_*, void*) { progdefaults.loadDefaults(); tabsConfigure->value(tabID); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } void cb_mnuConfigQRZ(Fl_Menu_*, void*) { progdefaults.loadDefaults(); tabsConfigure->value(tabQRZ); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } void cb_mnuConfigMisc(Fl_Menu_*, void*) { progdefaults.loadDefaults(); tabsConfigure->value(tabMisc); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } void cb_mnuConfigNotify(Fl_Menu_*, void*) @@ -940,39 +974,69 @@ void cb_mnuConfigNotify(Fl_Menu_*, void*) void cb_mnuUI(Fl_Menu_*, void *) { progdefaults.loadDefaults(); tabsConfigure->value(tabUI); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } void cb_mnuConfigContest(Fl_Menu_*, void*) { progdefaults.loadDefaults(); tabsConfigure->value(tabUI); tabsUI->value(tabContest); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } void cb_mnuConfigRigCtrl(Fl_Menu_*, void*) { progdefaults.loadDefaults(); tabsConfigure->value(tabRig); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } void cb_mnuConfigSoundCard(Fl_Menu_*, void*) { progdefaults.loadDefaults(); tabsConfigure->value(tabSoundCard); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } void cb_mnuConfigModems(Fl_Menu_*, void*) { progdefaults.loadDefaults(); tabsConfigure->value(tabModems); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } void cb_mnuConfigWFcontrols(Fl_Menu_ *, void*) { progdefaults.loadDefaults(); tabsConfigure->value(tabUI); tabsUI->value(tabWF_UI); - hamlib_restore_defaults(); dlgConfig->show(); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } void cb_logfile(Fl_Widget* w, void*) @@ -1658,19 +1722,23 @@ void cb_QRZ(Fl_Widget *b, void *) void status_cb(Fl_Widget *b, void *arg) { - if (Fl::event_button() == FL_RIGHT_MOUSE) { - progdefaults.loadDefaults(); - tabsConfigure->value(tabModems); - tabsModems->value(modem_config_tab); - hamlib_restore_defaults(); dlgConfig->show(); - } - else { - if (!quick_change) - return; - const Fl_Menu_Item *m = quick_change->popup(Fl::event_x(), Fl::event_y()); - if (m && m->callback()) - m->do_callback(0); - } + if (Fl::event_button() == FL_RIGHT_MOUSE) { + progdefaults.loadDefaults(); + tabsConfigure->value(tabModems); + tabsModems->value(modem_config_tab); +#if USE_HAMLIB + hamlib_restore_defaults(); +#endif + rigCAT_restore_defaults(); + dlgConfig->show(); + } + else { + if (!quick_change) + return; + const Fl_Menu_Item *m = quick_change->popup(Fl::event_x(), Fl::event_y()); + if (m && m->callback()) + m->do_callback(0); + } static_cast(b)->clear(); restoreFocus(); }