diff options
Diffstat (limited to 'fpdfsdk/include/javascript')
| -rw-r--r-- | fpdfsdk/include/javascript/JS_Define.h | 14 | ||||
| -rw-r--r-- | fpdfsdk/include/javascript/app.h | 86 |
2 files changed, 7 insertions, 93 deletions
diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h index 11471af9b7..17bf7b132c 100644 --- a/fpdfsdk/include/javascript/JS_Define.h +++ b/fpdfsdk/include/javascript/JS_Define.h @@ -37,10 +37,10 @@ struct JSMethodSpec { #define BEGIN_JS_STATIC_CONST(js_class_name) \ JSConstSpec js_class_name::JS_Class_Consts[] = { #define JS_STATIC_CONST_ENTRY_NUMBER(const_name, pValue) \ - { const_name, pValue, L"", 0 } \ + { const_name, pValue, L"", 0 } \ , -#define JS_STATIC_CONST_ENTRY_STRING(const_name, pValue) \ - { const_name, 0, pValue, 1 } \ +#define JS_STATIC_CONST_ENTRY_STRING(const_name, pValue) \ + { const_name, 0, pValue, 1 } \ , #define END_JS_STATIC_CONST() \ { 0, 0, 0, 0 } \ @@ -190,8 +190,8 @@ void JSMethod(const char* method_name_string, const wchar_t* js_class_name::m_pClassName = JS_WIDESTRING(class_name); \ void js_class_name::JSConstructor(IFXJS_Context* cc, JSFXObject obj, \ JSFXObject global) { \ - CJS_Object* pObj = new js_class_name(obj); \ - pObj->SetEmbedObject(new class_alternate(pObj)); \ + CJS_Object* pObj = new js_class_name(obj); \ + pObj->SetEmbedObject(new class_alternate(pObj)); \ JS_SetPrivate(NULL, obj, (void*)pObj); \ pObj->InitInstance(cc); \ } \ @@ -398,8 +398,8 @@ void JSSpecialPropDel(const char* class_name, } \ void js_class_name::JSConstructor(IFXJS_Context* cc, JSFXObject obj, \ JSFXObject global) { \ - CJS_Object* pObj = new js_class_name(obj); \ - pObj->SetEmbedObject(new class_alternate(pObj)); \ + CJS_Object* pObj = new js_class_name(obj); \ + pObj->SetEmbedObject(new class_alternate(pObj)); \ JS_SetPrivate(NULL, obj, (void*)pObj); \ pObj->InitInstance(cc); \ } \ diff --git a/fpdfsdk/include/javascript/app.h b/fpdfsdk/include/javascript/app.h index 221a7c1d89..b13121323b 100644 --- a/fpdfsdk/include/javascript/app.h +++ b/fpdfsdk/include/javascript/app.h @@ -36,71 +36,6 @@ class CJS_TimerObj : public CJS_Object { DECLARE_JS_CLASS(CJS_TimerObj); }; -// struct APP_MENUITEM_ARRAY; -// -// struct APP_MENUITEM -// { -// APP_MENUITEM() : oSubMenu(NULL), cName(L""), cReturn(L""), -// bMarked(false), bEnabled(true) -// { -// } -// CFX_WideString cName; -// CFX_WideString cReturn; -// APP_MENUITEM_ARRAY* oSubMenu; -// bool bMarked; -// bool bEnabled; -// }; - -// struct APP_MENUITEM_ARRAY -// { -// APP_MENUITEM_ARRAY() : m_hMenu(NULL), pContents(NULL), nSize(0) -// { -// -// } -// APP_MENUITEM * pContents; -// HMENU m_hMenu; -// int nSize; -// }; - -// struct APP_MENU; -// struct APP_MENU_ARRAY -// { -// APP_MENU_ARRAY(): -// pContent(NULL) -// { -// } -// -// APP_MENU* pContent; -// }; - -// struct APP_MENU -// { -// APP_MENU():bSubMenu(false), -// SubMenuItems(NULL), -// cwMenuItemName(L""), -// hMenu(NULL), -// iSize(0) -// { -// -// } -// -// APP_MENU(CFX_WideString &cwName): -// cwMenuItemName(cwName), -// bSubMenu(false), -// SubMenuItems(NULL), -// hMenu(NULL), -// iSize(0) -// { -// -// } -// -// CFX_WideString cwMenuItemName; -// bool bSubMenu; -// APP_MENU_ARRAY* SubMenuItems; -// int iSize; -// HMENU hMenu; -// }; - class app : public CJS_EmbedObj { public: app(CJS_Object* pJSObject); @@ -226,25 +161,8 @@ class app : public CJS_EmbedObj { CFX_WideString& sError); private: - // FX_DWORD AppGetTickCount(); void TimerProc(CJS_Timer* pTimer); void RunJsScript(CJS_Runtime* pRuntime, const CFX_WideString& wsScript); - // void ParsePopupMenuObj(APP_MENUITEM * - //ppMenuItem,JSObject * pObj); - // void DeleteMenuItems(APP_MENUITEM_ARRAY * - //pMenuItems); - // void AddMenuItem(APP_MENUITEM_ARRAY * pMenuItems, HMENU - // hMenu, MENUITEMINFO MenuItemInfo); - // void InitMenuItemInfo(MENUITEMINFO& - // MenuItemInfo); - // void DestroyPopUpMenu(); - - // void ParserMenuItem(APP_MENU* pHead, const - // CJS_Parameters¶ms); - // void AddItemToMenu(APP_MENU* pHead, HMENU hMenu, - // MENUITEMINFO MenuItemInfo); - // void DestroyMenuItems(APP_MENU* - // pHead); public: static CFX_WideString SysPathToPDFPath(const CFX_WideString& sOldPath); @@ -254,10 +172,6 @@ class app : public CJS_EmbedObj { bool m_bRuntimeHighLight; CFX_ArrayTemplate<CJS_Timer*> m_aTimer; - // APP_MENU* m_pMenuHead; - - public: - // static CReader_App* s_App; }; class CJS_App : public CJS_Object { |