Get rid of the old IActiveIMMApp code as the newer code calls

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

2 files changed, 0 insertions, 441 deletions

diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index d34a54bfa..e4202b586 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -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:
@@ -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.
@@ -779,7 +776,6 @@ void fl_clipboard_notify_untarget(HWND wnd) {
 }
 
 ////////////////////////////////////////////////////////////////
-char fl_is_ime = 0;
 void fl_get_codepage()
 {
   HKL hkl = GetKeyboardLayout(0);
@@ -787,14 +783,7 @@ void fl_get_codepage()
 
   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;
@@ -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;
 }
 
diff --git a/src/aimm.h b/src/aimm.h
deleted file mode 100644
index b2f6f4290..000000000
--- a/src/aimm.h
+++ /dev/null
@@ -1,422 +0,0 @@
-//
-// "$Id$"
-//
-// Standard dialog header file for the UTF-8 Fast Light Tool Kit (FLTK-UTF8).
-//
-// Copyright 2009-2010 by Bill Spitzak and others.
-//
-// This library is free software. Distribution and use rights are outlined in
-// the file "COPYING" which should have been included with this file.  If this
-// file is missing or damaged, see the license at:
-//
-//     http://www.fltk.org/COPYING.php
-//
-// Please report all bugs and problems on the following page:
-//
-//     http://www.fltk.org/str.php
-//
-
-#ifndef AIMM_H
-#  define AIMM_H
-//#  define HANDLE_PTR HANDLE* 
-//#  define DWORD_PTR DWORD*
-//#  define CLSCTX_INPROC_SERVER 0x1
-const GUID IID_IActiveIMMApp = { 0x8c0e040, 0x62d1, 0x11d1, {0x93, 0x26, 0x00, 0x60, 0xb0, 0x67, 0xb8, 0x6e}};
-const GUID CLSID_CActiveIMM = { 0x4955dd33, 0xb159, 0x11d0, {0x8f, 0xcf, 0x00, 0xaa, 0x00, 0x6b, 0xcc, 0x59}};
-/*
-	class IUnknown
-    {
-    public:
-        
-        virtual long __stdcall QueryInterface( 
-            const GUID & riid,
-            void **ppvObject) = 0;
-        
-        virtual ULONG __stdcall AddRef( void) = 0;
-        
-        virtual ULONG __stdcall Release( void) = 0;
-    };
-
-extern "C" __declspec(dllimport) long __stdcall CoInitialize(void far *pvReserved);
-extern "C" __declspec(dllimport) long __stdcall CoCreateInstance(const GUID & rclsid, IUnknown * pUnkOuter,
-                    DWORD dwClsContext, const GUID & riid, LPVOID FAR* ppv);
-
-*/
-
-    class IActiveIMMApp : public IUnknown
-    {
-    public:
-        virtual long __stdcall AssociateContext( 
-             HWND hWnd,
-             HIMC hIME,
-             HIMC  *phPrev) = 0;
-        
-        virtual long __stdcall ConfigureIMEA( 
-             HKL hKL,
-             HWND hWnd,
-             DWORD dwMode,
-             void  *pData) = 0;
-        
-        virtual long __stdcall ConfigureIMEW( 
-             HKL hKL,
-             HWND hWnd,
-             DWORD dwMode,
-             void  *pData) = 0;
-        
-        virtual long __stdcall CreateContext( 
-             HIMC  *phIMC) = 0;
-        
-        virtual long __stdcall DestroyContext( 
-             HIMC hIME) = 0;
-        
-        virtual long __stdcall EnumRegisterWordA( 
-             HKL hKL,
-             LPSTR szReading,
-             DWORD dwStyle,
-             LPSTR szRegister,
-             LPVOID pData,
-             void  **pEnum) = 0;
-        
-        virtual long __stdcall EnumRegisterWordW( 
-             HKL hKL,
-             LPWSTR szReading,
-             DWORD dwStyle,
-             LPWSTR szRegister,
-             LPVOID pData,
-             void  **pEnum) = 0;
-        
-        virtual long __stdcall EscapeA( 
-             HKL hKL,
-             HIMC hIMC,
-             UINT uEscape,
-            /* [out][in] */ LPVOID pData,
-             LRESULT  *plResult) = 0;
-        
-        virtual long __stdcall EscapeW( 
-             HKL hKL,
-             HIMC hIMC,
-             UINT uEscape,
-            /* [out][in] */ LPVOID pData,
-             LRESULT  *plResult) = 0;
-        
-        virtual long __stdcall GetCandidateListA( 
-             HIMC hIMC,
-             DWORD dwIndex,
-             UINT uBufLen,
-             void  *pCandList,
-             UINT  *puCopied) = 0;
-        
-        virtual long __stdcall GetCandidateListW( 
-             HIMC hIMC,
-             DWORD dwIndex,
-             UINT uBufLen,
-             void  *pCandList,
-             UINT  *puCopied) = 0;
-        
-        virtual long __stdcall GetCandidateListCountA( 
-             HIMC hIMC,
-             DWORD  *pdwListSize,
-             DWORD  *pdwBufLen) = 0;
-        
-        virtual long __stdcall GetCandidateListCountW( 
-             HIMC hIMC,
-             DWORD  *pdwListSize,
-             DWORD  *pdwBufLen) = 0;
-        
-        virtual long __stdcall GetCandidateWindow( 
-             HIMC hIMC,
-             DWORD dwIndex,
-             void  *pCandidate) = 0;
-        
-        virtual long __stdcall GetCompositionFontA( 
-             HIMC hIMC,
-             LOGFONTA  *plf) = 0;
-        
-        virtual long __stdcall GetCompositionFontW( 
-             HIMC hIMC,
-             LOGFONTW  *plf) = 0;
-        
-        virtual long __stdcall GetCompositionStringA( 
-             HIMC hIMC,
-             DWORD dwIndex,
-             DWORD dwBufLen,
-             LONG  *plCopied,
-             LPVOID pBuf) = 0;
-        
-        virtual long __stdcall GetCompositionStringW( 
-             HIMC hIMC,
-             DWORD dwIndex,
-             DWORD dwBufLen,
-             LONG  *plCopied,
-             LPVOID pBuf) = 0;
-        
-        virtual long __stdcall GetCompositionWindow( 
-             HIMC hIMC,
-             void  *pCompForm) = 0;
-        
-        virtual long __stdcall GetContext( 
-             HWND hWnd,
-             HIMC  *phIMC) = 0;
-        
-        virtual long __stdcall GetConversionListA( 
-             HKL hKL,
-             HIMC hIMC,
-             LPSTR pSrc,
-             UINT uBufLen,
-             UINT uFlag,
-             void  *pDst,
-             UINT  *puCopied) = 0;
-        
-        virtual long __stdcall GetConversionListW( 
-             HKL hKL,
-             HIMC hIMC,
-             LPWSTR pSrc,
-             UINT uBufLen,
-             UINT uFlag,
-             void  *pDst,
-             UINT  *puCopied) = 0;
-        
-        virtual long __stdcall GetConversionStatus( 
-             HIMC hIMC,
-             DWORD  *pfdwConversion,
-             DWORD  *pfdwSentence) = 0;
-        
-        virtual long __stdcall GetDefaultIMEWnd( 
-             HWND hWnd,
-             HWND  *phDefWnd) = 0;
-        
-        virtual long __stdcall GetDescriptionA( 
-             HKL hKL,
-             UINT uBufLen,
-             LPSTR szDescription,
-             UINT  *puCopied) = 0;
-        
-        virtual long __stdcall GetDescriptionW( 
-             HKL hKL,
-             UINT uBufLen,
-             LPWSTR szDescription,
-             UINT  *puCopied) = 0;
-        
-        virtual long __stdcall GetGuideLineA( 
-             HIMC hIMC,
-             DWORD dwIndex,
-             DWORD dwBufLen,
-             LPSTR pBuf,
-             DWORD  *pdwResult) = 0;
-        
-        virtual long __stdcall GetGuideLineW( 
-             HIMC hIMC,
-             DWORD dwIndex,
-             DWORD dwBufLen,
-             LPWSTR pBuf,
-             DWORD  *pdwResult) = 0;
-        
-        virtual long __stdcall GetIMEFileNameA( 
-             HKL hKL,
-             UINT uBufLen,
-             LPSTR szFileName,
-             UINT  *puCopied) = 0;
-        
-        virtual long __stdcall GetIMEFileNameW( 
-             HKL hKL,
-             UINT uBufLen,
-             LPWSTR szFileName,
-             UINT  *puCopied) = 0;
-        
-        virtual long __stdcall GetOpenStatus( 
-             HIMC hIMC) = 0;
-        
-        virtual long __stdcall GetProperty( 
-             HKL hKL,
-             DWORD fdwIndex,
-             DWORD  *pdwProperty) = 0;
-        
-        virtual long __stdcall GetRegisterWordStyleA( 
-             HKL hKL,
-             UINT nItem,
-             STYLEBUFA  *pStyleBuf,
-             UINT  *puCopied) = 0;
-        
-        virtual long __stdcall GetRegisterWordStyleW( 
-             HKL hKL,
-             UINT nItem,
-             STYLEBUFW  *pStyleBuf,
-             UINT  *puCopied) = 0;
-        
-        virtual long __stdcall GetStatusWindowPos( 
-             HIMC hIMC,
-             POINT  *pptPos) = 0;
-        
-        virtual long __stdcall GetVirtualKey( 
-             HWND hWnd,
-             UINT  *puVirtualKey) = 0;
-        
-        virtual long __stdcall InstallIMEA( 
-             LPSTR szIMEFileName,
-             LPSTR szLayoutText,
-             HKL  *phKL) = 0;
-        
-        virtual long __stdcall InstallIMEW( 
-             LPWSTR szIMEFileName,
-             LPWSTR szLayoutText,
-             HKL  *phKL) = 0;
-        
-        virtual long __stdcall IsIME( 
-             HKL hKL) = 0;
-        
-        virtual long __stdcall IsUIMessageA( 
-             HWND hWndIME,
-             UINT msg,
-             WPARAM wParam,
-             LPARAM lParam) = 0;
-        
-        virtual long __stdcall IsUIMessageW( 
-             HWND hWndIME,
-             UINT msg,
-             WPARAM wParam,
-             LPARAM lParam) = 0;
-        
-        virtual long __stdcall NotifyIME( 
-             HIMC hIMC,
-             DWORD dwAction,
-             DWORD dwIndex,
-             DWORD dwValue) = 0;
-        
-        virtual long __stdcall RegisterWordA( 
-             HKL hKL,
-             LPSTR szReading,
-             DWORD dwStyle,
-             LPSTR szRegister) = 0;
-        
-        virtual long __stdcall RegisterWordW( 
-             HKL hKL,
-             LPWSTR szReading,
-             DWORD dwStyle,
-             LPWSTR szRegister) = 0;
-        
-        virtual long __stdcall ReleaseContext( 
-             HWND hWnd,
-             HIMC hIMC) = 0;
-        
-        virtual long __stdcall SetCandidateWindow( 
-             HIMC hIMC,
-             void  *pCandidate) = 0;
-        
-        virtual long __stdcall SetCompositionFontA( 
-             HIMC hIMC,
-             LOGFONTA  *plf) = 0;
-        
-        virtual long __stdcall SetCompositionFontW( 
-             HIMC hIMC,
-             LOGFONTW  *plf) = 0;
-        
-        virtual long __stdcall SetCompositionStringA( 
-             HIMC hIMC,
-             DWORD dwIndex,
-             LPVOID pComp,
-             DWORD dwCompLen,
-             LPVOID pRead,
-             DWORD dwReadLen) = 0;
-        
-        virtual long __stdcall SetCompositionStringW( 
-             HIMC hIMC,
-             DWORD dwIndex,
-             LPVOID pComp,
-             DWORD dwCompLen,
-             LPVOID pRead,
-             DWORD dwReadLen) = 0;
-        
-        virtual long __stdcall SetCompositionWindow( 
-             HIMC hIMC,
-             void  *pCompForm) = 0;
-        
-        virtual long __stdcall SetConversionStatus( 
-             HIMC hIMC,
-             DWORD fdwConversion,
-             DWORD fdwSentence) = 0;
-        
-        virtual long __stdcall SetOpenStatus( 
-             HIMC hIMC,
-             BOOL fOpen) = 0;
-        
-        virtual long __stdcall SetStatusWindowPos( 
-             HIMC hIMC,
-             POINT  *pptPos) = 0;
-        
-        virtual long __stdcall SimulateHotKey( 
-             HWND hWnd,
-             DWORD dwHotKeyID) = 0;
-        
-        virtual long __stdcall UnregisterWordA( 
-             HKL hKL,
-             LPSTR szReading,
-             DWORD dwStyle,
-             LPSTR szUnregister) = 0;
-        
-        virtual long __stdcall UnregisterWordW( 
-             HKL hKL,
-             LPWSTR szReading,
-             DWORD dwStyle,
-             LPWSTR szUnregister) = 0;
-        
-        virtual long __stdcall Activate( 
-             BOOL fRestoreLayout) = 0;
-        
-        virtual long __stdcall Deactivate( void) = 0;
-        
-        virtual long __stdcall OnDefWindowProc( 
-             HWND hWnd,
-             UINT Msg,
-             WPARAM wParam,
-             LPARAM lParam,
-             LRESULT  *plResult) = 0;
-        
-        virtual long __stdcall FilterClientWindows( 
-             ATOM  *aaClassList,
-             UINT uSize) = 0;
-        
-        virtual long __stdcall GetCodePageA( 
-             HKL hKL,
-             UINT  *uCodePage) = 0;
-        
-        virtual long __stdcall GetLangId( 
-             HKL hKL,
-             WORD  *plid) = 0;
-        
-        virtual long __stdcall AssociateContextEx( 
-             HWND hWnd,
-             HIMC hIMC,
-             DWORD dwFlags) = 0;
-        
-        virtual long __stdcall DisableIME( 
-             DWORD idThread) = 0;
-        
-        virtual long __stdcall GetImeMenuItemsA( 
-             HIMC hIMC,
-             DWORD dwFlags,
-             DWORD dwType,
-             void  *pImeParentMenu,
-             void  *pImeMenu,
-             DWORD dwSize,
-             DWORD  *pdwResult) = 0;
-        
-        virtual long __stdcall GetImeMenuItemsW( 
-             HIMC hIMC,
-             DWORD dwFlags,
-             DWORD dwType,
-             void  *pImeParentMenu,
-            void  *pImeMenu,
-             DWORD dwSize,
-             DWORD  *pdwResult) = 0;
-        
-        virtual long __stdcall EnumInputContext( 
-             DWORD idThread,
-             void  **ppEnum) = 0;
-        
-    };
-
-#endif
-
-//
-// End of "$Id$".
-//