Skip to content

Commit

Permalink
Get rid of the old IActiveIMMApp code as the newer code calls
Browse files Browse the repository at this point in the history
fatal() if it cannot be loaded and is hence already required.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10311 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
CendioOssman committed Sep 15, 2014
1 parent e145df2 commit 53888cf
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 441 deletions.
19 changes: 0 additions & 19 deletions src/Fl_win32.cxx
Expand Up @@ -60,8 +60,6 @@
#include <ole2.h>
#include <shellapi.h>

#include "aimm.h"

//
// USE_ASYNC_SELECT - define it if you have WSAAsyncSelect()...
// USE_ASYNC_SELECT is OBSOLETED in 1.3 for the following reasons:
Expand Down Expand Up @@ -338,7 +336,6 @@ void* Fl::thread_message() {

extern int fl_send_system_handlers(void *e);

IActiveIMMApp *fl_aimm = NULL;
MSG fl_msg;

// This is never called with time_to_wait < 0.0.
Expand Down Expand Up @@ -779,22 +776,14 @@ void fl_clipboard_notify_untarget(HWND wnd) {
}

////////////////////////////////////////////////////////////////
char fl_is_ime = 0;
void fl_get_codepage()
{
HKL hkl = GetKeyboardLayout(0);
TCHAR ld[8];

GetLocaleInfo (LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE, ld, 6);
DWORD ccp = atol(ld);
fl_is_ime = 0;

fl_codepage = ccp;
if (fl_aimm) {
fl_aimm->GetCodePageA(GetKeyboardLayout(0), &fl_codepage);
} else if (get_imm_module() && flImmIsIME(hkl)) {
fl_is_ime = 1;
}
}

HWND fl_capture;
Expand Down Expand Up @@ -1866,14 +1855,6 @@ Fl_X* Fl_X::make(Fl_Window* w) {
fl_OleInitialize();
RegisterDragDrop(x->xid, flIDropTarget);

if (!fl_aimm) {
CoCreateInstance(CLSID_CActiveIMM, NULL, CLSCTX_INPROC_SERVER,
IID_IActiveIMMApp, (void**) &fl_aimm);
if (fl_aimm) {
fl_aimm->Activate(TRUE);
}
}

return x;
}

Expand Down

0 comments on commit 53888cf

Please sign in to comment.