diff options
| author | Peng Huang <shawn.p.huang@gmail.com> | 2010-06-18 11:37:25 +0800 |
|---|---|---|
| committer | Peng Huang <shawn.p.huang@gmail.com> | 2010-06-18 11:37:25 +0800 |
| commit | 083a07dcd61b744d126398a737055928cbfd5778 (patch) | |
| tree | e2b3f23f67e285a7a96c2022dfa3473e1c1289bd | |
| parent | f1944e652c6e4c73b87193c7e8cc82ccb0c35ddd (diff) | |
| download | ibus-libpinyin-083a07dcd61b744d126398a737055928cbfd5778.tar.gz ibus-libpinyin-083a07dcd61b744d126398a737055928cbfd5778.tar.xz ibus-libpinyin-083a07dcd61b744d126398a737055928cbfd5778.zip | |
Fix build errors.
| -rw-r--r-- | src/ExtEditor.cc | 19 | ||||
| -rw-r--r-- | src/ExtEditor.h | 2 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/ExtEditor.cc b/src/ExtEditor.cc index 28a739a..ad97384 100644 --- a/src/ExtEditor.cc +++ b/src/ExtEditor.cc @@ -20,7 +20,10 @@ */ #include "ExtEditor.h" -#define _(text) (dgettext (GETTEXT_PACKAGE, text)) +#include "Config.h" + +#define _(text) text +// (dgettext (GETTEXT_PACKAGE, text)) namespace PY { @@ -29,7 +32,7 @@ namespace PY { */ ExtEditor::ExtEditor (PinyinProperties & props, Config & config) - : Editor (props), + : Editor (props, config), m_mode(LABEL_NONE), m_result_num(0), m_candidate(NULL), @@ -147,27 +150,27 @@ ExtEditor::processPageKey(guint keyval){ switch (keyval) { //For 2000-10-10 16:30 input. case IBUS_comma: - if (Config::commaPeriodPage ()) { + if (m_config.commaPeriodPage ()) { pageUp (); return TRUE; } break; #if 0 case IBUS_minus: - if (Config::minusEqualPage ()) { + if (m_config.minusEqualPage ()) { pageUp (); return TRUE; } break; #endif case IBUS_period: - if (Config::commaPeriodPage ()) { + if (m_config.commaPeriodPage ()) { pageDown (); return TRUE; } break; case IBUS_equal: - if (Config::minusEqualPage ()) { + if (m_config.minusEqualPage ()) { pageDown (); return TRUE; } @@ -634,8 +637,8 @@ void ExtEditor::clearLookupTable() { m_lookup_table.clear (); - m_lookup_table.setPageSize (Config::pageSize ()); - m_lookup_table.setOrientation (Config::orientation ()); + m_lookup_table.setPageSize (m_config.pageSize ()); + m_lookup_table.setOrientation (m_config.orientation ()); } void diff --git a/src/ExtEditor.h b/src/ExtEditor.h index 36125d8..9cfae81 100644 --- a/src/ExtEditor.h +++ b/src/ExtEditor.h @@ -30,6 +30,8 @@ extern "C" { } #include <string> #include "Editor.h" +#include "Pointer.h" +#include "LookupTable.h" namespace PY { |