Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / include / fwl / lightwidget / widget.h
index af5bddb..8f1246b 100644 (file)
@@ -13,7 +13,7 @@ class IFWL_WidgetDelegate;
 class IFWL_Widget;\r
 class CFWL_Widget;\r
 class CFWL_WidgetDelegate;\r
-class CFWL_WidgetProperties : public CFX_Object\r
+class CFWL_WidgetProperties\r
 {\r
 public:\r
     CFWL_WidgetProperties()\r
@@ -35,7 +35,7 @@ public:
     CFWL_Widget                        *m_pParent;\r
     CFWL_Widget                        *m_pOwner;\r
 };\r
-class CFWL_Widget : public CFX_Object\r
+class CFWL_Widget\r
 {\r
 public:\r
     IFWL_Widget*       GetWidget();\r
@@ -44,7 +44,7 @@ public:
     FX_DWORD           GetRefCount() const;\r
     FWL_ERR                    GetClassName(CFX_WideString &wsClass) const;\r
     FX_DWORD           GetClassID() const;\r
-    virtual FX_BOOL    IsInstance(FX_WSTR wsClass) const;\r
+    virtual FX_BOOL    IsInstance(const CFX_WideStringC& wsClass) const;\r
 protected:\r
     FWL_ERR                    Initialize(const CFWL_WidgetProperties *pProperties = NULL);\r
 public:\r
@@ -62,8 +62,8 @@ public:
     FWL_ERR                    ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved);\r
     FX_DWORD           GetStates();\r
     FWL_ERR                    SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE);\r
-    FWL_ERR                    SetPrivateData(FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback);\r
-    FX_LPVOID          GetPrivateData(FX_LPVOID module_id);\r
+    FWL_ERR                    SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback);\r
+    void*              GetPrivateData(void* module_id);\r
     FWL_ERR                    Update();\r
     FWL_ERR                    LockUpdate();\r
     FWL_ERR                    UnlockUpdate();\r
@@ -83,18 +83,18 @@ public:
     virtual ~CFWL_Widget();\r
     void               RegisterEventTarget(CFWL_Widget *pEventSource = NULL, FX_DWORD dwFilter = FWL_EVENT_ALL_MASK);\r
     void               DispatchEvent(CFWL_Event *pEvent);\r
-    CFX_SizeF  CalcTextSize(const CFX_WideString &wsText, FX_BOOL bMultiLine = FALSE, FX_INT32 iLineWidth = -1);\r
+    CFX_SizeF  CalcTextSize(const CFX_WideString &wsText, FX_BOOL bMultiLine = FALSE, int32_t iLineWidth = -1);\r
     IFWL_Widget                        *m_pImp;\r
     IFWL_WidgetDelegate *m_pDelegate;\r
     CFWL_WidgetMgr             *m_pWidgetMgr;\r
     CFWL_WidgetProperties *m_pProperties;\r
 };\r
-class CFWL_WidgetDelegate : public CFX_Object, public IFWL_WidgetDelegate\r
+class CFWL_WidgetDelegate\r
 {\r
 public:\r
     CFWL_WidgetDelegate();\r
     virtual ~CFWL_WidgetDelegate();\r
-    virtual FX_INT32   OnProcessMessage(CFWL_Message *pMessage);\r
+    virtual int32_t    OnProcessMessage(CFWL_Message *pMessage);\r
     virtual FWL_ERR            OnProcessEvent(CFWL_Event *pEvent);\r
     virtual FWL_ERR            OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL);\r
 };\r