diff --git a/scim-wnn/src/preeditor.cpp b/scim-wnn/src/preeditor.cpp index a9335b9..87f1836 100644 --- a/scim-wnn/src/preeditor.cpp +++ b/scim-wnn/src/preeditor.cpp @@ -19,9 +19,10 @@ ***************************************************************************/ #include "preeditor.h" -PreEditor::PreEditor() +PreEditor::PreEditor(ConfigPointer cfg) { iconvert.set_encoding ("EUC-JP"); + config = cfg; } diff --git a/scim-wnn/src/preeditor.h b/scim-wnn/src/preeditor.h index c14c849..ac46da6 100644 --- a/scim-wnn/src/preeditor.h +++ b/scim-wnn/src/preeditor.h @@ -21,6 +21,7 @@ #define PREEDITOR_H #define Uses_SCIM_ICONV +#define Uses_SCIM_CONFIG_BASE #include #include #include @@ -38,7 +39,7 @@ */ class PreEditor{ public: - PreEditor(); + PreEditor(ConfigPointer cfg); ~PreEditor(); virtual void clear(); @@ -64,6 +65,7 @@ static WideString text; static int pos; static IConvert iconvert; + ConfigPointer config; }; diff --git a/scim-wnn/src/romkan.cpp b/scim-wnn/src/romkan.cpp index 50a17e9..8be5223 100644 --- a/scim-wnn/src/romkan.cpp +++ b/scim-wnn/src/romkan.cpp @@ -37,7 +37,7 @@ #define bind_textdomain_codeset(domain,codeset) #endif -Romkan::Romkan() : PreEditor() +Romkan::Romkan(ConfigPointer cfg) : PreEditor(cfg) { reset(); iconvert.set_encoding ("EUC-JP"); diff --git a/scim-wnn/src/romkan.h b/scim-wnn/src/romkan.h index 79bd31f..affc310 100644 --- a/scim-wnn/src/romkan.h +++ b/scim-wnn/src/romkan.h @@ -21,6 +21,7 @@ #define ROMKAN_H #define Uses_SCIM_ICONV +#define Uses_SCIM_CONFIG_BASE #include #include #include @@ -35,7 +36,7 @@ */ class Romkan : public PreEditor { public: - Romkan(); + Romkan(ConfigPointer cfg); ~Romkan(); virtual void clear(); diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp index 4590136..9ea0f99 100644 --- a/scim-wnn/src/scim_wnn_imengine.cpp +++ b/scim-wnn/src/scim_wnn_imengine.cpp @@ -178,7 +178,7 @@ { m_iconv.set_encoding ("EUC-JP"); m_connected = false; - preeditors.push_back(new Romkan); + preeditors.push_back(new Romkan(_scim_config)); m_preeditor = preeditors.at(0); init(); }