Remove unused code and update libIME to the latest version.

EasyIME · Dec 17, 2016 · 1e0aea5 · 1e0aea5
1 parent 3ab9908
commit 1e0aea5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/PIMETextService/PIMELangBarButton.h b/PIMETextService/PIMELangBarButton.h
@@ -46,8 +46,8 @@ class LangBarButton : public Ime::LangBarButton {
 	STDMETHODIMP OnClick(TfLBIClick click, POINT pt, const RECT *prcArea);
 	STDMETHODIMP InitMenu(ITfMenu *pMenu);
 
-private:
-	~LangBarButton(); // COM object should be deleted using Rlease()
+protected:
+	virtual ~LangBarButton(); // COM object should be deleted using Rlease()
 
 private:
 	std::string id_;

diff --git a/PIMETextService/PIMETextService.cpp b/PIMETextService/PIMETextService.cpp
@@ -45,8 +45,7 @@ TextService::TextService(ImeModule* module):
 	candPerRow_(10),
 	selKeys_(L"1234567890"),
 	candUseCursor_(false),
-	candFontSize_(12),
-	imeModeIcon_(nullptr) {
+	candFontSize_(12) {
 
 	// font for candidate and mesasge windows
 	font_ = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
@@ -74,9 +73,6 @@ TextService::~TextService(void) {
 
 	if(font_)
 		::DeleteObject(font_);
-
-	if(imeModeIcon_)
-		imeModeIcon_->Release();
 }
 
 // virtual
@@ -226,9 +222,6 @@ void TextService::onLangProfileActivated(REFIID lang) {
 	// create a new client connection to the input method server for the language profile
 	client_ = std::make_unique<Client>(this, lang);
 	client_->onActivate();
-
-	if (imeModeIcon_) // windows 8 IME mode icon
-		imeModeIcon_->setEnabled(isKeyboardOpened());
 }
 
 void TextService::onLangProfileDeactivated(REFIID lang) {

diff --git a/PIMETextService/PIMETextService.h b/PIMETextService/PIMETextService.h
@@ -172,7 +172,6 @@ class TextService: public Ime::TextService {
 	std::wstring candFontName_;
 	int candFontSize_;
 
-	std::unique_ptr<Ime::LangBarButton> imeModeIcon_; // IME mode icon, a special language button (Windows 8 only)
 	HMENU popupMenu_;
 
 	std::unique_ptr<Client> client_; // connection client

diff --git a/libIME b/libIME
+3 −1		CandidateWindow.h
+3 −1		DisplayAttributeInfo.h
+3 −1		DisplayAttributeInfoEnum.h
+3 −3		DisplayAttributeProvider.h
+3 −1		EditSession.h
+1 −2		ImeModule.cpp
+4 −2		ImeModule.h
+3 −1		LangBarButton.h
+3 −6		TextService.cpp
+3 −3		TextService.h