Index: xfa/fwl/cfwl_edit.h |
diff --git a/xfa/fwl/core/cfwl_edit.h b/xfa/fwl/cfwl_edit.h |
similarity index 91% |
rename from xfa/fwl/core/cfwl_edit.h |
rename to xfa/fwl/cfwl_edit.h |
index d31f148cd0924612205c5e82212f5ece92e62db0..f975bb2ba4e63c02b3ed8163f3b54683e1b0a2bb 100644 |
--- a/xfa/fwl/core/cfwl_edit.h |
+++ b/xfa/fwl/cfwl_edit.h |
@@ -4,8 +4,8 @@ |
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com |
-#ifndef XFA_FWL_CORE_CFWL_EDIT_H_ |
-#define XFA_FWL_CORE_CFWL_EDIT_H_ |
+#ifndef XFA_FWL_CFWL_EDIT_H_ |
+#define XFA_FWL_CFWL_EDIT_H_ |
#include <deque> |
#include <memory> |
@@ -13,9 +13,9 @@ |
#include "xfa/fde/cfde_txtedtengine.h" |
#include "xfa/fde/ifde_txtedtdorecord.h" |
-#include "xfa/fwl/core/cfwl_event.h" |
-#include "xfa/fwl/core/cfwl_scrollbar.h" |
-#include "xfa/fwl/core/cfwl_widget.h" |
+#include "xfa/fwl/cfwl_event.h" |
+#include "xfa/fwl/cfwl_scrollbar.h" |
+#include "xfa/fwl/cfwl_widget.h" |
#include "xfa/fxgraphics/cfx_path.h" |
#define FWL_STYLEEXT_EDT_ReadOnly (1L << 0) |
@@ -52,7 +52,7 @@ |
class IFDE_TxtEdtDoRecord; |
class CFWL_Edit; |
-class CFWL_MsgMouse; |
+class CFWL_MessageMouse; |
class CFWL_WidgetProperties; |
class CFWL_Caret; |
@@ -153,16 +153,16 @@ class CFWL_Edit : public CFWL_Widget { |
FX_FLOAT fOffSetX, |
FX_FLOAT fOffSetY); |
- void DoButtonDown(CFWL_MsgMouse* pMsg); |
+ void DoButtonDown(CFWL_MessageMouse* pMsg); |
void OnFocusChanged(CFWL_Message* pMsg, bool bSet); |
- void OnLButtonDown(CFWL_MsgMouse* pMsg); |
- void OnLButtonUp(CFWL_MsgMouse* pMsg); |
- void OnButtonDblClk(CFWL_MsgMouse* pMsg); |
- void OnMouseMove(CFWL_MsgMouse* pMsg); |
- void OnKeyDown(CFWL_MsgKey* pMsg); |
- void OnChar(CFWL_MsgKey* pMsg); |
+ void OnLButtonDown(CFWL_MessageMouse* pMsg); |
+ void OnLButtonUp(CFWL_MessageMouse* pMsg); |
+ void OnButtonDblClk(CFWL_MessageMouse* pMsg); |
+ void OnMouseMove(CFWL_MessageMouse* pMsg); |
+ void OnKeyDown(CFWL_MessageKey* pMsg); |
+ void OnChar(CFWL_MessageKey* pMsg); |
bool OnScroll(CFWL_ScrollBar* pScrollBar, |
- CFWL_EvtScroll::Code dwCode, |
+ CFWL_EventScroll::Code dwCode, |
FX_FLOAT fPos); |
CFX_RectF m_rtClient; |
@@ -188,4 +188,4 @@ class CFWL_Edit : public CFWL_Widget { |
int32_t m_iMaxRecord; |
}; |
-#endif // XFA_FWL_CORE_CFWL_EDIT_H_ |
+#endif // XFA_FWL_CFWL_EDIT_H_ |