diff --git a/scim-wnn/src/preeditor.cpp b/scim-wnn/src/preeditor.cpp index 88dfa37..a77ca11 100644 --- a/scim-wnn/src/preeditor.cpp +++ b/scim-wnn/src/preeditor.cpp @@ -189,3 +189,13 @@ return(false); } + + +/*! + \fn PreEditor::getModeName() + */ +String PreEditor::getModeName() +{ + String s; + return(s); +} diff --git a/scim-wnn/src/preeditor.h b/scim-wnn/src/preeditor.h index 1132c77..6fe25e6 100644 --- a/scim-wnn/src/preeditor.h +++ b/scim-wnn/src/preeditor.h @@ -53,6 +53,7 @@ virtual void hiraKata(); virtual void kataHira(); virtual bool keyEventHook(const KeyEvent &key); + virtual String getModeName(); static void convHiraKata(WideString &t); static void convKataHira(WideString &t); diff --git a/scim-wnn/src/romkan.cpp b/scim-wnn/src/romkan.cpp index 8b3aa7f..f645231 100644 --- a/scim-wnn/src/romkan.cpp +++ b/scim-wnn/src/romkan.cpp @@ -20,6 +20,23 @@ #include "romkan.h" #include "romkan_table.h" +#ifdef HAVE_CONFIG_H + #include +#endif + +// ��ݲ��Τ��ޤ��ʤ��� +#ifdef HAVE_GETTEXT + #include + #define _(String) dgettext(GETTEXT_PACKAGE,String) + #define N_(String) (String) +#else + #define _(String) (String) + #define N_(String) (String) + #define bindtextdomain(Package,Directory) + #define textdomain(domain) + #define bind_textdomain_codeset(domain,codeset) +#endif + Romkan::Romkan() { reset(); @@ -212,3 +229,12 @@ } return(false); } + + +/*! + \fn Romkan::getModeName() + */ +String Romkan::getModeName() +{ + return(String(_("Roma-Kana"))); +} diff --git a/scim-wnn/src/romkan.h b/scim-wnn/src/romkan.h index ba970c0..bf853d1 100644 --- a/scim-wnn/src/romkan.h +++ b/scim-wnn/src/romkan.h @@ -48,6 +48,7 @@ virtual void hiraKata(); virtual void kataHira(); virtual bool keyEventHook(const KeyEvent &key); + virtual String getModeName(); protected: WideString eval(); diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp index 548b31a..acbf8ce 100644 --- a/scim-wnn/src/scim_wnn_imengine.cpp +++ b/scim-wnn/src/scim_wnn_imengine.cpp @@ -32,9 +32,6 @@ #endif // ��ݲ��Τ��ޤ��ʤ��� -// �ޤ����Ԥ���碌�Ƥ�館�С���������ɤ��ˤ����ʤ��㤤���ʤ��äġ��Τ� -// �ɤ��ʤ�Ǥ��礦�ʤ��ġ� -// KDE�ʤ����Ф�����ʬ�Ǥ����������� #ifdef HAVE_GETTEXT #include #define _(String) dgettext(GETTEXT_PACKAGE,String) @@ -48,7 +45,6 @@ #endif // scim�Τ��ޤ��ʤ��� -// ����Ǹ����С����ɤ�s #include "scim_wnn_imengine.h" #include "scim_wnn_def.h" @@ -261,6 +257,7 @@ scim_string_to_key_list(k_convert_katakana, _scim_config->read(String(SCIM_CONFIG_WNN_KEY_CONVERT_KATAKANA), String(SCIM_DEFAULT_WNN_KEY_CONVERT_KATAKANA))); + }