XFA: clang-format all pdfium code.

No behavior change.

Generated by:
  find . -name '*.cpp' -o -name '*.h' | \
  grep -E -v 'third_party|thirdparties|lpng_v163|tiff_v403' | \
  xargs ../../buildtools/mac/clang-format -i
Then manually merged https://codereview.chromium.org/1269223002/

See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion.

BUG=none

14 files changed, 1853 insertions, 2113 deletions

diff --git a/xfa/src/fwl/src/lightwidget/app.cpp b/xfa/src/fwl/src/lightwidget/app.cpp
index 54327c8cbc..9441b8f2f4 100644
--- a/xfa/src/fwl/src/lightwidget/app.cpp
+++ b/xfa/src/fwl/src/lightwidget/app.cpp
@@ -5,38 +5,30 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-CFWL_App::CFWL_App()

-    : m_pAppImp(NULL)

-    , m_pThemeProvider(NULL)

-{

-    m_pAppImp = IFWL_App::Create(NULL);

+CFWL_App::CFWL_App() : m_pAppImp(NULL), m_pThemeProvider(NULL) {

+  m_pAppImp = IFWL_App::Create(NULL);

 }

-CFWL_App::~CFWL_App()

-{

-    if (m_pThemeProvider) {

-        m_pThemeProvider->Finalize();

-        delete m_pThemeProvider;

-        m_pThemeProvider = NULL;

-    }

-    m_pAppImp->Release();

+CFWL_App::~CFWL_App() {

+  if (m_pThemeProvider) {

+    m_pThemeProvider->Finalize();

+    delete m_pThemeProvider;

+    m_pThemeProvider = NULL;

+  }

+  m_pAppImp->Release();

 }

-FWL_ERR CFWL_App::Initialize()

-{

-    m_pThemeProvider = FX_NEW CFWL_Theme;

-    m_pThemeProvider->Initialize();

-    m_pAppImp->SetThemeProvider((IFWL_ThemeProvider*)m_pThemeProvider);

-    return m_pAppImp->Initialize();

+FWL_ERR CFWL_App::Initialize() {

+  m_pThemeProvider = FX_NEW CFWL_Theme;

+  m_pThemeProvider->Initialize();

+  m_pAppImp->SetThemeProvider((IFWL_ThemeProvider*)m_pThemeProvider);

+  return m_pAppImp->Initialize();

 }

-CFWL_Theme*	CFWL_App::GetTheme()

-{

-    return m_pThemeProvider;

+CFWL_Theme* CFWL_App::GetTheme() {

+  return m_pThemeProvider;

 }

-FWL_ERR	CFWL_App::Exit(int32_t iExitCode )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pAppImp, FWL_ERR_Indefinite);

-    return m_pAppImp->Exit(iExitCode);

+FWL_ERR CFWL_App::Exit(int32_t iExitCode) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pAppImp, FWL_ERR_Indefinite);

+  return m_pAppImp->Exit(iExitCode);

 }

-IFWL_App* CFWL_App::GetApp()

-{

-    return m_pAppImp;

+IFWL_App* CFWL_App::GetApp() {

+  return m_pAppImp;

 }

diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/src/lightwidget/barcode.cpp
index 6c770c3b2c..f71a00d2ca 100644
--- a/xfa/src/fwl/src/lightwidget/barcode.cpp
+++ b/xfa/src/fwl/src/lightwidget/barcode.cpp
@@ -5,53 +5,45 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-CFWL_Barcode* CFWL_Barcode::Create()

-{

-    return FX_NEW CFWL_Barcode;

+CFWL_Barcode* CFWL_Barcode::Create() {

+  return FX_NEW CFWL_Barcode;

 }

-FWL_ERR	CFWL_Barcode::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

-    if (pProperties) {

-        *m_pProperties = *pProperties;

-    }

-    CFWL_WidgetImpProperties prop;

-    prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    prop.m_rtWidget = m_pProperties->m_rtWidget;

-    prop.m_dwStyles = m_pProperties->m_dwStyles;

-    prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    prop.m_dwStates = m_pProperties->m_dwStates;

-    prop.m_pDataProvider = &m_barcodeData;

-    if (m_pProperties->m_pParent) {

-        prop.m_pParent = m_pProperties->m_pParent->GetWidget();

-    }

-    if (m_pProperties->m_pOwner) {

-        prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

-    }

-    m_pImp = IFWL_Barcode::Create();

-    FWL_ERR ret = ((IFWL_Barcode*)m_pImp)->Initialize(prop);

-    if (ret == FWL_ERR_Succeeded) {

-        CFWL_Widget::Initialize();

-    }

-    return ret;

+FWL_ERR CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

+  if (pProperties) {

+    *m_pProperties = *pProperties;

+  }

+  CFWL_WidgetImpProperties prop;

+  prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  prop.m_rtWidget = m_pProperties->m_rtWidget;

+  prop.m_dwStyles = m_pProperties->m_dwStyles;

+  prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  prop.m_dwStates = m_pProperties->m_dwStates;

+  prop.m_pDataProvider = &m_barcodeData;

+  if (m_pProperties->m_pParent) {

+    prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (m_pProperties->m_pOwner) {

+    prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

+  }

+  m_pImp = IFWL_Barcode::Create();

+  FWL_ERR ret = ((IFWL_Barcode*)m_pImp)->Initialize(prop);

+  if (ret == FWL_ERR_Succeeded) {

+    CFWL_Widget::Initialize();

+  }

+  return ret;

 }

-CFWL_Barcode::CFWL_Barcode()

-{

+CFWL_Barcode::CFWL_Barcode() {}

+CFWL_Barcode::~CFWL_Barcode() {}

+void CFWL_Barcode::SetType(BC_TYPE type) {

+  _FWL_RETURN_IF_FAIL(m_pImp);

+  ((IFWL_Barcode*)m_pImp)->SetType(type);

 }

-CFWL_Barcode::~CFWL_Barcode()

-{

+FX_BOOL CFWL_Barcode::IsProtectedType() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return ((IFWL_Barcode*)m_pImp)->IsProtectedType();

 }

-void CFWL_Barcode::SetType(BC_TYPE type)

-{

-    _FWL_RETURN_IF_FAIL(m_pImp);

-    ((IFWL_Barcode*)m_pImp)->SetType(type);

-}

-FX_BOOL	CFWL_Barcode::IsProtectedType()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return ((IFWL_Barcode*)m_pImp)->IsProtectedType();

-}

-FWL_ERR CFWL_Barcode::CFWL_BarcodeDP::GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption)

-{

-    return FWL_ERR_Succeeded;

+FWL_ERR CFWL_Barcode::CFWL_BarcodeDP::GetCaption(IFWL_Widget* pWidget,

+                                                 CFX_WideString& wsCaption) {

+  return FWL_ERR_Succeeded;

 }

diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/src/lightwidget/caret.cpp
index a93e5d9dc5..a09ce40ffb 100644
--- a/xfa/src/fwl/src/lightwidget/caret.cpp
+++ b/xfa/src/fwl/src/lightwidget/caret.cpp
@@ -5,54 +5,44 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-CFWL_Caret* CFWL_Caret::Create()

-{

-    return FX_NEW CFWL_Caret;

-}

-FWL_ERR	CFWL_Caret::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

-    if (pProperties) {

-        *m_pProperties = *pProperties;

-    }

-    CFWL_WidgetImpProperties prop;

-    prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    prop.m_rtWidget = m_pProperties->m_rtWidget;

-    prop.m_dwStyles = m_pProperties->m_dwStyles;

-    prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    prop.m_dwStates = m_pProperties->m_dwStates;

-    if (m_pProperties->m_pParent) {

-        prop.m_pParent = m_pProperties->m_pParent->GetWidget();

-    }

-    if (m_pProperties->m_pOwner) {

-        prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

-    }

-    m_pImp = IFWL_Caret::Create();

-    FWL_ERR ret = ((IFWL_Caret*)m_pImp)->Initialize(prop);

-    if (ret == FWL_ERR_Succeeded) {

-        CFWL_Widget::Initialize();

-    }

-    return ret;

-}

-FWL_ERR CFWL_Caret::ShowCaret(FX_BOOL bFlag)

-{

-    return ((IFWL_Caret*)m_pImp)->ShowCaret(bFlag);

-}

-FWL_ERR CFWL_Caret::GetFrequency(FX_DWORD &elapse)

-{

-    return ((IFWL_Caret*)m_pImp)->GetFrequency(elapse);

-}

-FWL_ERR CFWL_Caret::SetFrequency(FX_DWORD elapse)

-{

-    return ((IFWL_Caret*)m_pImp)->SetFrequency(elapse);

-}

-FWL_ERR	CFWL_Caret::SetColor(CFX_Color crFill)

-{

-    return ((IFWL_Caret*)m_pImp)->SetColor(crFill);

-}

-CFWL_Caret::CFWL_Caret()

-{

-}

-CFWL_Caret::~CFWL_Caret()

-{

-}

+CFWL_Caret* CFWL_Caret::Create() {

+  return FX_NEW CFWL_Caret;

+}

+FWL_ERR CFWL_Caret::Initialize(const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

+  if (pProperties) {

+    *m_pProperties = *pProperties;

+  }

+  CFWL_WidgetImpProperties prop;

+  prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  prop.m_rtWidget = m_pProperties->m_rtWidget;

+  prop.m_dwStyles = m_pProperties->m_dwStyles;

+  prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  prop.m_dwStates = m_pProperties->m_dwStates;

+  if (m_pProperties->m_pParent) {

+    prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (m_pProperties->m_pOwner) {

+    prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

+  }

+  m_pImp = IFWL_Caret::Create();

+  FWL_ERR ret = ((IFWL_Caret*)m_pImp)->Initialize(prop);

+  if (ret == FWL_ERR_Succeeded) {

+    CFWL_Widget::Initialize();

+  }

+  return ret;

+}

+FWL_ERR CFWL_Caret::ShowCaret(FX_BOOL bFlag) {

+  return ((IFWL_Caret*)m_pImp)->ShowCaret(bFlag);

+}

+FWL_ERR CFWL_Caret::GetFrequency(FX_DWORD& elapse) {

+  return ((IFWL_Caret*)m_pImp)->GetFrequency(elapse);

+}

+FWL_ERR CFWL_Caret::SetFrequency(FX_DWORD elapse) {

+  return ((IFWL_Caret*)m_pImp)->SetFrequency(elapse);

+}

+FWL_ERR CFWL_Caret::SetColor(CFX_Color crFill) {

+  return ((IFWL_Caret*)m_pImp)->SetColor(crFill);

+}

+CFWL_Caret::CFWL_Caret() {}

+CFWL_Caret::~CFWL_Caret() {}

diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/src/lightwidget/checkbox.cpp
index 5079159d48..79d4886fdf 100644
--- a/xfa/src/fwl/src/lightwidget/checkbox.cpp
+++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp
@@ -5,71 +5,57 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-CFWL_CheckBox* CFWL_CheckBox::Create()

-{

-    return FX_NEW CFWL_CheckBox;

-}

-FWL_ERR	CFWL_CheckBox::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

-    if (pProperties) {

-        *m_pProperties = *pProperties;

-    }

-    CFWL_WidgetImpProperties prop;

-    prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    prop.m_rtWidget = m_pProperties->m_rtWidget;

-    prop.m_dwStyles = m_pProperties->m_dwStyles;

-    prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    prop.m_dwStates = m_pProperties->m_dwStates;

-    prop.m_pDataProvider = &m_checkboxData;

-    if (m_pProperties->m_pParent) {

-        prop.m_pParent = m_pProperties->m_pParent->GetWidget();

-    }

-    if (m_pProperties->m_pOwner) {

-        prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

-    }

-    m_pImp = IFWL_CheckBox::Create();

-    FWL_ERR ret = ((IFWL_CheckBox*)m_pImp)->Initialize(prop);

-    if (ret == FWL_ERR_Succeeded) {

-        CFWL_Widget::Initialize();

-    }

-    return ret;

-}

-FWL_ERR CFWL_CheckBox::SetCaption(const CFX_WideStringC& wsCaption)

-{

-    m_checkboxData.m_wsCaption = wsCaption;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_CheckBox::SetBoxSize(FX_FLOAT fHeight)

-{

-    m_checkboxData.m_fBoxHeight = fHeight;

-    return FWL_ERR_Succeeded;

-}

-int32_t CFWL_CheckBox::GetCheckState()

-{

-    return ((IFWL_CheckBox*)m_pImp)->GetCheckState();

-}

-FWL_ERR CFWL_CheckBox::SetCheckState(int32_t iCheck)

-{

-    return ((IFWL_CheckBox*)m_pImp)->SetCheckState(iCheck);

-}

-CFWL_CheckBox::CFWL_CheckBox()

-{

-}

-CFWL_CheckBox::~CFWL_CheckBox()

-{

-}

+CFWL_CheckBox* CFWL_CheckBox::Create() {

+  return FX_NEW CFWL_CheckBox;

+}

+FWL_ERR CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

+  if (pProperties) {

+    *m_pProperties = *pProperties;

+  }

+  CFWL_WidgetImpProperties prop;

+  prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  prop.m_rtWidget = m_pProperties->m_rtWidget;

+  prop.m_dwStyles = m_pProperties->m_dwStyles;

+  prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  prop.m_dwStates = m_pProperties->m_dwStates;

+  prop.m_pDataProvider = &m_checkboxData;

+  if (m_pProperties->m_pParent) {

+    prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (m_pProperties->m_pOwner) {

+    prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

+  }

+  m_pImp = IFWL_CheckBox::Create();

+  FWL_ERR ret = ((IFWL_CheckBox*)m_pImp)->Initialize(prop);

+  if (ret == FWL_ERR_Succeeded) {

+    CFWL_Widget::Initialize();

+  }

+  return ret;

+}

+FWL_ERR CFWL_CheckBox::SetCaption(const CFX_WideStringC& wsCaption) {

+  m_checkboxData.m_wsCaption = wsCaption;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_CheckBox::SetBoxSize(FX_FLOAT fHeight) {

+  m_checkboxData.m_fBoxHeight = fHeight;

+  return FWL_ERR_Succeeded;

+}

+int32_t CFWL_CheckBox::GetCheckState() {

+  return ((IFWL_CheckBox*)m_pImp)->GetCheckState();

+}

+FWL_ERR CFWL_CheckBox::SetCheckState(int32_t iCheck) {

+  return ((IFWL_CheckBox*)m_pImp)->SetCheckState(iCheck);

+}

+CFWL_CheckBox::CFWL_CheckBox() {}

+CFWL_CheckBox::~CFWL_CheckBox() {}

 CFWL_CheckBox::CFWL_CheckBoxDP::CFWL_CheckBoxDP()

-    : m_fBoxHeight(16.0f)

-    , m_wsCaption(L"Check box")

-{

-}

-FWL_ERR CFWL_CheckBox::CFWL_CheckBoxDP::GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption)

-{

-    wsCaption = m_wsCaption;

-    return FWL_ERR_Succeeded;

-}

-FX_FLOAT CFWL_CheckBox::CFWL_CheckBoxDP::GetBoxSize(IFWL_Widget *pWidget)

-{

-    return m_fBoxHeight;

+    : m_fBoxHeight(16.0f), m_wsCaption(L"Check box") {}

+FWL_ERR CFWL_CheckBox::CFWL_CheckBoxDP::GetCaption(IFWL_Widget* pWidget,

+                                                   CFX_WideString& wsCaption) {

+  wsCaption = m_wsCaption;

+  return FWL_ERR_Succeeded;

+}

+FX_FLOAT CFWL_CheckBox::CFWL_CheckBoxDP::GetBoxSize(IFWL_Widget* pWidget) {

+  return m_fBoxHeight;

 }

diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp
index 20211caa72..aec2403ae3 100644
--- a/xfa/src/fwl/src/lightwidget/combobox.cpp
+++ b/xfa/src/fwl/src/lightwidget/combobox.cpp
@@ -5,357 +5,324 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-CFWL_ComboBox* CFWL_ComboBox::Create()

-{

-    return FX_NEW CFWL_ComboBox;

-}

-FWL_ERR	CFWL_ComboBox::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

-    if (pProperties) {

-        *m_pProperties = *pProperties;

+CFWL_ComboBox* CFWL_ComboBox::Create() {

+  return FX_NEW CFWL_ComboBox;

+}

+FWL_ERR CFWL_ComboBox::Initialize(const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

+  if (pProperties) {

+    *m_pProperties = *pProperties;

+  }

+  CFWL_WidgetImpProperties prop;

+  prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  prop.m_rtWidget = m_pProperties->m_rtWidget;

+  prop.m_dwStyles = m_pProperties->m_dwStyles;

+  prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  prop.m_dwStates = m_pProperties->m_dwStates;

+  prop.m_pDataProvider = &m_comboBoxData;

+  if (m_pProperties->m_pParent) {

+    prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (m_pProperties->m_pOwner) {

+    prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

+  }

+  m_pImp = IFWL_ComboBox::Create();

+  FWL_ERR ret = ((IFWL_ComboBox*)m_pImp)->Initialize(prop);

+  if (ret == FWL_ERR_Succeeded) {

+    CFWL_Widget::Initialize();

+  }

+  return ret;

+}

+int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText) {

+  CFWL_ComboBoxItem* pItem = FX_NEW CFWL_ComboBoxItem;

+  pItem->m_wsText = wsText;

+  pItem->m_dwStyles = 0;

+  return m_comboBoxData.m_arrItem.Add(pItem);

+}

+int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText,

+                                 CFX_DIBitmap* pIcon) {

+  CFWL_ComboBoxItem* pItem = FX_NEW CFWL_ComboBoxItem;

+  pItem->m_wsText = wsText;

+  pItem->m_dwStyles = 0;

+  pItem->m_pDIB = pIcon;

+  return m_comboBoxData.m_arrItem.Add(pItem);

+}

+int32_t CFWL_ComboBox::RemoveAt(int32_t iIndex) {

+  return m_comboBoxData.m_arrItem.RemoveAt(iIndex);

+}

+int32_t CFWL_ComboBox::RemoveAll() {

+  m_comboBoxData.m_arrItem.RemoveAll();

+  return 0;

+}

+int32_t CFWL_ComboBox::CountItems() {

+  return m_comboBoxData.CountItems(GetWidget());

+}

+FWL_ERR CFWL_ComboBox::GetTextByIndex(int32_t iIndex, CFX_WideString& wsText) {

+  CFWL_ComboBoxItem* pItem =

+      (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget*)this, iIndex));

+  _FWL_RETURN_VALUE_IF_FAIL(pItem, FWL_ERR_Indefinite);

+  wsText = pItem->m_wsText;

+  return FWL_ERR_Succeeded;

+}

+int32_t CFWL_ComboBox::GetCurSel() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

+  return ((IFWL_ComboBox*)m_pImp)->GetCurSel();

+}

+FWL_ERR CFWL_ComboBox::SetCurSel(int32_t iSel) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ComboBox*)m_pImp)->SetCurSel(iSel);

+}

+FWL_ERR CFWL_ComboBox::SetEditText(const CFX_WideStringC& wsText) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ComboBox*)m_pImp)->SetEditText(wsText);

+}

+int32_t CFWL_ComboBox::GetEditTextLength() const {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return ((IFWL_ComboBox*)m_pImp)->GetEditTextLength();

+}

+FWL_ERR CFWL_ComboBox::GetEditText(CFX_WideString& wsText,

+                                   int32_t nStart,

+                                   int32_t nCount) const {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ComboBox*)m_pImp)->GetEditText(wsText, nStart, nCount);

+}

+FWL_ERR CFWL_ComboBox::SetEditSelRange(int32_t nStart, int32_t nCount) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ComboBox*)m_pImp)->SetEditSelRange(nStart, nCount);

+}

+int32_t CFWL_ComboBox::GetEditSelRange(int32_t nIndex, int32_t& nStart) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return ((IFWL_ComboBox*)m_pImp)->GetEditSelRange(nIndex, nStart);

+}

+int32_t CFWL_ComboBox::GetEditLimit() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return ((IFWL_ComboBox*)m_pImp)->GetEditLimit();

+}

+FWL_ERR CFWL_ComboBox::SetEditLimit(int32_t nLimit) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ComboBox*)m_pImp)->SetEditLimit(nLimit);

+}

+FWL_ERR CFWL_ComboBox::EditDoClipboard(int32_t iCmd) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ComboBox*)m_pImp)->EditDoClipboard(iCmd);

+}

+FX_BOOL CFWL_ComboBox::EditRedo(const CFX_ByteStringC& bsRecord) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditRedo(bsRecord);

+}

+FX_BOOL CFWL_ComboBox::EditUndo(const CFX_ByteStringC& bsRecord) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditUndo(bsRecord);

+}

+FWL_ERR CFWL_ComboBox::SetMaxListHeight(FX_FLOAT fMaxHeight) {

+  m_comboBoxData.m_fMaxListHeight = fMaxHeight;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ComboBox::SetItemData(int32_t iIndex, void* pData) {

+  CFWL_ComboBoxItem* pItem =

+      (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget*)this, iIndex));

+  _FWL_RETURN_VALUE_IF_FAIL(pItem, FWL_ERR_Indefinite);

+  pItem->m_pData = pData;

+  return FWL_ERR_Succeeded;

+}

+void* CFWL_ComboBox::GetItemData(int32_t iIndex) {

+  CFWL_ComboBoxItem* pItem =

+      (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget*)this, iIndex));

+  _FWL_RETURN_VALUE_IF_FAIL(pItem, NULL);

+  return pItem->m_pData;

+}

+FWL_ERR CFWL_ComboBox::SetListTheme(IFWL_ThemeProvider* pTheme) {

+  return ((IFWL_ComboBox*)m_pImp)->GetListBoxt()->SetThemeProvider(pTheme);

+}

+FX_BOOL CFWL_ComboBox::AfterFocusShowDropList() {

+  return ((IFWL_ComboBox*)m_pImp)->AfterFocusShowDropList();

+}

+FWL_ERR CFWL_ComboBox::OpenDropDownList(FX_BOOL bActivate) {

+  return ((IFWL_ComboBox*)m_pImp)->OpenDropDownList(bActivate);

+}

+FX_BOOL CFWL_ComboBox::EditCanUndo() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditCanUndo();

+}

+FX_BOOL CFWL_ComboBox::EditCanRedo() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditCanRedo();

+}

+FX_BOOL CFWL_ComboBox::EditUndo() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditUndo();

+}

+FX_BOOL CFWL_ComboBox::EditRedo() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditRedo();

+}

+FX_BOOL CFWL_ComboBox::EditCanCopy() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditCanCopy();

+}

+FX_BOOL CFWL_ComboBox::EditCanCut() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditCanCut();

+}

+FX_BOOL CFWL_ComboBox::EditCanSelectAll() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditCanSelectAll();

+}

+FX_BOOL CFWL_ComboBox::EditCopy(CFX_WideString& wsCopy) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditCopy(wsCopy);

+}

+FX_BOOL CFWL_ComboBox::EditCut(CFX_WideString& wsCut) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditCut(wsCut);

+}

+FX_BOOL CFWL_ComboBox::EditPaste(const CFX_WideString& wsPaste) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditPaste(wsPaste);

+}

+FX_BOOL CFWL_ComboBox::EditSelectAll() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditSelectAll();

+}

+FX_BOOL CFWL_ComboBox::EditDelete() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditDelete();

+}

+FX_BOOL CFWL_ComboBox::EditDeSelect() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->EditDeSelect();

+}

+FWL_ERR CFWL_ComboBox::GetBBox(CFX_RectF& rect) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)->GetBBox(rect);

+}

+FWL_ERR CFWL_ComboBox::EditModifyStylesEx(FX_DWORD dwStylesExAdded,

+                                          FX_DWORD dwStylesExRemoved) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ComboBox*)m_pImp)

+      ->EditModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);

+}

+CFWL_ComboBox::CFWL_ComboBox() {}

+CFWL_ComboBox::~CFWL_ComboBox() {}

+CFWL_ComboBox::CFWL_ComboBoxDP::CFWL_ComboBoxDP() {

+  m_fItemHeight = 0;

+  m_fMaxListHeight = 0;

+}

+CFWL_ComboBox::CFWL_ComboBoxDP::~CFWL_ComboBoxDP() {

+  int32_t nCount = m_arrItem.GetSize();

+  for (int32_t i = 0; i < nCount; i++) {

+    CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)m_arrItem[i];

+    if (pItem) {

+      delete pItem;

     }

-    CFWL_WidgetImpProperties prop;

-    prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    prop.m_rtWidget = m_pProperties->m_rtWidget;

-    prop.m_dwStyles = m_pProperties->m_dwStyles;

-    prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    prop.m_dwStates = m_pProperties->m_dwStates;

-    prop.m_pDataProvider = &m_comboBoxData;

-    if (m_pProperties->m_pParent) {

-        prop.m_pParent = m_pProperties->m_pParent->GetWidget();

-    }

-    if (m_pProperties->m_pOwner) {

-        prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

-    }

-    m_pImp = IFWL_ComboBox::Create();

-    FWL_ERR ret = ((IFWL_ComboBox*)m_pImp)->Initialize(prop);

-    if (ret == FWL_ERR_Succeeded) {

-        CFWL_Widget::Initialize();

-    }

-    return ret;

-}

-int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText)

-{

-    CFWL_ComboBoxItem *pItem = FX_NEW CFWL_ComboBoxItem;

-    pItem->m_wsText = wsText;

-    pItem->m_dwStyles = 0;

-    return m_comboBoxData.m_arrItem.Add(pItem);

-}

-int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText, CFX_DIBitmap *pIcon)

-{

-    CFWL_ComboBoxItem *pItem = FX_NEW CFWL_ComboBoxItem;

-    pItem->m_wsText = wsText;

-    pItem->m_dwStyles = 0;

-    pItem->m_pDIB = pIcon;

-    return m_comboBoxData.m_arrItem.Add(pItem);

-}

-int32_t CFWL_ComboBox::RemoveAt(int32_t iIndex)

-{

-    return m_comboBoxData.m_arrItem.RemoveAt(iIndex);

-}

-int32_t CFWL_ComboBox::RemoveAll()

-{

-    m_comboBoxData.m_arrItem.RemoveAll();

-    return 0;

-}

-int32_t CFWL_ComboBox::CountItems()

-{

-    return m_comboBoxData.CountItems(GetWidget());

-}

-FWL_ERR CFWL_ComboBox::GetTextByIndex(int32_t iIndex, CFX_WideString &wsText)

-{

-    CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget *)this, iIndex));

-    _FWL_RETURN_VALUE_IF_FAIL(pItem, FWL_ERR_Indefinite);

-    wsText = pItem->m_wsText;

-    return FWL_ERR_Succeeded;

-}

-int32_t CFWL_ComboBox::GetCurSel()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

-    return ((IFWL_ComboBox*)m_pImp)->GetCurSel();

-}

-FWL_ERR CFWL_ComboBox::SetCurSel(int32_t iSel)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ComboBox*)m_pImp)->SetCurSel(iSel);

-}

-FWL_ERR CFWL_ComboBox::SetEditText(const CFX_WideStringC& wsText)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ComboBox*)m_pImp)->SetEditText(wsText);

-}

-int32_t CFWL_ComboBox::GetEditTextLength() const

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return ((IFWL_ComboBox*)m_pImp)->GetEditTextLength();

-}

-FWL_ERR CFWL_ComboBox::GetEditText(CFX_WideString &wsText, int32_t nStart, int32_t nCount) const

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ComboBox*)m_pImp)->GetEditText(wsText, nStart, nCount);

-}

-FWL_ERR CFWL_ComboBox::SetEditSelRange(int32_t nStart, int32_t nCount)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ComboBox*)m_pImp)->SetEditSelRange(nStart, nCount);

-}

-int32_t CFWL_ComboBox::GetEditSelRange(int32_t nIndex, int32_t &nStart)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return ((IFWL_ComboBox*)m_pImp)->GetEditSelRange(nIndex, nStart);

-}

-int32_t CFWL_ComboBox::GetEditLimit()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return ((IFWL_ComboBox*)m_pImp)->GetEditLimit();

-}

-FWL_ERR CFWL_ComboBox::SetEditLimit(int32_t nLimit)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ComboBox*)m_pImp)->SetEditLimit(nLimit);

-}

-FWL_ERR CFWL_ComboBox::EditDoClipboard(int32_t iCmd)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ComboBox*)m_pImp)->EditDoClipboard(iCmd);

-}

-FX_BOOL CFWL_ComboBox::EditRedo(const CFX_ByteStringC& bsRecord)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditRedo(bsRecord);

-}

-FX_BOOL CFWL_ComboBox::EditUndo(const CFX_ByteStringC& bsRecord)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditUndo(bsRecord);

-}

-FWL_ERR CFWL_ComboBox::SetMaxListHeight(FX_FLOAT fMaxHeight)

-{

-    m_comboBoxData.m_fMaxListHeight = fMaxHeight;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR	CFWL_ComboBox::SetItemData(int32_t iIndex, void* pData)

-{

-    CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget *)this, iIndex));

-    _FWL_RETURN_VALUE_IF_FAIL(pItem, FWL_ERR_Indefinite);

-    pItem->m_pData = pData;

-    return FWL_ERR_Succeeded;

-}

-void* CFWL_ComboBox::GetItemData(int32_t iIndex)

-{

-    CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)(m_comboBoxData.GetItem((IFWL_Widget *)this, iIndex));

-    _FWL_RETURN_VALUE_IF_FAIL(pItem, NULL);

-    return pItem->m_pData;

-}

-FWL_ERR CFWL_ComboBox::SetListTheme(IFWL_ThemeProvider *pTheme)

-{

-    return ((IFWL_ComboBox*)m_pImp)->GetListBoxt()->SetThemeProvider(pTheme);

-}

-FX_BOOL CFWL_ComboBox::AfterFocusShowDropList()

-{

-    return ((IFWL_ComboBox*)m_pImp)->AfterFocusShowDropList();

-}

-FWL_ERR CFWL_ComboBox::OpenDropDownList(FX_BOOL bActivate)

-{

-    return ((IFWL_ComboBox*)m_pImp)->OpenDropDownList(bActivate);

-}

-FX_BOOL	CFWL_ComboBox::EditCanUndo()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditCanUndo();

-}

-FX_BOOL	CFWL_ComboBox::EditCanRedo()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditCanRedo();

-}

-FX_BOOL	CFWL_ComboBox::EditUndo()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditUndo();

-}

-FX_BOOL	CFWL_ComboBox::EditRedo()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditRedo();

-}

-FX_BOOL	CFWL_ComboBox::EditCanCopy()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditCanCopy();

-}

-FX_BOOL	CFWL_ComboBox::EditCanCut()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditCanCut();

-}

-FX_BOOL	CFWL_ComboBox::EditCanSelectAll()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditCanSelectAll();

-}

-FX_BOOL	CFWL_ComboBox::EditCopy(CFX_WideString &wsCopy)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditCopy(wsCopy);

-}

-FX_BOOL	CFWL_ComboBox::EditCut(CFX_WideString &wsCut)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditCut(wsCut);

-}

-FX_BOOL	CFWL_ComboBox::EditPaste(const CFX_WideString &wsPaste)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditPaste(wsPaste);

-}

-FX_BOOL	CFWL_ComboBox::EditSelectAll()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditSelectAll();

-}

-FX_BOOL	CFWL_ComboBox::EditDelete()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditDelete();

-}

-FX_BOOL	CFWL_ComboBox::EditDeSelect()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditDeSelect();

-}

-FWL_ERR	CFWL_ComboBox::GetBBox(CFX_RectF &rect)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->GetBBox(rect);

-}

-FWL_ERR 	CFWL_ComboBox::EditModifyStylesEx(FX_DWORD dwStylesExAdded,

-        FX_DWORD dwStylesExRemoved)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ComboBox*)m_pImp)->EditModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);

-}

-CFWL_ComboBox::CFWL_ComboBox()

-{

-}

-CFWL_ComboBox::~CFWL_ComboBox()

-{

-}

-CFWL_ComboBox::CFWL_ComboBoxDP::CFWL_ComboBoxDP()

-{

-    m_fItemHeight = 0;

-    m_fMaxListHeight = 0;

-}

-CFWL_ComboBox::CFWL_ComboBoxDP::~CFWL_ComboBoxDP()

-{

-    int32_t nCount = m_arrItem.GetSize();

-    for (int32_t i = 0; i < nCount; i ++) {

-        CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)m_arrItem[i];

-        if (pItem) {

-            delete pItem;

-        }

-    }

-    m_arrItem.RemoveAll();

-}

-int32_t CFWL_ComboBox::CFWL_ComboBoxDP::CountItems(IFWL_Widget *pWidget)

-{

-    return m_arrItem.GetSize();

-}

-FWL_HLISTITEM CFWL_ComboBox::CFWL_ComboBoxDP::GetItem(IFWL_Widget *pWidget, int32_t nIndex)

-{

-    int32_t iCount = m_arrItem.GetSize();

-    if (nIndex >= iCount || nIndex < 0) {

-        return NULL;

-    }

-    return (FWL_HLISTITEM)m_arrItem[nIndex];

-}

-int32_t CFWL_ComboBox::CFWL_ComboBoxDP::GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

-{

-    return m_arrItem.Find(hItem);

-}

-FX_BOOL CFWL_ComboBox::CFWL_ComboBoxDP::SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, int32_t nIndex)

-{

-    return m_arrItem.SetAt(nIndex, hItem);

-}

-FX_DWORD CFWL_ComboBox::CFWL_ComboBoxDP::GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, 0);

-    return ((CFWL_ComboBoxItem*)hItem)->m_dwStyles;

-}

-FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    wsText = ((CFWL_ComboBoxItem*)hItem)->m_wsText;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF& rtItem)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)hItem;

-    rtItem.Set(pItem->m_rtItem.left,

-               pItem->m_rtItem.top,

-               pItem->m_rtItem.width,

-               pItem->m_rtItem.height);

-    return FWL_ERR_Succeeded;

-}

-void* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);

-    CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)hItem;

-    return pItem->m_pData;

-}

-FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwStyle)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    ((CFWL_ComboBoxItem*)hItem)->m_dwStyles = dwStyle;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    ((CFWL_ComboBoxItem*)hItem)->m_wsText = pszText;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtItem)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    ((CFWL_ComboBoxItem*)hItem)->m_rtItem = rtItem;

-    return FWL_ERR_Succeeded;

-}

-FX_FLOAT CFWL_ComboBox::CFWL_ComboBoxDP::GetItemHeight(IFWL_Widget *pWidget)

-{

-    return m_fItemHeight;

-}

-CFX_DIBitmap* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemIcon(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);

-    return ((CFWL_ComboBoxItem*)hItem)->m_pDIB;

-}

-FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemCheckRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF& rtCheck)

-{

-    CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)hItem;

-    rtCheck = pItem->m_rtCheckBox;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemCheckRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtCheck)

-{

-    CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)hItem;

-    pItem->m_rtCheckBox = rtCheck;

-    return FWL_ERR_Succeeded;

-}

-FX_DWORD CFWL_ComboBox::CFWL_ComboBoxDP::GetItemCheckState(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

-{

-    CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)hItem;

-    return pItem->m_dwCheckState;

-}

-FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemCheckState(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwCheckState)

-{

-    CFWL_ComboBoxItem *pItem = (CFWL_ComboBoxItem*)hItem;

-    pItem->m_dwCheckState = dwCheckState;

-    return FWL_ERR_Succeeded;

-}

-FX_FLOAT CFWL_ComboBox::CFWL_ComboBoxDP::GetListHeight(IFWL_Widget *pWidget)

-{

-    return m_fMaxListHeight;

+  }

+  m_arrItem.RemoveAll();

+}

+int32_t CFWL_ComboBox::CFWL_ComboBoxDP::CountItems(IFWL_Widget* pWidget) {

+  return m_arrItem.GetSize();

+}

+FWL_HLISTITEM CFWL_ComboBox::CFWL_ComboBoxDP::GetItem(IFWL_Widget* pWidget,

+                                                      int32_t nIndex) {

+  int32_t iCount = m_arrItem.GetSize();

+  if (nIndex >= iCount || nIndex < 0) {

+    return NULL;

+  }

+  return (FWL_HLISTITEM)m_arrItem[nIndex];

+}

+int32_t CFWL_ComboBox::CFWL_ComboBoxDP::GetItemIndex(IFWL_Widget* pWidget,

+                                                     FWL_HLISTITEM hItem) {

+  return m_arrItem.Find(hItem);

+}

+FX_BOOL CFWL_ComboBox::CFWL_ComboBoxDP::SetItemIndex(IFWL_Widget* pWidget,

+                                                     FWL_HLISTITEM hItem,

+                                                     int32_t nIndex) {

+  return m_arrItem.SetAt(nIndex, hItem);

+}

+FX_DWORD CFWL_ComboBox::CFWL_ComboBoxDP::GetItemStyles(IFWL_Widget* pWidget,

+                                                       FWL_HLISTITEM hItem) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, 0);

+  return ((CFWL_ComboBoxItem*)hItem)->m_dwStyles;

+}

+FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemText(IFWL_Widget* pWidget,

+                                                    FWL_HLISTITEM hItem,

+                                                    CFX_WideString& wsText) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  wsText = ((CFWL_ComboBoxItem*)hItem)->m_wsText;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemRect(IFWL_Widget* pWidget,

+                                                    FWL_HLISTITEM hItem,

+                                                    CFX_RectF& rtItem) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;

+  rtItem.Set(pItem->m_rtItem.left, pItem->m_rtItem.top, pItem->m_rtItem.width,

+             pItem->m_rtItem.height);

+  return FWL_ERR_Succeeded;

+}

+void* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemData(IFWL_Widget* pWidget,

+                                                  FWL_HLISTITEM hItem) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);

+  CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;

+  return pItem->m_pData;

+}

+FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemStyles(IFWL_Widget* pWidget,

+                                                      FWL_HLISTITEM hItem,

+                                                      FX_DWORD dwStyle) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  ((CFWL_ComboBoxItem*)hItem)->m_dwStyles = dwStyle;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemText(IFWL_Widget* pWidget,

+                                                    FWL_HLISTITEM hItem,

+                                                    const FX_WCHAR* pszText) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  ((CFWL_ComboBoxItem*)hItem)->m_wsText = pszText;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemRect(IFWL_Widget* pWidget,

+                                                    FWL_HLISTITEM hItem,

+                                                    const CFX_RectF& rtItem) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  ((CFWL_ComboBoxItem*)hItem)->m_rtItem = rtItem;

+  return FWL_ERR_Succeeded;

+}

+FX_FLOAT CFWL_ComboBox::CFWL_ComboBoxDP::GetItemHeight(IFWL_Widget* pWidget) {

+  return m_fItemHeight;

+}

+CFX_DIBitmap* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemIcon(IFWL_Widget* pWidget,

+                                                          FWL_HLISTITEM hItem) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);

+  return ((CFWL_ComboBoxItem*)hItem)->m_pDIB;

+}

+FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::GetItemCheckRect(IFWL_Widget* pWidget,

+                                                         FWL_HLISTITEM hItem,

+                                                         CFX_RectF& rtCheck) {

+  CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;

+  rtCheck = pItem->m_rtCheckBox;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemCheckRect(

+    IFWL_Widget* pWidget,

+    FWL_HLISTITEM hItem,

+    const CFX_RectF& rtCheck) {

+  CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;

+  pItem->m_rtCheckBox = rtCheck;

+  return FWL_ERR_Succeeded;

+}

+FX_DWORD CFWL_ComboBox::CFWL_ComboBoxDP::GetItemCheckState(

+    IFWL_Widget* pWidget,

+    FWL_HLISTITEM hItem) {

+  CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;

+  return pItem->m_dwCheckState;

+}

+FWL_ERR CFWL_ComboBox::CFWL_ComboBoxDP::SetItemCheckState(

+    IFWL_Widget* pWidget,

+    FWL_HLISTITEM hItem,

+    FX_DWORD dwCheckState) {

+  CFWL_ComboBoxItem* pItem = (CFWL_ComboBoxItem*)hItem;

+  pItem->m_dwCheckState = dwCheckState;

+  return FWL_ERR_Succeeded;

+}

+FX_FLOAT CFWL_ComboBox::CFWL_ComboBoxDP::GetListHeight(IFWL_Widget* pWidget) {

+  return m_fMaxListHeight;

 }

diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp
index ee64d09d7c..008a22179d 100644
--- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp
+++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp
@@ -5,152 +5,135 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-CFWL_DateTimePicker* CFWL_DateTimePicker::Create()

-{

-    return FX_NEW CFWL_DateTimePicker;

-}

-FWL_ERR CFWL_DateTimePicker::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

-    if (pProperties) {

-        *m_pProperties = *pProperties;

-    }

-    CFWL_WidgetImpProperties prop;

-    prop.m_dwStyles = m_pProperties->m_dwStyles;

-    prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    prop.m_dwStates = m_pProperties->m_dwStates;

-    prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    prop.m_pDataProvider = &m_DateTimePickerDP;

-    if (m_pProperties->m_pParent) {

-        prop.m_pParent = m_pProperties->m_pParent->GetWidget();

-    }

-    if (m_pProperties->m_pOwner) {

-        prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

-    }

-    prop.m_rtWidget = m_pProperties->m_rtWidget;

-    m_pImp = IFWL_DateTimePicker::Create();

-    FWL_ERR ret = ((IFWL_DateTimePicker*)m_pImp)->Initialize(prop);

-    if (ret == FWL_ERR_Succeeded) {

-        CFWL_Widget::Initialize();

-    }

-    return ret;

-}

-FWL_ERR CFWL_DateTimePicker::SetToday(int32_t iYear, int32_t iMonth, int32_t iDay)

-{

-    m_DateTimePickerDP.m_iYear = iYear;

-    m_DateTimePickerDP.m_iMonth = iMonth;

-    m_DateTimePickerDP.m_iDay = iDay;

-    return FWL_ERR_Succeeded;

-}

-int32_t CFWL_DateTimePicker::CountSelRanges()

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->CountSelRanges();

-}

-int32_t CFWL_DateTimePicker::GetSelRange(int32_t nIndex, int32_t &nStart)

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->GetSelRange(nIndex, nStart);

-}

-FWL_ERR	CFWL_DateTimePicker::GetEditText(CFX_WideString &wsText)

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->GetEditText(wsText);

-}

-FWL_ERR	CFWL_DateTimePicker::SetEditText(const CFX_WideStringC& wsText)

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->SetEditText(wsText);

-}

-FWL_ERR	CFWL_DateTimePicker::GetCurSel(int32_t &iYear, int32_t &iMonth, int32_t &iDay)

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->GetCurSel(iYear, iMonth, iDay);

-}

-FWL_ERR	CFWL_DateTimePicker::SetCurSel(int32_t iYear, int32_t iMonth, int32_t iDay)

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->SetCurSel(iYear, iMonth, iDay);

-}

-CFWL_DateTimePicker::CFWL_DateTimePicker()

-{

-}

-CFWL_DateTimePicker::~CFWL_DateTimePicker()

-{

-}

-CFWL_DateTimePicker::CFWL_DateTimePickerDP::CFWL_DateTimePickerDP()

-{

-    m_iYear = 2011;

-    m_iMonth = 1;

-    m_iDay = 1;

-}

-FWL_ERR CFWL_DateTimePicker::CFWL_DateTimePickerDP::GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption)

-{

-    wsCaption = m_wsData;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_DateTimePicker::CFWL_DateTimePickerDP::GetToday(IFWL_Widget *pWidget, int32_t &iYear, int32_t &iMonth, int32_t &iDay)

-{

-    iYear = m_iYear;

-    iMonth = m_iMonth;

-    iDay = m_iDay;

-    return FWL_ERR_Succeeded;

-}

-FX_BOOL	CFWL_DateTimePicker::CanUndo()

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->CanUndo();

-}

-FX_BOOL	CFWL_DateTimePicker::CanRedo()

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->CanRedo();

-}

-FX_BOOL	CFWL_DateTimePicker::Undo()

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->Undo();

-}

-FX_BOOL	CFWL_DateTimePicker::Redo()

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->Redo();

-}

-FX_BOOL	CFWL_DateTimePicker::CanCopy()

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->CanCopy();

-}

-FX_BOOL	CFWL_DateTimePicker::CanCut()

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->CanCut();

-}

-FX_BOOL	CFWL_DateTimePicker::CanSelectAll()

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->CanSelectAll();

-}

-FX_BOOL	CFWL_DateTimePicker::Copy(CFX_WideString &wsCopy)

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->Copy(wsCopy);

-}

-FX_BOOL	CFWL_DateTimePicker::Cut(CFX_WideString &wsCut)

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->Copy(wsCut);

-}

-FX_BOOL	CFWL_DateTimePicker::Paste(const CFX_WideString &wsPaste)

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->Paste(wsPaste);

-}

-FX_BOOL	CFWL_DateTimePicker::SelectAll()

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->SelectAll();

-}

-FX_BOOL	CFWL_DateTimePicker::Delete()

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->Delete();

-}

-FX_BOOL	CFWL_DateTimePicker::DeSelect()

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->DeSelect();

-}

-FWL_ERR CFWL_DateTimePicker::GetBBox(CFX_RectF &rect)

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->GetBBox(rect);

-}

-FWL_ERR CFWL_DateTimePicker::SetEditLimit(int32_t nLimit)

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->SetEditLimit(nLimit);

-}

-FWL_ERR CFWL_DateTimePicker::ModifyEditStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved)

-{

-    return ((IFWL_DateTimePicker*)m_pImp)->ModifyEditStylesEx(dwStylesExAdded, dwStylesExRemoved);

+CFWL_DateTimePicker* CFWL_DateTimePicker::Create() {

+  return FX_NEW CFWL_DateTimePicker;

+}

+FWL_ERR CFWL_DateTimePicker::Initialize(

+    const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

+  if (pProperties) {

+    *m_pProperties = *pProperties;

+  }

+  CFWL_WidgetImpProperties prop;

+  prop.m_dwStyles = m_pProperties->m_dwStyles;

+  prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  prop.m_dwStates = m_pProperties->m_dwStates;

+  prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  prop.m_pDataProvider = &m_DateTimePickerDP;

+  if (m_pProperties->m_pParent) {

+    prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (m_pProperties->m_pOwner) {

+    prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

+  }

+  prop.m_rtWidget = m_pProperties->m_rtWidget;

+  m_pImp = IFWL_DateTimePicker::Create();

+  FWL_ERR ret = ((IFWL_DateTimePicker*)m_pImp)->Initialize(prop);

+  if (ret == FWL_ERR_Succeeded) {

+    CFWL_Widget::Initialize();

+  }

+  return ret;

+}

+FWL_ERR CFWL_DateTimePicker::SetToday(int32_t iYear,

+                                      int32_t iMonth,

+                                      int32_t iDay) {

+  m_DateTimePickerDP.m_iYear = iYear;

+  m_DateTimePickerDP.m_iMonth = iMonth;

+  m_DateTimePickerDP.m_iDay = iDay;

+  return FWL_ERR_Succeeded;

+}

+int32_t CFWL_DateTimePicker::CountSelRanges() {

+  return ((IFWL_DateTimePicker*)m_pImp)->CountSelRanges();

+}

+int32_t CFWL_DateTimePicker::GetSelRange(int32_t nIndex, int32_t& nStart) {

+  return ((IFWL_DateTimePicker*)m_pImp)->GetSelRange(nIndex, nStart);

+}

+FWL_ERR CFWL_DateTimePicker::GetEditText(CFX_WideString& wsText) {

+  return ((IFWL_DateTimePicker*)m_pImp)->GetEditText(wsText);

+}

+FWL_ERR CFWL_DateTimePicker::SetEditText(const CFX_WideStringC& wsText) {

+  return ((IFWL_DateTimePicker*)m_pImp)->SetEditText(wsText);

+}

+FWL_ERR CFWL_DateTimePicker::GetCurSel(int32_t& iYear,

+                                       int32_t& iMonth,

+                                       int32_t& iDay) {

+  return ((IFWL_DateTimePicker*)m_pImp)->GetCurSel(iYear, iMonth, iDay);

+}

+FWL_ERR CFWL_DateTimePicker::SetCurSel(int32_t iYear,

+                                       int32_t iMonth,

+                                       int32_t iDay) {

+  return ((IFWL_DateTimePicker*)m_pImp)->SetCurSel(iYear, iMonth, iDay);

+}

+CFWL_DateTimePicker::CFWL_DateTimePicker() {}

+CFWL_DateTimePicker::~CFWL_DateTimePicker() {}

+CFWL_DateTimePicker::CFWL_DateTimePickerDP::CFWL_DateTimePickerDP() {

+  m_iYear = 2011;

+  m_iMonth = 1;

+  m_iDay = 1;

+}

+FWL_ERR CFWL_DateTimePicker::CFWL_DateTimePickerDP::GetCaption(

+    IFWL_Widget* pWidget,

+    CFX_WideString& wsCaption) {

+  wsCaption = m_wsData;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_DateTimePicker::CFWL_DateTimePickerDP::GetToday(

+    IFWL_Widget* pWidget,

+    int32_t& iYear,

+    int32_t& iMonth,

+    int32_t& iDay) {

+  iYear = m_iYear;

+  iMonth = m_iMonth;

+  iDay = m_iDay;

+  return FWL_ERR_Succeeded;

+}

+FX_BOOL CFWL_DateTimePicker::CanUndo() {

+  return ((IFWL_DateTimePicker*)m_pImp)->CanUndo();

+}

+FX_BOOL CFWL_DateTimePicker::CanRedo() {

+  return ((IFWL_DateTimePicker*)m_pImp)->CanRedo();

+}

+FX_BOOL CFWL_DateTimePicker::Undo() {

+  return ((IFWL_DateTimePicker*)m_pImp)->Undo();

+}

+FX_BOOL CFWL_DateTimePicker::Redo() {

+  return ((IFWL_DateTimePicker*)m_pImp)->Redo();

+}

+FX_BOOL CFWL_DateTimePicker::CanCopy() {

+  return ((IFWL_DateTimePicker*)m_pImp)->CanCopy();

+}

+FX_BOOL CFWL_DateTimePicker::CanCut() {

+  return ((IFWL_DateTimePicker*)m_pImp)->CanCut();

+}

+FX_BOOL CFWL_DateTimePicker::CanSelectAll() {

+  return ((IFWL_DateTimePicker*)m_pImp)->CanSelectAll();

+}

+FX_BOOL CFWL_DateTimePicker::Copy(CFX_WideString& wsCopy) {

+  return ((IFWL_DateTimePicker*)m_pImp)->Copy(wsCopy);

+}

+FX_BOOL CFWL_DateTimePicker::Cut(CFX_WideString& wsCut) {

+  return ((IFWL_DateTimePicker*)m_pImp)->Copy(wsCut);

+}

+FX_BOOL CFWL_DateTimePicker::Paste(const CFX_WideString& wsPaste) {

+  return ((IFWL_DateTimePicker*)m_pImp)->Paste(wsPaste);

+}

+FX_BOOL CFWL_DateTimePicker::SelectAll() {

+  return ((IFWL_DateTimePicker*)m_pImp)->SelectAll();

+}

+FX_BOOL CFWL_DateTimePicker::Delete() {

+  return ((IFWL_DateTimePicker*)m_pImp)->Delete();

+}

+FX_BOOL CFWL_DateTimePicker::DeSelect() {

+  return ((IFWL_DateTimePicker*)m_pImp)->DeSelect();

+}

+FWL_ERR CFWL_DateTimePicker::GetBBox(CFX_RectF& rect) {

+  return ((IFWL_DateTimePicker*)m_pImp)->GetBBox(rect);

+}

+FWL_ERR CFWL_DateTimePicker::SetEditLimit(int32_t nLimit) {

+  return ((IFWL_DateTimePicker*)m_pImp)->SetEditLimit(nLimit);

+}

+FWL_ERR CFWL_DateTimePicker::ModifyEditStylesEx(FX_DWORD dwStylesExAdded,

+                                                FX_DWORD dwStylesExRemoved) {

+  return ((IFWL_DateTimePicker*)m_pImp)

+      ->ModifyEditStylesEx(dwStylesExAdded, dwStylesExRemoved);

 }

diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp
index 310e68ba2f..8447d1494e 100644
--- a/xfa/src/fwl/src/lightwidget/edit.cpp
+++ b/xfa/src/fwl/src/lightwidget/edit.cpp
@@ -5,222 +5,187 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-CFWL_Edit* CFWL_Edit::Create()

-{

-    return FX_NEW CFWL_Edit;

-}

-FWL_ERR CFWL_Edit::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

-    if (pProperties) {

-        *m_pProperties = *pProperties;

-    }

-    CFWL_WidgetImpProperties prop;

-    prop.m_dwStyles = m_pProperties->m_dwStyles;

-    prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    prop.m_dwStates = m_pProperties->m_dwStates;

-    prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    if (m_pProperties->m_pParent) {

-        prop.m_pParent = m_pProperties->m_pParent->GetWidget();

-    }

-    if (m_pProperties->m_pOwner) {

-        prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

-    }

-    prop.m_rtWidget = m_pProperties->m_rtWidget;

-    m_pImp = IFWL_Edit::Create();

-    FWL_ERR ret = ((IFWL_Edit*)m_pImp)->Initialize(prop);

-    if (ret == FWL_ERR_Succeeded) {

-        CFWL_Widget::Initialize();

-    }

-    return ret;

-}

-FWL_ERR CFWL_Edit::SetText(const CFX_WideString &wsText)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->SetText(wsText);

-}

-int32_t CFWL_Edit::GetTextLength() const

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return ((IFWL_Edit*)m_pImp)->GetTextLength();

-}

-FWL_ERR CFWL_Edit::GetText(CFX_WideString &wsText, int32_t nStart, int32_t nCount) const

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->GetText(wsText, nStart, nCount);

-}

-FWL_ERR CFWL_Edit::ClearText()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->ClearText();

-}

-int32_t CFWL_Edit::GetCaretPos() const

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

-    return ((IFWL_Edit*)m_pImp)->GetCaretPos();

-}

-int32_t CFWL_Edit::SetCaretPos(int32_t nIndex, FX_BOOL bBefore)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

-    return ((IFWL_Edit*)m_pImp)->SetCaretPos(nIndex, bBefore);

-}

-FWL_ERR CFWL_Edit::AddSelRange(int32_t nStart, int32_t nCount)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    ((IFWL_Edit*)m_pImp)->AddSelRange(nStart, nCount);

-    int32_t pos = 0;

-    int32_t sum = ((IFWL_Edit*)m_pImp)->GetTextLength();

-    if (nCount == -1) {

-        pos = sum;

-    } else {

-        pos = nStart + nCount;

-    }

-    return ((IFWL_Edit*)m_pImp)->SetCaretPos(pos);

-}

-int32_t CFWL_Edit::CountSelRanges()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return ((IFWL_Edit*)m_pImp)->CountSelRanges();

-}

-int32_t CFWL_Edit::GetSelRange(int32_t nIndex, int32_t &nStart)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return ((IFWL_Edit*)m_pImp)->GetSelRange(nIndex, nStart);

-}

-FWL_ERR CFWL_Edit::ClearSelections()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->ClearSelections();

-}

-int32_t CFWL_Edit::GetLimit()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

-    return ((IFWL_Edit*)m_pImp)->GetLimit();

-}

-FWL_ERR CFWL_Edit::SetLimit(int32_t nLimit)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->SetLimit(nLimit);

-}

-FWL_ERR CFWL_Edit::SetAliasChar(FX_WCHAR wAlias)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->SetAliasChar(wAlias);

-}

-FWL_ERR CFWL_Edit::SetFormatString(const CFX_WideString &wsFormat)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->SetFormatString(wsFormat);

-}

-FWL_ERR CFWL_Edit::Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->Insert(nStart, lpText, nLen);

-}

-FWL_ERR CFWL_Edit::DeleteSelections()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->DeleteSelections();

-}

-FWL_ERR CFWL_Edit::DeleteRange(int32_t nStart, int32_t nCount)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->DeleteRange(nStart, nCount);

-}

-FWL_ERR CFWL_Edit::ReplaceSelections(const CFX_WideStringC &wsReplace)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->ReplaceSelections(wsReplace);

-}

-FWL_ERR CFWL_Edit::Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC &wsReplace)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->Replace(nStart, nLen, wsReplace);

-}

-FWL_ERR CFWL_Edit::DoClipboard(int32_t iCmd)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->DoClipboard(iCmd);

-}

-FX_BOOL CFWL_Edit::Redo(const CFX_ByteStringC& bsRecord)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_Edit*)m_pImp)->Redo(bsRecord);

-}

-FX_BOOL CFWL_Edit::Undo(const CFX_ByteStringC& bsRecord)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_Edit*)m_pImp)->Undo(bsRecord);

-}

-FWL_ERR CFWL_Edit::SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->SetTabWidth(fTabWidth, bEquidistant);

-}

-FWL_ERR	CFWL_Edit::SetNumberRange(int32_t iMin, int32_t iMax)

-{

-    if (iMin > iMax) {

-        return FWL_ERR_Parameter_Invalid;

-    }

-    return ((IFWL_Edit*)m_pImp)->SetNumberRange(iMin, iMax);

-}

-FWL_ERR CFWL_Edit::SetBackColor(FX_DWORD dwColor)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->SetBackColor(dwColor);

-}

-FWL_ERR CFWL_Edit::SetFont(const CFX_WideString &wsFont, FX_FLOAT fSize)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_Edit*)m_pImp)->SetFont(wsFont, fSize);

-}

-FX_BOOL	CFWL_Edit::CanUndo()

-{

-    return ((IFWL_Edit*)m_pImp)->CanUndo();

-}

-FX_BOOL	CFWL_Edit::CanRedo()

-{

-    return ((IFWL_Edit*)m_pImp)->CanRedo();

-}

-FX_BOOL	CFWL_Edit::Undo()

-{

-    return ((IFWL_Edit*)m_pImp)->Undo();

-}

-FX_BOOL	CFWL_Edit::Redo()

-{

-    return ((IFWL_Edit*)m_pImp)->Undo();

-}

-FX_BOOL	CFWL_Edit::Copy(CFX_WideString &wsCopy)

-{

-    return ((IFWL_Edit*)m_pImp)->Copy(wsCopy);

-}

-FX_BOOL	CFWL_Edit::Cut(CFX_WideString &wsCut)

-{

-    return ((IFWL_Edit*)m_pImp)->Cut(wsCut);

-}

-FX_BOOL	CFWL_Edit::Paste(const CFX_WideString &wsPaste)

-{

-    return ((IFWL_Edit*)m_pImp)->Paste(wsPaste);

-}

-FX_BOOL	CFWL_Edit::Delete()

-{

-    return ((IFWL_Edit*)m_pImp)->Delete();

-}

-void CFWL_Edit::SetScrollOffset(FX_FLOAT fScrollOffset)

-{

-    return ((IFWL_Edit*)m_pImp)->SetScrollOffset(fScrollOffset);

-}

-FX_BOOL CFWL_Edit::GetSuggestWords(CFX_PointF pointf, CFX_ByteStringArray &sSuggest)

-{

-    return ((IFWL_Edit*)m_pImp)->GetSuggestWords(pointf, sSuggest);

-}

-FX_BOOL CFWL_Edit::ReplaceSpellCheckWord(CFX_PointF pointf, const CFX_ByteStringC& bsReplace)

-{

-    return ((IFWL_Edit*)m_pImp)->ReplaceSpellCheckWord(pointf, bsReplace);

-}

-CFWL_Edit::CFWL_Edit()

-{

-}

-CFWL_Edit::~CFWL_Edit()

-{

+CFWL_Edit* CFWL_Edit::Create() {

+  return FX_NEW CFWL_Edit;

+}

+FWL_ERR CFWL_Edit::Initialize(const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

+  if (pProperties) {

+    *m_pProperties = *pProperties;

+  }

+  CFWL_WidgetImpProperties prop;

+  prop.m_dwStyles = m_pProperties->m_dwStyles;

+  prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  prop.m_dwStates = m_pProperties->m_dwStates;

+  prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  if (m_pProperties->m_pParent) {

+    prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (m_pProperties->m_pOwner) {

+    prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

+  }

+  prop.m_rtWidget = m_pProperties->m_rtWidget;

+  m_pImp = IFWL_Edit::Create();

+  FWL_ERR ret = ((IFWL_Edit*)m_pImp)->Initialize(prop);

+  if (ret == FWL_ERR_Succeeded) {

+    CFWL_Widget::Initialize();

+  }

+  return ret;

+}

+FWL_ERR CFWL_Edit::SetText(const CFX_WideString& wsText) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->SetText(wsText);

+}

+int32_t CFWL_Edit::GetTextLength() const {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return ((IFWL_Edit*)m_pImp)->GetTextLength();

+}

+FWL_ERR CFWL_Edit::GetText(CFX_WideString& wsText,

+                           int32_t nStart,

+                           int32_t nCount) const {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->GetText(wsText, nStart, nCount);

+}

+FWL_ERR CFWL_Edit::ClearText() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->ClearText();

+}

+int32_t CFWL_Edit::GetCaretPos() const {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

+  return ((IFWL_Edit*)m_pImp)->GetCaretPos();

+}

+int32_t CFWL_Edit::SetCaretPos(int32_t nIndex, FX_BOOL bBefore) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

+  return ((IFWL_Edit*)m_pImp)->SetCaretPos(nIndex, bBefore);

+}

+FWL_ERR CFWL_Edit::AddSelRange(int32_t nStart, int32_t nCount) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  ((IFWL_Edit*)m_pImp)->AddSelRange(nStart, nCount);

+  int32_t pos = 0;

+  int32_t sum = ((IFWL_Edit*)m_pImp)->GetTextLength();

+  if (nCount == -1) {

+    pos = sum;

+  } else {

+    pos = nStart + nCount;

+  }

+  return ((IFWL_Edit*)m_pImp)->SetCaretPos(pos);

+}

+int32_t CFWL_Edit::CountSelRanges() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return ((IFWL_Edit*)m_pImp)->CountSelRanges();

+}

+int32_t CFWL_Edit::GetSelRange(int32_t nIndex, int32_t& nStart) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return ((IFWL_Edit*)m_pImp)->GetSelRange(nIndex, nStart);

+}

+FWL_ERR CFWL_Edit::ClearSelections() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->ClearSelections();

+}

+int32_t CFWL_Edit::GetLimit() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

+  return ((IFWL_Edit*)m_pImp)->GetLimit();

+}

+FWL_ERR CFWL_Edit::SetLimit(int32_t nLimit) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->SetLimit(nLimit);

+}

+FWL_ERR CFWL_Edit::SetAliasChar(FX_WCHAR wAlias) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->SetAliasChar(wAlias);

+}

+FWL_ERR CFWL_Edit::SetFormatString(const CFX_WideString& wsFormat) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->SetFormatString(wsFormat);

+}

+FWL_ERR CFWL_Edit::Insert(int32_t nStart,

+                          const FX_WCHAR* lpText,

+                          int32_t nLen) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->Insert(nStart, lpText, nLen);

+}

+FWL_ERR CFWL_Edit::DeleteSelections() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->DeleteSelections();

+}

+FWL_ERR CFWL_Edit::DeleteRange(int32_t nStart, int32_t nCount) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->DeleteRange(nStart, nCount);

+}

+FWL_ERR CFWL_Edit::ReplaceSelections(const CFX_WideStringC& wsReplace) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->ReplaceSelections(wsReplace);

+}

+FWL_ERR CFWL_Edit::Replace(int32_t nStart,

+                           int32_t nLen,

+                           const CFX_WideStringC& wsReplace) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->Replace(nStart, nLen, wsReplace);

+}

+FWL_ERR CFWL_Edit::DoClipboard(int32_t iCmd) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->DoClipboard(iCmd);

+}

+FX_BOOL CFWL_Edit::Redo(const CFX_ByteStringC& bsRecord) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_Edit*)m_pImp)->Redo(bsRecord);

+}

+FX_BOOL CFWL_Edit::Undo(const CFX_ByteStringC& bsRecord) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_Edit*)m_pImp)->Undo(bsRecord);

+}

+FWL_ERR CFWL_Edit::SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->SetTabWidth(fTabWidth, bEquidistant);

+}

+FWL_ERR CFWL_Edit::SetNumberRange(int32_t iMin, int32_t iMax) {

+  if (iMin > iMax) {

+    return FWL_ERR_Parameter_Invalid;

+  }

+  return ((IFWL_Edit*)m_pImp)->SetNumberRange(iMin, iMax);

+}

+FWL_ERR CFWL_Edit::SetBackColor(FX_DWORD dwColor) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->SetBackColor(dwColor);

+}

+FWL_ERR CFWL_Edit::SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_Edit*)m_pImp)->SetFont(wsFont, fSize);

+}

+FX_BOOL CFWL_Edit::CanUndo() {

+  return ((IFWL_Edit*)m_pImp)->CanUndo();

+}

+FX_BOOL CFWL_Edit::CanRedo() {

+  return ((IFWL_Edit*)m_pImp)->CanRedo();

+}

+FX_BOOL CFWL_Edit::Undo() {

+  return ((IFWL_Edit*)m_pImp)->Undo();

+}

+FX_BOOL CFWL_Edit::Redo() {

+  return ((IFWL_Edit*)m_pImp)->Undo();

 }

+FX_BOOL CFWL_Edit::Copy(CFX_WideString& wsCopy) {

+  return ((IFWL_Edit*)m_pImp)->Copy(wsCopy);

+}

+FX_BOOL CFWL_Edit::Cut(CFX_WideString& wsCut) {

+  return ((IFWL_Edit*)m_pImp)->Cut(wsCut);

+}

+FX_BOOL CFWL_Edit::Paste(const CFX_WideString& wsPaste) {

+  return ((IFWL_Edit*)m_pImp)->Paste(wsPaste);

+}

+FX_BOOL CFWL_Edit::Delete() {

+  return ((IFWL_Edit*)m_pImp)->Delete();

+}

+void CFWL_Edit::SetScrollOffset(FX_FLOAT fScrollOffset) {

+  return ((IFWL_Edit*)m_pImp)->SetScrollOffset(fScrollOffset);

+}

+FX_BOOL CFWL_Edit::GetSuggestWords(CFX_PointF pointf,

+                                   CFX_ByteStringArray& sSuggest) {

+  return ((IFWL_Edit*)m_pImp)->GetSuggestWords(pointf, sSuggest);

+}

+FX_BOOL CFWL_Edit::ReplaceSpellCheckWord(CFX_PointF pointf,

+                                         const CFX_ByteStringC& bsReplace) {

+  return ((IFWL_Edit*)m_pImp)->ReplaceSpellCheckWord(pointf, bsReplace);

+}

+CFWL_Edit::CFWL_Edit() {}

+CFWL_Edit::~CFWL_Edit() {}

diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp
index c96e368ca4..2bfd10c173 100644
--- a/xfa/src/fwl/src/lightwidget/listbox.cpp
+++ b/xfa/src/fwl/src/lightwidget/listbox.cpp
@@ -5,323 +5,307 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-CFWL_ListBox* CFWL_ListBox::Create()

-{

-    return FX_NEW CFWL_ListBox;

-}

-FWL_ERR	CFWL_ListBox::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

-    if (pProperties) {

-        *m_pProperties = *pProperties;

+CFWL_ListBox* CFWL_ListBox::Create() {

+  return FX_NEW CFWL_ListBox;

+}

+FWL_ERR CFWL_ListBox::Initialize(const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

+  if (pProperties) {

+    *m_pProperties = *pProperties;

+  }

+  CFWL_WidgetImpProperties prop;

+  prop.m_dwStyles = m_pProperties->m_dwStyles;

+  prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  prop.m_dwStates = m_pProperties->m_dwStates;

+  prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  prop.m_pDataProvider = &m_ListBoxDP;

+  if (m_pProperties->m_pParent) {

+    prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (m_pProperties->m_pOwner) {

+    prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

+  }

+  prop.m_rtWidget = m_pProperties->m_rtWidget;

+  m_pImp = IFWL_ListBox::Create();

+  FWL_ERR ret = ((IFWL_ListBox*)m_pImp)->Initialize(prop);

+  if (ret == FWL_ERR_Succeeded) {

+    CFWL_Widget::Initialize();

+  }

+  return ret;

+}

+FWL_ERR CFWL_ListBox::AddDIBitmap(CFX_DIBitmap* pDIB, FWL_HLISTITEM hItem) {

+  ((CFWL_ListItem*)hItem)->m_pDIB = pDIB;

+  return FWL_ERR_Succeeded;

+}

+FWL_HLISTITEM CFWL_ListBox::AddString(const CFX_WideStringC& wsAdd,

+                                      FX_BOOL bSelect) {

+  CFWL_ListItem* pItem = FX_NEW CFWL_ListItem;

+  pItem->m_dwStates = 0;

+  pItem->m_wsText = wsAdd;

+  pItem->m_dwStates = bSelect ? FWL_ITEMSTATE_LTB_Selected : 0;

+  m_ListBoxDP.m_arrItem.Add(pItem);

+  return (FWL_HLISTITEM)pItem;

+}

+FX_BOOL CFWL_ListBox::DeleteString(FWL_HLISTITEM hItem) {

+  int32_t nIndex = m_ListBoxDP.GetItemIndex(GetWidget(), hItem);

+  if (nIndex < 0 || nIndex >= m_ListBoxDP.m_arrItem.GetSize()) {

+    return FALSE;

+  }

+  CFWL_ListItem* pDelItem =

+      (CFWL_ListItem*)m_ListBoxDP.GetItem((IFWL_ListBox*)this, nIndex);

+  int32_t iCount = m_ListBoxDP.CountItems((IFWL_ListBox*)this);

+  int32_t iSel = nIndex + 1;

+  if (iSel >= iCount) {

+    iSel = nIndex - 1;

+    if (iSel < 0) {

+      iSel = -1;

     }

-    CFWL_WidgetImpProperties prop;

-    prop.m_dwStyles = m_pProperties->m_dwStyles;

-    prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    prop.m_dwStates = m_pProperties->m_dwStates;

-    prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    prop.m_pDataProvider = &m_ListBoxDP;

-    if (m_pProperties->m_pParent) {

-        prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (iSel >= 0) {

+    CFWL_ListItem* pSel =

+        (CFWL_ListItem*)m_ListBoxDP.GetItem((IFWL_ListBox*)this, iSel);

+    pSel->m_dwStates |= FWL_ITEMSTATE_LTB_Selected;

+  }

+  m_ListBoxDP.m_arrItem.RemoveAt(nIndex);

+  delete pDelItem;

+  return TRUE;

+}

+FX_BOOL CFWL_ListBox::DeleteAll() {

+  int32_t iCount = m_ListBoxDP.CountItems((IFWL_ListBox*)this);

+  for (int32_t i = 0; i < iCount; i++) {

+    CFWL_ListItem* pItem =

+        (CFWL_ListItem*)m_ListBoxDP.GetItem((IFWL_ListBox*)this, i);

+    delete pItem;

+  }

+  m_ListBoxDP.m_arrItem.RemoveAll();

+  return TRUE;

+}

+int32_t CFWL_ListBox::CountSelItems() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return ((IFWL_ListBox*)m_pImp)->CountSelItems();

+}

+FWL_HLISTITEM CFWL_ListBox::GetSelItem(int32_t nIndexSel) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

+  return ((IFWL_ListBox*)m_pImp)->GetSelItem(nIndexSel);

+}

+int32_t CFWL_ListBox::GetSelIndex(int32_t nIndex) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return ((IFWL_ListBox*)m_pImp)->GetSelIndex(nIndex);

+}

+FWL_ERR CFWL_ListBox::SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ListBox*)m_pImp)->SetSelItem(hItem, bSelect);

+}

+FWL_ERR CFWL_ListBox::GetItemText(FWL_HLISTITEM hItem, CFX_WideString& wsText) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ListBox*)m_pImp)->GetItemText(hItem, wsText);

+}

+FWL_ERR CFWL_ListBox::GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ListBox*)m_pImp)->GetScrollPos(fPos, bVert);

+}

+FWL_ERR CFWL_ListBox::SetItemHeight(FX_FLOAT fItemHeight) {

+  m_ListBoxDP.m_fItemHeight = fItemHeight;

+  return FWL_ERR_Succeeded;

+}

+FWL_HLISTITEM CFWL_ListBox::GetFocusItem() {

+  for (int32_t i = 0; i < m_ListBoxDP.m_arrItem.GetSize(); i++) {

+    CFWL_ListItem* hItem = (CFWL_ListItem*)(m_ListBoxDP.m_arrItem[i]);

+    if (hItem->m_dwStates & FWL_ITEMSTATE_LTB_Focused) {

+      return (FWL_HLISTITEM)hItem;

     }

-    if (m_pProperties->m_pOwner) {

-        prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

-    }

-    prop.m_rtWidget = m_pProperties->m_rtWidget;

-    m_pImp = IFWL_ListBox::Create();

-    FWL_ERR ret = ((IFWL_ListBox*)m_pImp)->Initialize(prop);

-    if (ret == FWL_ERR_Succeeded) {

-        CFWL_Widget::Initialize();

-    }

-    return ret;

-}

-FWL_ERR CFWL_ListBox::AddDIBitmap(CFX_DIBitmap *pDIB, FWL_HLISTITEM hItem)

-{

-    ((CFWL_ListItem*)hItem)->m_pDIB = pDIB;

-    return FWL_ERR_Succeeded;

-}

-FWL_HLISTITEM CFWL_ListBox::AddString(const CFX_WideStringC& wsAdd, FX_BOOL bSelect)

-{

-    CFWL_ListItem * pItem = FX_NEW CFWL_ListItem;

-    pItem->m_dwStates = 0;

-    pItem->m_wsText = wsAdd;

-    pItem->m_dwStates = bSelect ? FWL_ITEMSTATE_LTB_Selected : 0;

-    m_ListBoxDP.m_arrItem.Add(pItem);

-    return (FWL_HLISTITEM)pItem;

-}

-FX_BOOL CFWL_ListBox::DeleteString(FWL_HLISTITEM hItem)

-{

-    int32_t nIndex = m_ListBoxDP.GetItemIndex(GetWidget(), hItem);

-    if (nIndex < 0 || nIndex >= m_ListBoxDP.m_arrItem.GetSize()) {

-        return FALSE;

-    }

-    CFWL_ListItem *pDelItem = (CFWL_ListItem*)m_ListBoxDP.GetItem((IFWL_ListBox*)this, nIndex);

-    int32_t iCount = m_ListBoxDP.CountItems((IFWL_ListBox*)this);

-    int32_t iSel = nIndex + 1;

-    if (iSel >= iCount) {

-        iSel = nIndex - 1;

-        if (iSel < 0) {

-            iSel =  -1;

-        }

-    }

-    if (iSel >= 0) {

-        CFWL_ListItem *pSel = (CFWL_ListItem*)m_ListBoxDP.GetItem((IFWL_ListBox*)this, iSel);

-        pSel->m_dwStates |= FWL_ITEMSTATE_LTB_Selected;

+  }

+  return NULL;

+}

+FWL_ERR CFWL_ListBox::SetFocusItem(FWL_HLISTITEM hItem) {

+  int32_t nIndex = m_ListBoxDP.GetItemIndex(GetWidget(), hItem);

+  ((CFWL_ListItem*)(m_ListBoxDP.m_arrItem[nIndex]))->m_dwStates |=

+      FWL_ITEMSTATE_LTB_Focused;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR* CFWL_ListBox::Sort(IFWL_ListBoxCompare* pCom) {

+  return ((IFWL_ListBox*)m_pImp)->Sort(pCom);

+}

+int32_t CFWL_ListBox::CountItems() {

+  return m_ListBoxDP.m_arrItem.GetSize();

+}

+FWL_HLISTITEM CFWL_ListBox::GetItem(int32_t nIndex) {

+  int32_t nCount = m_ListBoxDP.m_arrItem.GetSize();

+  if (nIndex > nCount - 1 && nIndex < 0) {

+    return NULL;

+  }

+  return (FWL_HLISTITEM)m_ListBoxDP.m_arrItem[nIndex];

+}

+FWL_ERR CFWL_ListBox::SetItemString(FWL_HLISTITEM hItem,

+                                    const CFX_WideStringC& wsText) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  CFWL_ListItem* pItem = (CFWL_ListItem*)hItem;

+  pItem->m_wsText = wsText;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ListBox::GetItemString(FWL_HLISTITEM hItem,

+                                    CFX_WideString& wsText) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  CFWL_ListItem* pItem = (CFWL_ListItem*)hItem;

+  wsText = pItem->m_wsText;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ListBox::SetItemData(FWL_HLISTITEM hItem, void* pData) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  CFWL_ListItem* pItem = (CFWL_ListItem*)hItem;

+  pItem->m_pData = pData;

+  return FWL_ERR_Succeeded;

+}

+void* CFWL_ListBox::GetItemData(FWL_HLISTITEM hItem) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);

+  CFWL_ListItem* pItem = (CFWL_ListItem*)hItem;

+  return pItem->m_pData;

+}

+FWL_HLISTITEM CFWL_ListBox::GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy) {

+  CFX_RectF rtClient;

+  m_pImp->GetClientRect(rtClient);

+  fx -= rtClient.left;

+  fy -= rtClient.top;

+  FX_FLOAT fPosX = 0;

+  FX_FLOAT fPosY = 0;

+  ((IFWL_ListBox*)m_pImp)->GetScrollPos(fx);

+  ((IFWL_ListBox*)m_pImp)->GetScrollPos(fy, FALSE);

+  int32_t nCount = m_ListBoxDP.CountItems(NULL);

+  for (int32_t i = 0; i < nCount; i++) {

+    FWL_HLISTITEM hItem = m_ListBoxDP.GetItem(NULL, i);

+    if (!hItem) {

+      continue;

     }

-    m_ListBoxDP.m_arrItem.RemoveAt(nIndex);

-    delete pDelItem;

-    return TRUE;

-}

-FX_BOOL	CFWL_ListBox::DeleteAll()

-{

-    int32_t iCount = m_ListBoxDP.CountItems((IFWL_ListBox*)this);

-    for (int32_t i = 0; i < iCount; i ++) {

-        CFWL_ListItem *pItem = (CFWL_ListItem*)m_ListBoxDP.GetItem((IFWL_ListBox*)this, i);

-        delete pItem;

+    CFX_RectF rtItem;

+    m_ListBoxDP.GetItemRect(NULL, hItem, rtItem);

+    rtItem.Offset(-fPosX, -fPosY);

+    if (rtItem.Contains(fx, fy)) {

+      return hItem;

     }

-    m_ListBoxDP.m_arrItem.RemoveAll();

-    return TRUE;

-}

-int32_t CFWL_ListBox::CountSelItems()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return ((IFWL_ListBox*)m_pImp)->CountSelItems();

-}

-FWL_HLISTITEM CFWL_ListBox::GetSelItem(int32_t nIndexSel)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

-    return ((IFWL_ListBox*)m_pImp)->GetSelItem(nIndexSel);

-}

-int32_t CFWL_ListBox::GetSelIndex(int32_t nIndex)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return ((IFWL_ListBox*)m_pImp)->GetSelIndex(nIndex);

-}

-FWL_ERR CFWL_ListBox::SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ListBox*)m_pImp)->SetSelItem(hItem, bSelect);

-}

-FWL_ERR CFWL_ListBox::GetItemText(FWL_HLISTITEM hItem, CFX_WideString &wsText)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ListBox*)m_pImp)->GetItemText(hItem, wsText);

-}

-FWL_ERR CFWL_ListBox::GetScrollPos(FX_FLOAT &fPos, FX_BOOL bVert)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ListBox*)m_pImp)->GetScrollPos(fPos, bVert);

-}

-FWL_ERR CFWL_ListBox::SetItemHeight(FX_FLOAT fItemHeight)

-{

-    m_ListBoxDP.m_fItemHeight = fItemHeight;

-    return FWL_ERR_Succeeded;

-}

-FWL_HLISTITEM CFWL_ListBox::GetFocusItem()

-{

-    for (int32_t i = 0; i < m_ListBoxDP.m_arrItem.GetSize(); i++) {

-        CFWL_ListItem * hItem = (CFWL_ListItem *)(m_ListBoxDP.m_arrItem[i]);

-        if (hItem->m_dwStates & FWL_ITEMSTATE_LTB_Focused) {

-            return (FWL_HLISTITEM)hItem;

-        }

+  }

+  return NULL;

+}

+FX_DWORD CFWL_ListBox::GetItemStates(FWL_HLISTITEM hItem) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, 0);

+  CFWL_ListItem* pItem = (CFWL_ListItem*)hItem;

+  return pItem->m_dwStates | pItem->m_dwCheckState;

+}

+CFWL_ListBox::CFWL_ListBox() {}

+CFWL_ListBox::~CFWL_ListBox() {}

+CFWL_ListBox::CFWL_ListBoxDP::CFWL_ListBoxDP() {}

+CFWL_ListBox::CFWL_ListBoxDP::~CFWL_ListBoxDP() {

+  int32_t nCount = m_arrItem.GetSize();

+  for (int32_t i = 0; i < nCount; i++) {

+    CFWL_ListItem* pItem = (CFWL_ListItem*)m_arrItem[i];

+    if (pItem != NULL) {

+      delete pItem;

     }

-    return NULL;

+  }

+  m_arrItem.RemoveAll();

 }

-FWL_ERR	CFWL_ListBox::SetFocusItem(FWL_HLISTITEM hItem)

-{

-    int32_t nIndex = m_ListBoxDP.GetItemIndex(GetWidget(), hItem);

-    ((CFWL_ListItem *)(m_ListBoxDP.m_arrItem[nIndex]))->m_dwStates |= FWL_ITEMSTATE_LTB_Focused;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR* CFWL_ListBox::Sort(IFWL_ListBoxCompare *pCom)

-{

-    return ((IFWL_ListBox*)m_pImp)->Sort(pCom);

-}

-int32_t CFWL_ListBox::CountItems()

-{

-    return m_ListBoxDP.m_arrItem.GetSize();

-}

-FWL_HLISTITEM CFWL_ListBox::GetItem(int32_t nIndex)

-{

-    int32_t nCount = m_ListBoxDP.m_arrItem.GetSize();

-    if (nIndex > nCount - 1 && nIndex < 0) {

-        return NULL;

-    }

-    return (FWL_HLISTITEM)m_ListBoxDP.m_arrItem[nIndex];

-}

-FWL_ERR	CFWL_ListBox::SetItemString(FWL_HLISTITEM hItem, const CFX_WideStringC& wsText)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

-    pItem->m_wsText = wsText;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_ListBox::GetItemString(FWL_HLISTITEM hItem, CFX_WideString &wsText)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

-    wsText = pItem->m_wsText;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR	CFWL_ListBox::SetItemData(FWL_HLISTITEM hItem, void* pData)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

-    pItem->m_pData = pData;

-    return FWL_ERR_Succeeded;

-}

-void* CFWL_ListBox::GetItemData(FWL_HLISTITEM hItem)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);

-    CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

-    return pItem->m_pData;

-}

-FWL_HLISTITEM CFWL_ListBox::GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy)

-{

-    CFX_RectF rtClient;

-    m_pImp->GetClientRect(rtClient);

-    fx -= rtClient.left;

-    fy -= rtClient.top;

-    FX_FLOAT fPosX = 0;

-    FX_FLOAT fPosY = 0;

-    ((IFWL_ListBox*)m_pImp)->GetScrollPos(fx);

-    ((IFWL_ListBox*)m_pImp)->GetScrollPos(fy, FALSE);

-    int32_t nCount = m_ListBoxDP.CountItems(NULL);

-    for (int32_t i = 0; i < nCount; i ++) {

-        FWL_HLISTITEM hItem = m_ListBoxDP.GetItem(NULL, i);

-        if (!hItem) {

-            continue;

-        }

-        CFX_RectF rtItem;

-        m_ListBoxDP.GetItemRect(NULL, hItem, rtItem);

-        rtItem.Offset(-fPosX, -fPosY);

-        if (rtItem.Contains(fx, fy)) {

-            return hItem;

-        }

-    }

-    return NULL;

+FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetCaption(IFWL_Widget* pWidget,

+                                                 CFX_WideString& wsCaption) {

+  wsCaption = m_wsData;

+  return FWL_ERR_Succeeded;

 }

-FX_DWORD CFWL_ListBox::GetItemStates(FWL_HLISTITEM hItem)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, 0);

-    CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

-    return pItem->m_dwStates | pItem->m_dwCheckState;

-}

-CFWL_ListBox::CFWL_ListBox()

-{

-}

-CFWL_ListBox::~CFWL_ListBox()

-{

-}

-CFWL_ListBox::CFWL_ListBoxDP::CFWL_ListBoxDP()

-{

-}

-CFWL_ListBox::CFWL_ListBoxDP::~CFWL_ListBoxDP()

-{

-    int32_t nCount = m_arrItem.GetSize();

-    for (int32_t i = 0; i < nCount; i ++) {

-        CFWL_ListItem *pItem = (CFWL_ListItem*)m_arrItem[i];

-        if (pItem != NULL) {

-            delete pItem;

-        }

-    }

-    m_arrItem.RemoveAll();

-}

-FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption)

-{

-    wsCaption = m_wsData;

-    return FWL_ERR_Succeeded;

-}

-int32_t CFWL_ListBox::CFWL_ListBoxDP::CountItems(IFWL_Widget *pWidget)

-{

-    return m_arrItem.GetSize();

-}

-FWL_HLISTITEM CFWL_ListBox::CFWL_ListBoxDP::GetItem(IFWL_Widget *pWidget, int32_t nIndex)

-{

-    if (nIndex >= m_arrItem.GetSize() || nIndex < 0) {

-        return NULL;

-    } else {

-        return (FWL_HLISTITEM)m_arrItem[nIndex];

-    }

+int32_t CFWL_ListBox::CFWL_ListBoxDP::CountItems(IFWL_Widget* pWidget) {

+  return m_arrItem.GetSize();

 }

-int32_t CFWL_ListBox::CFWL_ListBoxDP::GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

-{

-    return m_arrItem.Find(hItem);

-}

-FX_BOOL CFWL_ListBox::CFWL_ListBoxDP::SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, int32_t nIndex)

-{

-    return m_arrItem.SetAt(nIndex, hItem);

-}

-FX_DWORD CFWL_ListBox::CFWL_ListBoxDP::GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, -1);

-    return ((CFWL_ListItem*)hItem)->m_dwStates;

-}

-FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    wsText = ((CFWL_ListItem*)hItem)->m_wsText;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF &rtItem)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

-    rtItem = pItem->m_rtItem;

-    return FWL_ERR_Succeeded;

-}

-void* CFWL_ListBox::CFWL_ListBoxDP::GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);

-    CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

-    return pItem->m_pData;

-}

-FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwStyle)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    ((CFWL_ListItem*)hItem)->m_dwStates = dwStyle;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    ((CFWL_ListItem*)hItem)->m_wsText = pszText;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF &rtItem)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

-    ((CFWL_ListItem*)hItem)->m_rtItem = rtItem;

-    return FWL_ERR_Succeeded;

-}

-FX_FLOAT CFWL_ListBox::CFWL_ListBoxDP::GetItemHeight(IFWL_Widget *pWidget)

-{

-    return m_fItemHeight;

-}

-CFX_DIBitmap*	CFWL_ListBox::CFWL_ListBoxDP::GetItemIcon(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

-{

-    return ((CFWL_ListItem*)hItem)->m_pDIB;

-}

-FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetItemCheckRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF& rtCheck)

-{

-    CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

-    rtCheck = pItem->m_rtCheckBox;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemCheckRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtCheck)

-{

-    CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

-    pItem->m_rtCheckBox = rtCheck;

-    return FWL_ERR_Succeeded;

-}

-FX_DWORD CFWL_ListBox::CFWL_ListBoxDP::GetItemCheckState(IFWL_Widget *pWidget, FWL_HLISTITEM hItem)

-{

-    CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

-    return pItem->m_dwCheckState;

-}

-FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemCheckState(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwCheckState)

-{

-    CFWL_ListItem *pItem = (CFWL_ListItem*)hItem;

-    pItem->m_dwCheckState = dwCheckState;

-    return FWL_ERR_Succeeded;

+FWL_HLISTITEM CFWL_ListBox::CFWL_ListBoxDP::GetItem(IFWL_Widget* pWidget,

+                                                    int32_t nIndex) {

+  if (nIndex >= m_arrItem.GetSize() || nIndex < 0) {

+    return NULL;

+  } else {

+    return (FWL_HLISTITEM)m_arrItem[nIndex];

+  }

+}

+int32_t CFWL_ListBox::CFWL_ListBoxDP::GetItemIndex(IFWL_Widget* pWidget,

+                                                   FWL_HLISTITEM hItem) {

+  return m_arrItem.Find(hItem);

+}

+FX_BOOL CFWL_ListBox::CFWL_ListBoxDP::SetItemIndex(IFWL_Widget* pWidget,

+                                                   FWL_HLISTITEM hItem,

+                                                   int32_t nIndex) {

+  return m_arrItem.SetAt(nIndex, hItem);

+}

+FX_DWORD CFWL_ListBox::CFWL_ListBoxDP::GetItemStyles(IFWL_Widget* pWidget,

+                                                     FWL_HLISTITEM hItem) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, -1);

+  return ((CFWL_ListItem*)hItem)->m_dwStates;

+}

+FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetItemText(IFWL_Widget* pWidget,

+                                                  FWL_HLISTITEM hItem,

+                                                  CFX_WideString& wsText) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  wsText = ((CFWL_ListItem*)hItem)->m_wsText;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetItemRect(IFWL_Widget* pWidget,

+                                                  FWL_HLISTITEM hItem,

+                                                  CFX_RectF& rtItem) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  CFWL_ListItem* pItem = (CFWL_ListItem*)hItem;

+  rtItem = pItem->m_rtItem;

+  return FWL_ERR_Succeeded;

+}

+void* CFWL_ListBox::CFWL_ListBoxDP::GetItemData(IFWL_Widget* pWidget,

+                                                FWL_HLISTITEM hItem) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, NULL);

+  CFWL_ListItem* pItem = (CFWL_ListItem*)hItem;

+  return pItem->m_pData;

+}

+FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemStyles(IFWL_Widget* pWidget,

+                                                    FWL_HLISTITEM hItem,

+                                                    FX_DWORD dwStyle) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  ((CFWL_ListItem*)hItem)->m_dwStates = dwStyle;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemText(IFWL_Widget* pWidget,

+                                                  FWL_HLISTITEM hItem,

+                                                  const FX_WCHAR* pszText) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  ((CFWL_ListItem*)hItem)->m_wsText = pszText;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemRect(IFWL_Widget* pWidget,

+                                                  FWL_HLISTITEM hItem,

+                                                  const CFX_RectF& rtItem) {

+  _FWL_RETURN_VALUE_IF_FAIL(hItem, FWL_ERR_Indefinite);

+  ((CFWL_ListItem*)hItem)->m_rtItem = rtItem;

+  return FWL_ERR_Succeeded;

+}

+FX_FLOAT CFWL_ListBox::CFWL_ListBoxDP::GetItemHeight(IFWL_Widget* pWidget) {

+  return m_fItemHeight;

+}

+CFX_DIBitmap* CFWL_ListBox::CFWL_ListBoxDP::GetItemIcon(IFWL_Widget* pWidget,

+                                                        FWL_HLISTITEM hItem) {

+  return ((CFWL_ListItem*)hItem)->m_pDIB;

+}

+FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::GetItemCheckRect(IFWL_Widget* pWidget,

+                                                       FWL_HLISTITEM hItem,

+                                                       CFX_RectF& rtCheck) {

+  CFWL_ListItem* pItem = (CFWL_ListItem*)hItem;

+  rtCheck = pItem->m_rtCheckBox;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemCheckRect(

+    IFWL_Widget* pWidget,

+    FWL_HLISTITEM hItem,

+    const CFX_RectF& rtCheck) {

+  CFWL_ListItem* pItem = (CFWL_ListItem*)hItem;

+  pItem->m_rtCheckBox = rtCheck;

+  return FWL_ERR_Succeeded;

+}

+FX_DWORD CFWL_ListBox::CFWL_ListBoxDP::GetItemCheckState(IFWL_Widget* pWidget,

+                                                         FWL_HLISTITEM hItem) {

+  CFWL_ListItem* pItem = (CFWL_ListItem*)hItem;

+  return pItem->m_dwCheckState;

+}

+FWL_ERR CFWL_ListBox::CFWL_ListBoxDP::SetItemCheckState(IFWL_Widget* pWidget,

+                                                        FWL_HLISTITEM hItem,

+                                                        FX_DWORD dwCheckState) {

+  CFWL_ListItem* pItem = (CFWL_ListItem*)hItem;

+  pItem->m_dwCheckState = dwCheckState;

+  return FWL_ERR_Succeeded;

 }

diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/src/lightwidget/picturebox.cpp
index 619a473c21..dd7fe16eef 100644
--- a/xfa/src/fwl/src/lightwidget/picturebox.cpp
+++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp
@@ -5,140 +5,121 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-CFWL_PictureBox* CFWL_PictureBox::Create()

-{

-    return FX_NEW CFWL_PictureBox;

-}

-FWL_ERR CFWL_PictureBox::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

-    if (pProperties) {

-        *m_pProperties = *pProperties;

-    }

-    CFWL_WidgetImpProperties prop;

-    prop.m_dwStyles = m_pProperties->m_dwStyles;

-    prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    prop.m_dwStates = m_pProperties->m_dwStates;

-    prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    prop.m_pDataProvider = &m_PictureBoxDP;

-    if (m_pProperties->m_pParent) {

-        prop.m_pParent = m_pProperties->m_pParent->GetWidget();

-    }

-    if (m_pProperties->m_pOwner) {

-        prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

-    }

-    prop.m_rtWidget = m_pProperties->m_rtWidget;

-    m_pImp = IFWL_PictureBox::Create();

-    FWL_ERR ret = ((IFWL_PictureBox*)m_pImp)->Initialize(prop);

-    if (ret == FWL_ERR_Succeeded) {

-        CFWL_Widget::Initialize();

-    }

-    return ret;

-}

-CFX_DIBitmap* CFWL_PictureBox::GetPicture()

-{

-    return m_PictureBoxDP.m_pBitmap;

-}

-FWL_ERR CFWL_PictureBox::SetPicture(CFX_DIBitmap *pBitmap)

-{

-    m_PictureBoxDP.m_pBitmap = pBitmap;

-    return FWL_ERR_Succeeded;

-}

-FX_FLOAT CFWL_PictureBox::GetRotation()

-{

-    return m_PictureBoxDP.m_fRotation;

-}

-FWL_ERR CFWL_PictureBox::SetRotation(FX_FLOAT fRotation)

-{

-    m_PictureBoxDP.m_fRotation = fRotation;

-    return FWL_ERR_Succeeded;

-}

-int32_t CFWL_PictureBox::GetFlipMode()

-{

-    return m_PictureBoxDP.GetFlipMode((IFWL_Widget*)this);

-}

-FWL_ERR CFWL_PictureBox::SetFlipMode(int32_t iFlipMode)

-{

-    m_PictureBoxDP.m_iFlipMode = iFlipMode;

-    return FWL_ERR_Succeeded;

-}

-int32_t CFWL_PictureBox::GetOpacity()

-{

-    return m_PictureBoxDP.GetOpacity((IFWL_Widget*)this);

-}

-FWL_ERR CFWL_PictureBox::SetOpacity(int32_t iOpacity)

-{

-    m_PictureBoxDP.m_iOpacity = iOpacity;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_PictureBox::GetScale(FX_FLOAT &fScaleX, FX_FLOAT &fScaleY)

-{

-    CFX_Matrix matrix;

-    m_PictureBoxDP.GetMatrix((IFWL_Widget*)this, matrix);

-    matrix.Scale(fScaleX, fScaleY);

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_PictureBox::SetScale(FX_FLOAT fScaleX, FX_FLOAT fScaleY)

-{

-    m_PictureBoxDP.m_fScaleX = fScaleX;

-    m_PictureBoxDP.m_fScaleY = fScaleY;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_PictureBox::GetOffset(FX_FLOAT &fx, FX_FLOAT &fy)

-{

-    CFX_Matrix matrix;

-    m_PictureBoxDP.GetMatrix((IFWL_Widget*)this, matrix);

-    fx = matrix.e;

-    fy = matrix.f;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_PictureBox::SetOffset(FX_FLOAT fx, FX_FLOAT fy)

-{

-    m_PictureBoxDP.m_fOffSetX = fx;

-    m_PictureBoxDP.m_fOffSetY = fy;

-    return FWL_ERR_Succeeded;

-}

-CFWL_PictureBox::CFWL_PictureBox()

-{

-}

-CFWL_PictureBox::~CFWL_PictureBox()

-{

-}

-FWL_ERR CFWL_PictureBox::CFWL_PictureBoxDP::GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption)

-{

-    return FWL_ERR_Succeeded;

-}

-CFX_DIBitmap* CFWL_PictureBox::CFWL_PictureBoxDP::GetPicture(IFWL_Widget *pWidget)

-{

-    return m_pBitmap;

-}

-CFX_DIBitmap* CFWL_PictureBox::CFWL_PictureBoxDP::GetErrorPicture(IFWL_Widget *pWidget)

-{

-    return m_pBitmap;

-}

-CFX_DIBitmap* CFWL_PictureBox::CFWL_PictureBoxDP::GetInitialPicture(IFWL_Widget *pWidget)

-{

-    return m_pBitmap;

-}

-int32_t CFWL_PictureBox::CFWL_PictureBoxDP::GetOpacity(IFWL_Widget *pWidget)

-{

-    return m_iOpacity;

-}

-FWL_ERR CFWL_PictureBox::CFWL_PictureBoxDP::GetMatrix(IFWL_Widget *pWidget, CFX_Matrix &matrix)

-{

-    CFX_RectF rect;

-    pWidget->GetClientRect(rect);

-    FX_FLOAT fLen = rect.width / 2;

-    FX_FLOAT fWid = rect.height / 2;

-    matrix.Reset();

-    matrix.Translate(-fLen, -fWid);

-    matrix.Rotate(m_fRotation);

-    matrix.Translate(fLen, fWid);

-    matrix.Scale(m_fScaleX, m_fScaleY);

-    matrix.Translate(m_fOffSetX, m_fOffSetY);

-    return FWL_ERR_Succeeded;

-}

-int32_t CFWL_PictureBox::CFWL_PictureBoxDP::GetFlipMode(IFWL_Widget *pWidget)

-{

-    return m_iFlipMode;

+CFWL_PictureBox* CFWL_PictureBox::Create() {

+  return FX_NEW CFWL_PictureBox;

+}

+FWL_ERR CFWL_PictureBox::Initialize(const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

+  if (pProperties) {

+    *m_pProperties = *pProperties;

+  }

+  CFWL_WidgetImpProperties prop;

+  prop.m_dwStyles = m_pProperties->m_dwStyles;

+  prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  prop.m_dwStates = m_pProperties->m_dwStates;

+  prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  prop.m_pDataProvider = &m_PictureBoxDP;

+  if (m_pProperties->m_pParent) {

+    prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (m_pProperties->m_pOwner) {

+    prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

+  }

+  prop.m_rtWidget = m_pProperties->m_rtWidget;

+  m_pImp = IFWL_PictureBox::Create();

+  FWL_ERR ret = ((IFWL_PictureBox*)m_pImp)->Initialize(prop);

+  if (ret == FWL_ERR_Succeeded) {

+    CFWL_Widget::Initialize();

+  }

+  return ret;

+}

+CFX_DIBitmap* CFWL_PictureBox::GetPicture() {

+  return m_PictureBoxDP.m_pBitmap;

+}

+FWL_ERR CFWL_PictureBox::SetPicture(CFX_DIBitmap* pBitmap) {

+  m_PictureBoxDP.m_pBitmap = pBitmap;

+  return FWL_ERR_Succeeded;

+}

+FX_FLOAT CFWL_PictureBox::GetRotation() {

+  return m_PictureBoxDP.m_fRotation;

+}

+FWL_ERR CFWL_PictureBox::SetRotation(FX_FLOAT fRotation) {

+  m_PictureBoxDP.m_fRotation = fRotation;

+  return FWL_ERR_Succeeded;

+}

+int32_t CFWL_PictureBox::GetFlipMode() {

+  return m_PictureBoxDP.GetFlipMode((IFWL_Widget*)this);

+}

+FWL_ERR CFWL_PictureBox::SetFlipMode(int32_t iFlipMode) {

+  m_PictureBoxDP.m_iFlipMode = iFlipMode;

+  return FWL_ERR_Succeeded;

+}

+int32_t CFWL_PictureBox::GetOpacity() {

+  return m_PictureBoxDP.GetOpacity((IFWL_Widget*)this);

+}

+FWL_ERR CFWL_PictureBox::SetOpacity(int32_t iOpacity) {

+  m_PictureBoxDP.m_iOpacity = iOpacity;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_PictureBox::GetScale(FX_FLOAT& fScaleX, FX_FLOAT& fScaleY) {

+  CFX_Matrix matrix;

+  m_PictureBoxDP.GetMatrix((IFWL_Widget*)this, matrix);

+  matrix.Scale(fScaleX, fScaleY);

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_PictureBox::SetScale(FX_FLOAT fScaleX, FX_FLOAT fScaleY) {

+  m_PictureBoxDP.m_fScaleX = fScaleX;

+  m_PictureBoxDP.m_fScaleY = fScaleY;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_PictureBox::GetOffset(FX_FLOAT& fx, FX_FLOAT& fy) {

+  CFX_Matrix matrix;

+  m_PictureBoxDP.GetMatrix((IFWL_Widget*)this, matrix);

+  fx = matrix.e;

+  fy = matrix.f;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_PictureBox::SetOffset(FX_FLOAT fx, FX_FLOAT fy) {

+  m_PictureBoxDP.m_fOffSetX = fx;

+  m_PictureBoxDP.m_fOffSetY = fy;

+  return FWL_ERR_Succeeded;

+}

+CFWL_PictureBox::CFWL_PictureBox() {}

+CFWL_PictureBox::~CFWL_PictureBox() {}

+FWL_ERR CFWL_PictureBox::CFWL_PictureBoxDP::GetCaption(

+    IFWL_Widget* pWidget,

+    CFX_WideString& wsCaption) {

+  return FWL_ERR_Succeeded;

+}

+CFX_DIBitmap* CFWL_PictureBox::CFWL_PictureBoxDP::GetPicture(

+    IFWL_Widget* pWidget) {

+  return m_pBitmap;

+}

+CFX_DIBitmap* CFWL_PictureBox::CFWL_PictureBoxDP::GetErrorPicture(

+    IFWL_Widget* pWidget) {

+  return m_pBitmap;

+}

+CFX_DIBitmap* CFWL_PictureBox::CFWL_PictureBoxDP::GetInitialPicture(

+    IFWL_Widget* pWidget) {

+  return m_pBitmap;

+}

+int32_t CFWL_PictureBox::CFWL_PictureBoxDP::GetOpacity(IFWL_Widget* pWidget) {

+  return m_iOpacity;

+}

+FWL_ERR CFWL_PictureBox::CFWL_PictureBoxDP::GetMatrix(IFWL_Widget* pWidget,

+                                                      CFX_Matrix& matrix) {

+  CFX_RectF rect;

+  pWidget->GetClientRect(rect);

+  FX_FLOAT fLen = rect.width / 2;

+  FX_FLOAT fWid = rect.height / 2;

+  matrix.Reset();

+  matrix.Translate(-fLen, -fWid);

+  matrix.Rotate(m_fRotation);

+  matrix.Translate(fLen, fWid);

+  matrix.Scale(m_fScaleX, m_fScaleY);

+  matrix.Translate(m_fOffSetX, m_fOffSetY);

+  return FWL_ERR_Succeeded;

+}

+int32_t CFWL_PictureBox::CFWL_PictureBoxDP::GetFlipMode(IFWL_Widget* pWidget) {

+  return m_iFlipMode;

 }

diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/src/lightwidget/pushbutton.cpp
index f09c3cd2fe..e0df77f502 100644
--- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp
+++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp
@@ -5,67 +5,58 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-CFWL_PushButton* CFWL_PushButton::Create()

-{

-    return FX_NEW CFWL_PushButton;

-}

-FWL_ERR CFWL_PushButton::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

-    if (pProperties) {

-        *m_pProperties = *pProperties;

-    }

-    CFWL_WidgetImpProperties prop;

-    prop.m_dwStyles = m_pProperties->m_dwStyles;

-    prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    prop.m_dwStates = m_pProperties->m_dwStates;

-    prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    prop.m_pDataProvider = &m_buttonData;

-    if (m_pProperties->m_pParent) {

-        prop.m_pParent = m_pProperties->m_pParent->GetWidget();

-    }

-    if (m_pProperties->m_pOwner) {

-        prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

-    }

-    prop.m_rtWidget = m_pProperties->m_rtWidget;

-    m_pImp = IFWL_PushButton::Create();

-    FWL_ERR ret = ((IFWL_PushButton*)m_pImp)->Initialize(prop);

-    if (ret == FWL_ERR_Succeeded) {

-        CFWL_Widget::Initialize();

-    }

-    return ret;

-}

-FWL_ERR CFWL_PushButton::GetCaption(CFX_WideString &wsCaption)

-{

-    wsCaption = m_buttonData.m_wsCaption;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_PushButton::SetCaption(const CFX_WideStringC& wsCaption)

-{

-    m_buttonData.m_wsCaption = wsCaption;

-    return FWL_ERR_Succeeded;

-}

-CFX_DIBitmap* CFWL_PushButton::GetPicture()

-{

-    return m_buttonData.m_pBitmap;

-}

-FWL_ERR CFWL_PushButton::SetPicture(CFX_DIBitmap *pBitmap)

-{

-    m_buttonData.m_pBitmap = pBitmap;

-    return FWL_ERR_Succeeded;

-}

-CFWL_PushButton::CFWL_PushButton()

-{

-}

-CFWL_PushButton::~CFWL_PushButton()

-{

-}

-FWL_ERR CFWL_PushButton::CFWL_PushButtonDP::GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption)

-{

-    wsCaption = m_wsCaption;

-    return FWL_ERR_Succeeded;

-}

-CFX_DIBitmap* CFWL_PushButton::CFWL_PushButtonDP::GetPicture(IFWL_Widget *pWidget)

-{

-    return m_pBitmap;

+CFWL_PushButton* CFWL_PushButton::Create() {

+  return FX_NEW CFWL_PushButton;

+}

+FWL_ERR CFWL_PushButton::Initialize(const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

+  if (pProperties) {

+    *m_pProperties = *pProperties;

+  }

+  CFWL_WidgetImpProperties prop;

+  prop.m_dwStyles = m_pProperties->m_dwStyles;

+  prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  prop.m_dwStates = m_pProperties->m_dwStates;

+  prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  prop.m_pDataProvider = &m_buttonData;

+  if (m_pProperties->m_pParent) {

+    prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (m_pProperties->m_pOwner) {

+    prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

+  }

+  prop.m_rtWidget = m_pProperties->m_rtWidget;

+  m_pImp = IFWL_PushButton::Create();

+  FWL_ERR ret = ((IFWL_PushButton*)m_pImp)->Initialize(prop);

+  if (ret == FWL_ERR_Succeeded) {

+    CFWL_Widget::Initialize();

+  }

+  return ret;

+}

+FWL_ERR CFWL_PushButton::GetCaption(CFX_WideString& wsCaption) {

+  wsCaption = m_buttonData.m_wsCaption;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_PushButton::SetCaption(const CFX_WideStringC& wsCaption) {

+  m_buttonData.m_wsCaption = wsCaption;

+  return FWL_ERR_Succeeded;

+}

+CFX_DIBitmap* CFWL_PushButton::GetPicture() {

+  return m_buttonData.m_pBitmap;

+}

+FWL_ERR CFWL_PushButton::SetPicture(CFX_DIBitmap* pBitmap) {

+  m_buttonData.m_pBitmap = pBitmap;

+  return FWL_ERR_Succeeded;

+}

+CFWL_PushButton::CFWL_PushButton() {}

+CFWL_PushButton::~CFWL_PushButton() {}

+FWL_ERR CFWL_PushButton::CFWL_PushButtonDP::GetCaption(

+    IFWL_Widget* pWidget,

+    CFX_WideString& wsCaption) {

+  wsCaption = m_wsCaption;

+  return FWL_ERR_Succeeded;

+}

+CFX_DIBitmap* CFWL_PushButton::CFWL_PushButtonDP::GetPicture(

+    IFWL_Widget* pWidget) {

+  return m_pBitmap;

 }

diff --git a/xfa/src/fwl/src/lightwidget/scrollbar.cpp b/xfa/src/fwl/src/lightwidget/scrollbar.cpp
index 492b0f91f5..6b4e326d2a 100644
--- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp
+++ b/xfa/src/fwl/src/lightwidget/scrollbar.cpp
@@ -5,98 +5,80 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-CFWL_ScrollBar* CFWL_ScrollBar::Create()

-{

-    return FX_NEW CFWL_ScrollBar;

-}

-FWL_ERR CFWL_ScrollBar::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

-    if (pProperties) {

-        *m_pProperties = *pProperties;

-    }

-    CFWL_WidgetImpProperties prop;

-    prop.m_dwStyles = m_pProperties->m_dwStyles;

-    prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    prop.m_dwStates = m_pProperties->m_dwStates;

-    prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    if (m_pProperties->m_pParent) {

-        prop.m_pParent = m_pProperties->m_pParent->GetWidget();

-    }

-    if (m_pProperties->m_pOwner) {

-        prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

-    }

-    prop.m_rtWidget = m_pProperties->m_rtWidget;

-    m_pImp = IFWL_ScrollBar::Create();

-    FWL_ERR ret = ((IFWL_ScrollBar*)m_pImp)->Initialize(prop);

-    if (ret == FWL_ERR_Succeeded) {

-        CFWL_Widget::Initialize();

-    }

-    return ret;

-}

-FX_BOOL CFWL_ScrollBar::IsVertical()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ScrollBar*)m_pImp)->IsVertical();

-}

-FWL_ERR CFWL_ScrollBar::GetRange(FX_FLOAT &fMin, FX_FLOAT &fMax)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ScrollBar*)m_pImp)->GetRange(fMin, fMax);

-}

-FWL_ERR CFWL_ScrollBar::SetRange(FX_FLOAT fMin, FX_FLOAT fMax)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ScrollBar*)m_pImp)->SetRange(fMin, fMax);

-}

-FX_FLOAT CFWL_ScrollBar::GetPageSize()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return ((IFWL_ScrollBar*)m_pImp)->GetPageSize();

-}

-FWL_ERR CFWL_ScrollBar::SetPageSize(FX_FLOAT fPageSize)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ScrollBar*)m_pImp)->SetPageSize(fPageSize);

-}

-FX_FLOAT CFWL_ScrollBar::GetStepSize()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return ((IFWL_ScrollBar*)m_pImp)->GetStepSize();

-}

-FWL_ERR CFWL_ScrollBar::SetStepSize(FX_FLOAT fStepSize)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ScrollBar*)m_pImp)->SetStepSize(fStepSize);

-}

-FX_FLOAT CFWL_ScrollBar::GetPos()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

-    return ((IFWL_ScrollBar*)m_pImp)->GetPos();

-}

-FWL_ERR CFWL_ScrollBar::SetPos(FX_FLOAT fPos)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ScrollBar*)m_pImp)->SetPos(fPos);

-}

-FX_FLOAT CFWL_ScrollBar::GetTrackPos()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

-    return ((IFWL_ScrollBar*)m_pImp)->GetTrackPos();

-}

-FWL_ERR CFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return ((IFWL_ScrollBar*)m_pImp)->SetTrackPos(fTrackPos);

-}

-FX_BOOL CFWL_ScrollBar::DoScroll(FX_DWORD dwCode, FX_FLOAT fPos)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return ((IFWL_ScrollBar*)m_pImp)->DoScroll(dwCode, fPos);

-}

-CFWL_ScrollBar::CFWL_ScrollBar()

-{

-}

-CFWL_ScrollBar::~CFWL_ScrollBar()

-{

-}

+CFWL_ScrollBar* CFWL_ScrollBar::Create() {

+  return FX_NEW CFWL_ScrollBar;

+}

+FWL_ERR CFWL_ScrollBar::Initialize(const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

+  if (pProperties) {

+    *m_pProperties = *pProperties;

+  }

+  CFWL_WidgetImpProperties prop;

+  prop.m_dwStyles = m_pProperties->m_dwStyles;

+  prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  prop.m_dwStates = m_pProperties->m_dwStates;

+  prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  if (m_pProperties->m_pParent) {

+    prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (m_pProperties->m_pOwner) {

+    prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

+  }

+  prop.m_rtWidget = m_pProperties->m_rtWidget;

+  m_pImp = IFWL_ScrollBar::Create();

+  FWL_ERR ret = ((IFWL_ScrollBar*)m_pImp)->Initialize(prop);

+  if (ret == FWL_ERR_Succeeded) {

+    CFWL_Widget::Initialize();

+  }

+  return ret;

+}

+FX_BOOL CFWL_ScrollBar::IsVertical() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ScrollBar*)m_pImp)->IsVertical();

+}

+FWL_ERR CFWL_ScrollBar::GetRange(FX_FLOAT& fMin, FX_FLOAT& fMax) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ScrollBar*)m_pImp)->GetRange(fMin, fMax);

+}

+FWL_ERR CFWL_ScrollBar::SetRange(FX_FLOAT fMin, FX_FLOAT fMax) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ScrollBar*)m_pImp)->SetRange(fMin, fMax);

+}

+FX_FLOAT CFWL_ScrollBar::GetPageSize() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return ((IFWL_ScrollBar*)m_pImp)->GetPageSize();

+}

+FWL_ERR CFWL_ScrollBar::SetPageSize(FX_FLOAT fPageSize) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ScrollBar*)m_pImp)->SetPageSize(fPageSize);

+}

+FX_FLOAT CFWL_ScrollBar::GetStepSize() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return ((IFWL_ScrollBar*)m_pImp)->GetStepSize();

+}

+FWL_ERR CFWL_ScrollBar::SetStepSize(FX_FLOAT fStepSize) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ScrollBar*)m_pImp)->SetStepSize(fStepSize);

+}

+FX_FLOAT CFWL_ScrollBar::GetPos() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

+  return ((IFWL_ScrollBar*)m_pImp)->GetPos();

+}

+FWL_ERR CFWL_ScrollBar::SetPos(FX_FLOAT fPos) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ScrollBar*)m_pImp)->SetPos(fPos);

+}

+FX_FLOAT CFWL_ScrollBar::GetTrackPos() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);

+  return ((IFWL_ScrollBar*)m_pImp)->GetTrackPos();

+}

+FWL_ERR CFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return ((IFWL_ScrollBar*)m_pImp)->SetTrackPos(fTrackPos);

+}

+FX_BOOL CFWL_ScrollBar::DoScroll(FX_DWORD dwCode, FX_FLOAT fPos) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return ((IFWL_ScrollBar*)m_pImp)->DoScroll(dwCode, fPos);

+}

+CFWL_ScrollBar::CFWL_ScrollBar() {}

+CFWL_ScrollBar::~CFWL_ScrollBar() {}

diff --git a/xfa/src/fwl/src/lightwidget/theme.cpp b/xfa/src/fwl/src/lightwidget/theme.cpp
index f9a2bab6a2..e8fb41de69 100644
--- a/xfa/src/fwl/src/lightwidget/theme.cpp
+++ b/xfa/src/fwl/src/lightwidget/theme.cpp
@@ -5,151 +5,141 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

 #include "../../../foxitlib.h"

-FX_BOOL CFWL_Theme::IsValidWidget(IFWL_Widget *pWidget)

-{

-    CFWL_WidgetTP *pTheme = GetTheme(pWidget);

-    return pTheme != NULL;

-}

-FX_DWORD CFWL_Theme::GetThemeID(IFWL_Widget *pWidget)

-{

-    CFWL_WidgetTP *pTheme = GetTheme(pWidget);

-    FXSYS_assert(pTheme);

-    return pTheme->GetThemeID(pWidget);

-}

-FX_DWORD CFWL_Theme::SetThemeID(IFWL_Widget *pWidget, FX_DWORD dwThemeID, FX_BOOL bChildren )

-{

-    int32_t iCount = m_arrThemes.GetSize();

-    FX_DWORD dwID;

-    for (int32_t i = 0; i < iCount; i ++) {

-        CFWL_WidgetTP *pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

-        dwID = pTheme->GetThemeID(pWidget);

-        pTheme->SetThemeID(pWidget, dwThemeID, FALSE);

+FX_BOOL CFWL_Theme::IsValidWidget(IFWL_Widget* pWidget) {

+  CFWL_WidgetTP* pTheme = GetTheme(pWidget);

+  return pTheme != NULL;

+}

+FX_DWORD CFWL_Theme::GetThemeID(IFWL_Widget* pWidget) {

+  CFWL_WidgetTP* pTheme = GetTheme(pWidget);

+  FXSYS_assert(pTheme);

+  return pTheme->GetThemeID(pWidget);

+}

+FX_DWORD CFWL_Theme::SetThemeID(IFWL_Widget* pWidget,

+                                FX_DWORD dwThemeID,

+                                FX_BOOL bChildren) {

+  int32_t iCount = m_arrThemes.GetSize();

+  FX_DWORD dwID;

+  for (int32_t i = 0; i < iCount; i++) {

+    CFWL_WidgetTP* pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

+    dwID = pTheme->GetThemeID(pWidget);

+    pTheme->SetThemeID(pWidget, dwThemeID, FALSE);

+  }

+  return dwID;

+}

+FWL_ERR CFWL_Theme::GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix) {

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_Theme::SetThemeMatrix(IFWL_Widget* pWidget,

+                                   const CFX_Matrix& matrix) {

+  return FWL_ERR_Succeeded;

+}

+FX_BOOL CFWL_Theme::DrawBackground(CFWL_ThemeBackground* pParams) {

+  CFWL_WidgetTP* pTheme = GetTheme(pParams->m_pWidget);

+  FXSYS_assert(pTheme);

+  return pTheme->DrawBackground(pParams);

+}

+FX_BOOL CFWL_Theme::DrawText(CFWL_ThemeText* pParams) {

+  CFWL_WidgetTP* pTheme = GetTheme(pParams->m_pWidget);

+  FXSYS_assert(pTheme);

+  return pTheme->DrawText(pParams);

+}

+void* CFWL_Theme::GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity) {

+  CFWL_WidgetTP* pTheme = GetTheme(pThemePart->m_pWidget);

+  FXSYS_assert(pTheme);

+  return pTheme->GetCapacity(pThemePart, dwCapacity);

+}

+FX_BOOL CFWL_Theme::IsCustomizedLayout(IFWL_Widget* pWidget) {

+  CFWL_WidgetTP* pTheme = GetTheme(pWidget);

+  FXSYS_assert(pTheme);

+  return pTheme->IsCustomizedLayout(pWidget);

+}

+FWL_ERR CFWL_Theme::GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart) {

+  CFWL_WidgetTP* pTheme = GetTheme(pThemePart->m_pWidget);

+  FXSYS_assert(pTheme);

+  return pTheme->GetPartRect(pThemePart, rtPart);

+}

+FX_BOOL CFWL_Theme::IsInPart(CFWL_ThemePart* pThemePart,

+                             FX_FLOAT fx,

+                             FX_FLOAT fy) {

+  CFWL_WidgetTP* pTheme = GetTheme(pThemePart->m_pWidget);

+  FXSYS_assert(pTheme);

+  return pTheme->IsInPart(pThemePart, fx, fy);

+}

+FX_BOOL CFWL_Theme::CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) {

+  CFWL_WidgetTP* pTheme = GetTheme(pParams->m_pWidget);

+  FXSYS_assert(pTheme);

+  return pTheme->CalcTextRect(pParams, rect);

+}

+FWL_ERR CFWL_Theme::Initialize() {

+  int32_t iCount = m_arrThemes.GetSize();

+  for (int32_t i = 0; i < iCount; i++) {

+    CFWL_WidgetTP* pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

+    pTheme->Initialize();

+  }

+  FWLTHEME_Init();

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_Theme::Finalize() {

+  int32_t iCount = m_arrThemes.GetSize();

+  for (int32_t i = 0; i < iCount; i++) {

+    CFWL_WidgetTP* pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

+    pTheme->Finalize();

+  }

+  FWLTHEME_Release();

+  return FWL_ERR_Succeeded;

+}

+CFWL_Theme::CFWL_Theme() {

+  CFWL_FormTP* pFormTP = FX_NEW CFWL_FormTP;

+  CFWL_PushButtonTP* pPushButtonTP = FX_NEW CFWL_PushButtonTP;

+  CFWL_CheckBoxTP* pCheckBoxTP = FX_NEW CFWL_CheckBoxTP;

+  CFWL_ListBoxTP* pListBoxTP = FX_NEW CFWL_ListBoxTP;

+  CFWL_PictureBoxTP* pPictureBoxTP = FX_NEW CFWL_PictureBoxTP;

+  CFWL_ScrollBarTP* pSrollBarTP = FX_NEW CFWL_ScrollBarTP;

+  CFWL_EditTP* pEditTP = FX_NEW CFWL_EditTP;

+  CFWL_ComboBoxTP* pComboBoxTP = FX_NEW CFWL_ComboBoxTP;

+  CFWL_BarcodeTP* pBarcodeTP = FX_NEW CFWL_BarcodeTP;

+  CFWL_DateTimePickerTP* pDateTimePickerTP = FX_NEW CFWL_DateTimePickerTP;

+  CFWL_MonthCalendarTP* pMonthCalendarTP = FX_NEW CFWL_MonthCalendarTP;

+  CFWL_CaretTP* pCaretTP = FX_NEW CFWL_CaretTP;

+  m_arrThemes.Add(pFormTP);

+  m_arrThemes.Add(pPushButtonTP);

+  m_arrThemes.Add(pCheckBoxTP);

+  m_arrThemes.Add(pListBoxTP);

+  m_arrThemes.Add(pPictureBoxTP);

+  m_arrThemes.Add(pSrollBarTP);

+  m_arrThemes.Add(pEditTP);

+  m_arrThemes.Add(pComboBoxTP);

+  m_arrThemes.Add(pBarcodeTP);

+  m_arrThemes.Add(pDateTimePickerTP);

+  m_arrThemes.Add(pMonthCalendarTP);

+  m_arrThemes.Add(pCaretTP);

+}

+CFWL_Theme::~CFWL_Theme() {

+  int32_t iCount = m_arrThemes.GetSize();

+  for (int32_t i = 0; i < iCount; i++) {

+    CFWL_WidgetTP* pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

+    delete pTheme;

+  }

+  m_arrThemes.RemoveAll();

+}

+FWL_ERR CFWL_Theme::SetFont(IFWL_Widget* pWidget,

+                            const FX_WCHAR* strFont,

+                            FX_FLOAT fFontSize,

+                            FX_ARGB rgbFont) {

+  int32_t iCount = m_arrThemes.GetSize();

+  for (int32_t i = 0; i < iCount; i++) {

+    CFWL_WidgetTP* pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

+    pTheme->SetFont(pWidget, strFont, fFontSize, rgbFont);

+  }

+  return FWL_ERR_Succeeded;

+}

+CFWL_WidgetTP* CFWL_Theme::GetTheme(IFWL_Widget* pWidget) {

+  int32_t iCount = m_arrThemes.GetSize();

+  for (int32_t i = 0; i < iCount; i++) {

+    CFWL_WidgetTP* pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

+    if (pTheme->IsValidWidget(pWidget)) {

+      return pTheme;

     }

-    return dwID;

-}

-FWL_ERR	CFWL_Theme::GetThemeMatrix(IFWL_Widget *pWidget, CFX_Matrix &matrix)

-{

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR	CFWL_Theme::SetThemeMatrix(IFWL_Widget *pWidget, const CFX_Matrix &matrix)

-{

-    return FWL_ERR_Succeeded;

-}

-FX_BOOL CFWL_Theme::DrawBackground(CFWL_ThemeBackground *pParams)

-{

-    CFWL_WidgetTP *pTheme = GetTheme(pParams->m_pWidget);

-    FXSYS_assert(pTheme);

-    return pTheme->DrawBackground(pParams);

-}

-FX_BOOL CFWL_Theme::DrawText(CFWL_ThemeText *pParams)

-{

-    CFWL_WidgetTP *pTheme = GetTheme(pParams->m_pWidget);

-    FXSYS_assert(pTheme);

-    return pTheme->DrawText(pParams);

-}

-void* CFWL_Theme::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)

-{

-    CFWL_WidgetTP *pTheme = GetTheme(pThemePart->m_pWidget);

-    FXSYS_assert(pTheme);

-    return pTheme->GetCapacity(pThemePart, dwCapacity);

-}

-FX_BOOL CFWL_Theme::IsCustomizedLayout(IFWL_Widget *pWidget)

-{

-    CFWL_WidgetTP *pTheme = GetTheme(pWidget);

-    FXSYS_assert(pTheme);

-    return pTheme->IsCustomizedLayout(pWidget);

-}

-FWL_ERR CFWL_Theme::GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF &rtPart)

-{

-    CFWL_WidgetTP *pTheme = GetTheme(pThemePart->m_pWidget);

-    FXSYS_assert(pTheme);

-    return pTheme->GetPartRect(pThemePart, rtPart);

-}

-FX_BOOL CFWL_Theme::IsInPart(CFWL_ThemePart* pThemePart, FX_FLOAT fx, FX_FLOAT fy)

-{

-    CFWL_WidgetTP *pTheme = GetTheme(pThemePart->m_pWidget);

-    FXSYS_assert(pTheme);

-    return pTheme->IsInPart(pThemePart, fx, fy);

-}

-FX_BOOL	CFWL_Theme::CalcTextRect(CFWL_ThemeText *pParams, CFX_RectF &rect)

-{

-    CFWL_WidgetTP *pTheme = GetTheme(pParams->m_pWidget);

-    FXSYS_assert(pTheme);

-    return pTheme->CalcTextRect(pParams, rect);

-}

-FWL_ERR	CFWL_Theme::Initialize()

-{

-    int32_t iCount = m_arrThemes.GetSize();

-    for (int32_t i = 0; i < iCount; i ++) {

-        CFWL_WidgetTP *pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

-        pTheme->Initialize();

-    }

-    FWLTHEME_Init();

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR	CFWL_Theme::Finalize()

-{

-    int32_t iCount = m_arrThemes.GetSize();

-    for (int32_t i = 0; i < iCount; i ++) {

-        CFWL_WidgetTP *pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

-        pTheme->Finalize();

-    }

-    FWLTHEME_Release();

-    return FWL_ERR_Succeeded;

-}

-CFWL_Theme::CFWL_Theme()

-{

-    CFWL_FormTP *pFormTP = FX_NEW CFWL_FormTP;

-    CFWL_PushButtonTP		*pPushButtonTP = FX_NEW CFWL_PushButtonTP;

-    CFWL_CheckBoxTP			*pCheckBoxTP = FX_NEW CFWL_CheckBoxTP;

-    CFWL_ListBoxTP			*pListBoxTP = FX_NEW CFWL_ListBoxTP;

-    CFWL_PictureBoxTP		*pPictureBoxTP = FX_NEW CFWL_PictureBoxTP;

-    CFWL_ScrollBarTP		*pSrollBarTP = FX_NEW CFWL_ScrollBarTP;

-    CFWL_EditTP				*pEditTP = FX_NEW CFWL_EditTP;

-    CFWL_ComboBoxTP			*pComboBoxTP = FX_NEW CFWL_ComboBoxTP;

-    CFWL_BarcodeTP			*pBarcodeTP = FX_NEW CFWL_BarcodeTP;

-    CFWL_DateTimePickerTP	*pDateTimePickerTP = FX_NEW CFWL_DateTimePickerTP;

-    CFWL_MonthCalendarTP	*pMonthCalendarTP = FX_NEW CFWL_MonthCalendarTP;

-    CFWL_CaretTP			*pCaretTP = FX_NEW CFWL_CaretTP;

-    m_arrThemes.Add(pFormTP);

-    m_arrThemes.Add(pPushButtonTP);

-    m_arrThemes.Add(pCheckBoxTP);

-    m_arrThemes.Add(pListBoxTP);

-    m_arrThemes.Add(pPictureBoxTP);

-    m_arrThemes.Add(pSrollBarTP);

-    m_arrThemes.Add(pEditTP);

-    m_arrThemes.Add(pComboBoxTP);

-    m_arrThemes.Add(pBarcodeTP);

-    m_arrThemes.Add(pDateTimePickerTP);

-    m_arrThemes.Add(pMonthCalendarTP);

-    m_arrThemes.Add(pCaretTP);

-}

-CFWL_Theme::~CFWL_Theme()

-{

-    int32_t iCount = m_arrThemes.GetSize();

-    for (int32_t i = 0; i < iCount; i ++) {

-        CFWL_WidgetTP *pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

-        delete pTheme;

-    }

-    m_arrThemes.RemoveAll();

-}

-FWL_ERR	CFWL_Theme::SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont)

-{

-    int32_t iCount = m_arrThemes.GetSize();

-    for (int32_t i = 0; i < iCount; i ++) {

-        CFWL_WidgetTP *pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

-        pTheme->SetFont(pWidget, strFont, fFontSize, rgbFont);

-    }

-    return FWL_ERR_Succeeded;

-}

-CFWL_WidgetTP* CFWL_Theme::GetTheme(IFWL_Widget* pWidget)

-{

-    int32_t iCount = m_arrThemes.GetSize();

-    for (int32_t i = 0; i < iCount; i ++) {

-        CFWL_WidgetTP *pTheme = (CFWL_WidgetTP*)m_arrThemes[i];

-        if (pTheme->IsValidWidget(pWidget)) {

-            return pTheme;

-        }

-    }

-    return NULL;

+  }

+  return NULL;

 }

diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp
index 7491e6be38..1864c288fc 100644
--- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp
+++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp
@@ -11,131 +11,107 @@
 #include "../core/include/fwl_panelimp.h"

 #include "../core/include/fwl_formimp.h"

 #include "../core/include/fwl_threadimp.h"

-CFWL_ToolTip* CFWL_ToolTip::Create()

-{

-    return FX_NEW CFWL_ToolTip;

-}

-FWL_ERR CFWL_ToolTip::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

-    if (pProperties) {

-        *m_pProperties = *pProperties;

-    }

-    CFWL_WidgetImpProperties prop;

-    prop.m_dwStyles = m_pProperties->m_dwStyles;

-    prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    prop.m_dwStates = m_pProperties->m_dwStates;

-    prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    prop.m_pDataProvider = &m_tooltipData;

-    if (m_pProperties->m_pParent) {

-        prop.m_pParent = m_pProperties->m_pParent->GetWidget();

-    }

-    if (m_pProperties->m_pOwner) {

-        prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

-    }

-    prop.m_rtWidget = m_pProperties->m_rtWidget;

-    m_pImp = IFWL_ToolTip::Create();

-    FWL_ERR ret = ((IFWL_ToolTip*)m_pImp)->Initialize(prop);

-    if (ret == FWL_ERR_Succeeded) {

-        CFWL_Widget::Initialize();

-    }

-    return ret;

-}

-FWL_ERR CFWL_ToolTip::GetCaption(CFX_WideString &wsCaption)

-{

-    wsCaption = m_tooltipData.m_wsCaption;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_ToolTip::SetCaption(const CFX_WideStringC& wsCaption)

-{

-    m_tooltipData.m_wsCaption = wsCaption;

-    return FWL_ERR_Succeeded;

-}

-int32_t CFWL_ToolTip::GetInitialDelay()

-{

-    return m_tooltipData.m_nInitDelayTime;

-}

-int32_t CFWL_ToolTip::SetInitialDelay(int32_t nDelayTime)

-{

-    m_tooltipData.m_nInitDelayTime = nDelayTime;

-    return FWL_ERR_Succeeded;

-}

-int32_t CFWL_ToolTip::GetAutoPopDelay()

-{

-    return m_tooltipData.m_nAutoPopDelayTime;

-}

-int32_t CFWL_ToolTip::SetAutoPopDelay(int32_t nDelayTime)

-{

-    m_tooltipData.m_nAutoPopDelayTime = nDelayTime;

-    return FWL_ERR_Succeeded;

-}

-CFX_DIBitmap* CFWL_ToolTip::GetToolTipIcon()

-{

-    return m_tooltipData.m_pBitmap;

-}

-FWL_ERR CFWL_ToolTip::SetToolTipIcon(CFX_DIBitmap *pBitmap)

-{

-    m_tooltipData.m_pBitmap = pBitmap;

-    return FWL_ERR_Succeeded;

-}

-CFX_SizeF CFWL_ToolTip::GetToolTipIconSize()

-{

-    return m_tooltipData.m_fIconSize;

-}

-FWL_ERR CFWL_ToolTip::SetToolTipIconSize(CFX_SizeF fSize)

-{

-    m_tooltipData.m_fIconSize = fSize;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_ToolTip::SetAnchor(const CFX_RectF &rtAnchor)

-{

-    return ((IFWL_ToolTip*)m_pImp)->SetAnchor(rtAnchor);

-}

-FWL_ERR CFWL_ToolTip::Show()

-{

-    return ((IFWL_ToolTip*)m_pImp)->Show();

-}

-FWL_ERR CFWL_ToolTip::Hide()

-{

-    return ((IFWL_ToolTip*)m_pImp)->Hide();

-}

-CFWL_ToolTip::CFWL_ToolTip()

-{

-}

-CFWL_ToolTip::~CFWL_ToolTip()

-{

-}

-CFWL_ToolTip::CFWL_ToolTipDP::CFWL_ToolTipDP()

-    : m_pBitmap(NULL)

-{

-    m_wsCaption = L"";

-    m_nInitDelayTime = 500;

-    m_nAutoPopDelayTime = 50000;

-    m_fIconSize.Set( 0.0, 0.0);

-    m_fAnchor.Set( 0.0, 0.0, 0.0, 0.0);

-}

-FWL_ERR CFWL_ToolTip::CFWL_ToolTipDP::GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption)

-{

-    wsCaption = m_wsCaption;

-    return FWL_ERR_Succeeded;

-}

-int32_t CFWL_ToolTip::CFWL_ToolTipDP::GetInitialDelay(IFWL_Widget *pWidget)

-{

-    return m_nInitDelayTime;

-}

-int32_t CFWL_ToolTip::CFWL_ToolTipDP::GetAutoPopDelay(IFWL_Widget *pWidget)

-{

-    return m_nAutoPopDelayTime;

-}

-CFX_DIBitmap* CFWL_ToolTip::CFWL_ToolTipDP::GetToolTipIcon(IFWL_Widget *pWidget)

-{

-    return m_pBitmap;

-}

-CFX_SizeF CFWL_ToolTip::CFWL_ToolTipDP::GetToolTipIconSize(IFWL_Widget *pWidget)

-{

-    return m_fIconSize;

-}

-CFX_RectF CFWL_ToolTip::CFWL_ToolTipDP::GetAnchor()

-{

-    return m_fAnchor;

+CFWL_ToolTip* CFWL_ToolTip::Create() {

+  return FX_NEW CFWL_ToolTip;

+}

+FWL_ERR CFWL_ToolTip::Initialize(const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);

+  if (pProperties) {

+    *m_pProperties = *pProperties;

+  }

+  CFWL_WidgetImpProperties prop;

+  prop.m_dwStyles = m_pProperties->m_dwStyles;

+  prop.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  prop.m_dwStates = m_pProperties->m_dwStates;

+  prop.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  prop.m_pDataProvider = &m_tooltipData;

+  if (m_pProperties->m_pParent) {

+    prop.m_pParent = m_pProperties->m_pParent->GetWidget();

+  }

+  if (m_pProperties->m_pOwner) {

+    prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();

+  }

+  prop.m_rtWidget = m_pProperties->m_rtWidget;

+  m_pImp = IFWL_ToolTip::Create();

+  FWL_ERR ret = ((IFWL_ToolTip*)m_pImp)->Initialize(prop);

+  if (ret == FWL_ERR_Succeeded) {

+    CFWL_Widget::Initialize();

+  }

+  return ret;

+}

+FWL_ERR CFWL_ToolTip::GetCaption(CFX_WideString& wsCaption) {

+  wsCaption = m_tooltipData.m_wsCaption;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ToolTip::SetCaption(const CFX_WideStringC& wsCaption) {

+  m_tooltipData.m_wsCaption = wsCaption;

+  return FWL_ERR_Succeeded;

+}

+int32_t CFWL_ToolTip::GetInitialDelay() {

+  return m_tooltipData.m_nInitDelayTime;

+}

+int32_t CFWL_ToolTip::SetInitialDelay(int32_t nDelayTime) {

+  m_tooltipData.m_nInitDelayTime = nDelayTime;

+  return FWL_ERR_Succeeded;

+}

+int32_t CFWL_ToolTip::GetAutoPopDelay() {

+  return m_tooltipData.m_nAutoPopDelayTime;

+}

+int32_t CFWL_ToolTip::SetAutoPopDelay(int32_t nDelayTime) {

+  m_tooltipData.m_nAutoPopDelayTime = nDelayTime;

+  return FWL_ERR_Succeeded;

+}

+CFX_DIBitmap* CFWL_ToolTip::GetToolTipIcon() {

+  return m_tooltipData.m_pBitmap;

+}

+FWL_ERR CFWL_ToolTip::SetToolTipIcon(CFX_DIBitmap* pBitmap) {

+  m_tooltipData.m_pBitmap = pBitmap;

+  return FWL_ERR_Succeeded;

+}

+CFX_SizeF CFWL_ToolTip::GetToolTipIconSize() {

+  return m_tooltipData.m_fIconSize;

+}

+FWL_ERR CFWL_ToolTip::SetToolTipIconSize(CFX_SizeF fSize) {

+  m_tooltipData.m_fIconSize = fSize;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_ToolTip::SetAnchor(const CFX_RectF& rtAnchor) {

+  return ((IFWL_ToolTip*)m_pImp)->SetAnchor(rtAnchor);

+}

+FWL_ERR CFWL_ToolTip::Show() {

+  return ((IFWL_ToolTip*)m_pImp)->Show();

+}

+FWL_ERR CFWL_ToolTip::Hide() {

+  return ((IFWL_ToolTip*)m_pImp)->Hide();

+}

+CFWL_ToolTip::CFWL_ToolTip() {}

+CFWL_ToolTip::~CFWL_ToolTip() {}

+CFWL_ToolTip::CFWL_ToolTipDP::CFWL_ToolTipDP() : m_pBitmap(NULL) {

+  m_wsCaption = L"";

+  m_nInitDelayTime = 500;

+  m_nAutoPopDelayTime = 50000;

+  m_fIconSize.Set(0.0, 0.0);

+  m_fAnchor.Set(0.0, 0.0, 0.0, 0.0);

+}

+FWL_ERR CFWL_ToolTip::CFWL_ToolTipDP::GetCaption(IFWL_Widget* pWidget,

+                                                 CFX_WideString& wsCaption) {

+  wsCaption = m_wsCaption;

+  return FWL_ERR_Succeeded;

+}

+int32_t CFWL_ToolTip::CFWL_ToolTipDP::GetInitialDelay(IFWL_Widget* pWidget) {

+  return m_nInitDelayTime;

+}

+int32_t CFWL_ToolTip::CFWL_ToolTipDP::GetAutoPopDelay(IFWL_Widget* pWidget) {

+  return m_nAutoPopDelayTime;

+}

+CFX_DIBitmap* CFWL_ToolTip::CFWL_ToolTipDP::GetToolTipIcon(

+    IFWL_Widget* pWidget) {

+  return m_pBitmap;

+}

+CFX_SizeF CFWL_ToolTip::CFWL_ToolTipDP::GetToolTipIconSize(

+    IFWL_Widget* pWidget) {

+  return m_fIconSize;

+}

+CFX_RectF CFWL_ToolTip::CFWL_ToolTipDP::GetAnchor() {

+  return m_fAnchor;

 }

diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp
index be6c728e2c..85bb710bd6 100644
--- a/xfa/src/fwl/src/lightwidget/widget.cpp
+++ b/xfa/src/fwl/src/lightwidget/widget.cpp
@@ -10,335 +10,296 @@
 #include "../core/include/fwl_noteimp.h"

 #include "../core/include/fwl_widgetimp.h"

 #include "../core/include/fwl_widgetmgrimp.h"

-IFWL_Widget* CFWL_Widget::GetWidget()

-{

-    return m_pImp;

-}

-FX_DWORD CFWL_Widget::Release()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    FX_DWORD dwRef = m_pImp->GetRefCount();

-    if (dwRef == 1) {

-        m_pImp->Finalize();

-    }

-    m_pImp->Release();

-    if (dwRef == 1) {

-        m_pImp = NULL;

-        delete this;

-    }

-    return dwRef - 1;

-}

-CFWL_Widget* CFWL_Widget::Retain()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

-    m_pImp->Retain();

-    return this;

-}

-FX_DWORD CFWL_Widget::GetRefCount() const

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 1);

-    return m_pImp->GetRefCount();

-}

-FWL_ERR CFWL_Widget::GetClassName(CFX_WideString &wsClass) const

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->GetClassName(wsClass);

-}

-FX_DWORD CFWL_Widget::GetClassID() const

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return m_pImp->GetClassID();

-}

-FX_BOOL CFWL_Widget::IsInstance(const CFX_WideStringC& wsClass) const

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

-    return m_pImp->IsInstance(wsClass);

+IFWL_Widget* CFWL_Widget::GetWidget() {

+  return m_pImp;

+}

+FX_DWORD CFWL_Widget::Release() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  FX_DWORD dwRef = m_pImp->GetRefCount();

+  if (dwRef == 1) {

+    m_pImp->Finalize();

+  }

+  m_pImp->Release();

+  if (dwRef == 1) {

+    m_pImp = NULL;

+    delete this;

+  }

+  return dwRef - 1;

+}

+CFWL_Widget* CFWL_Widget::Retain() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

+  m_pImp->Retain();

+  return this;

+}

+FX_DWORD CFWL_Widget::GetRefCount() const {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 1);

+  return m_pImp->GetRefCount();

+}

+FWL_ERR CFWL_Widget::GetClassName(CFX_WideString& wsClass) const {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->GetClassName(wsClass);

+}

+FX_DWORD CFWL_Widget::GetClassID() const {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return m_pImp->GetClassID();

+}

+FX_BOOL CFWL_Widget::IsInstance(const CFX_WideStringC& wsClass) const {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);

+  return m_pImp->IsInstance(wsClass);

 }

 static void* gs_pFWLWidget = (void*)FXBSTR_ID('l', 'i', 'g', 't');

-FWL_ERR CFWL_Widget::Initialize(const CFWL_WidgetProperties *pProperties )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->SetPrivateData(gs_pFWLWidget, this, NULL);

-}

-FWL_ERR CFWL_Widget::GetWidgetRect(CFX_RectF &rect, FX_BOOL bAutoSize )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->GetWidgetRect(rect, bAutoSize);

-}

-FWL_ERR CFWL_Widget::GetGlobalRect(CFX_RectF &rect)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->GetGlobalRect(rect);

-}

-FWL_ERR CFWL_Widget::SetWidgetRect(const CFX_RectF &rect)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->SetWidgetRect(rect);

-}

-FWL_ERR CFWL_Widget::GetClientRect(CFX_RectF &rect)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->GetClientRect(rect);

-}

-CFWL_Widget* CFWL_Widget::GetParent()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

-    IFWL_Widget *parent = m_pImp->GetParent();

-    if (parent) {

-        return (CFWL_Widget*)parent->GetPrivateData(gs_pFWLWidget);

-    }

-    return NULL;

-}

-FWL_ERR	CFWL_Widget::SetParent(CFWL_Widget *pParent)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->SetParent(pParent ? pParent->GetWidget() : NULL);

-}

-CFWL_Widget* CFWL_Widget::GetOwner()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

-    return NULL;

-}

-FWL_ERR	CFWL_Widget::SetOwner(CFWL_Widget *pOwner)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return FWL_ERR_Succeeded;

-}

-FX_DWORD CFWL_Widget::GetStyles()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return m_pImp->GetStyles();

-}

-FWL_ERR	CFWL_Widget::ModifyStyles(FX_DWORD dwStylesAdded, FX_DWORD dwStylesRemoved)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->ModifyStyles(dwStylesAdded, dwStylesRemoved);

-}

-FX_DWORD CFWL_Widget::GetStylesEx()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return m_pImp->GetStylesEx();

-}

-FWL_ERR	CFWL_Widget::ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved)

-{

-    return m_pImp->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);

-}

-FX_DWORD CFWL_Widget::GetStates()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->GetStates();

-}

-FWL_ERR	CFWL_Widget::SetStates(FX_DWORD dwStates, FX_BOOL bSet )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->SetStates(dwStates, bSet);

-}

-FWL_ERR	CFWL_Widget::SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->SetPrivateData(module_id, pData, callback);

-}

-void* CFWL_Widget::GetPrivateData(void* module_id)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

-    return m_pImp->GetPrivateData(module_id);

-}

-FWL_ERR	CFWL_Widget::Update()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->Update();

-}

-FWL_ERR	CFWL_Widget::LockUpdate()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->LockUpdate();

-}

-FWL_ERR	CFWL_Widget::UnlockUpdate()

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->UnlockUpdate();

-}

-FX_DWORD CFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

-    return m_pImp->HitTest(fx, fy);

-}

-FWL_ERR	CFWL_Widget::TransformTo(CFWL_Widget *pWidget, FX_FLOAT &fx, FX_FLOAT &fy)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->TransformTo(pWidget ? pWidget->GetWidget() : NULL, fx, fy);

-}

-FWL_ERR	CFWL_Widget::TransformTo(CFWL_Widget *pWidget, CFX_RectF &rt)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->TransformTo(pWidget ? pWidget->GetWidget() : NULL, rt);

-}

-FWL_ERR	CFWL_Widget::GetMatrix(CFX_Matrix &matrix, FX_BOOL bGlobal )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->GetMatrix(matrix, bGlobal);

-}

-FWL_ERR	CFWL_Widget::SetMatrix(const CFX_Matrix &matrix)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->SetMatrix(matrix);

-}

-FWL_ERR	CFWL_Widget::DrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix )

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    return m_pImp->DrawWidget(pGraphics, pMatrix);

-}

-FWL_ERR	CFWL_Widget::GetProperties(CFWL_WidgetProperties &properties)

-{

-    properties.m_ctmOnParent = m_pProperties->m_ctmOnParent;

-    properties.m_rtWidget = m_pProperties->m_rtWidget;

-    properties.m_dwStyles = m_pProperties->m_dwStyles;

-    properties.m_dwStyleExes = m_pProperties->m_dwStyleExes;

-    properties.m_dwStates = m_pProperties->m_dwStates;

-    properties.m_pParent = m_pProperties->m_pParent;

-    properties.m_pOwner = m_pProperties->m_pOwner;

-    properties.m_wsWindowclass = m_pProperties->m_wsWindowclass;

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR	CFWL_Widget::SetProperties(const CFWL_WidgetProperties &properties)

-{

-    m_pProperties->m_ctmOnParent = properties.m_ctmOnParent;

-    m_pProperties->m_rtWidget = properties.m_rtWidget;

-    m_pProperties->m_dwStyles = properties.m_dwStyles;

-    m_pProperties->m_dwStyleExes = properties.m_dwStyleExes;

-    m_pProperties->m_dwStates = properties.m_dwStates;

-    m_pProperties->m_pParent = properties.m_pParent;

-    m_pProperties->m_pOwner = properties.m_pOwner;

-    m_pProperties->m_wsWindowclass = properties.m_wsWindowclass;

-    return FWL_ERR_Succeeded;

-}

-IFWL_WidgetDelegate* CFWL_Widget::SetDelegate(IFWL_WidgetDelegate* pDelegate)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

-    m_pDelegate = m_pImp->SetDelegate(pDelegate);

-    return m_pDelegate;

+FWL_ERR CFWL_Widget::Initialize(const CFWL_WidgetProperties* pProperties) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->SetPrivateData(gs_pFWLWidget, this, NULL);

+}

+FWL_ERR CFWL_Widget::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->GetWidgetRect(rect, bAutoSize);

+}

+FWL_ERR CFWL_Widget::GetGlobalRect(CFX_RectF& rect) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->GetGlobalRect(rect);

+}

+FWL_ERR CFWL_Widget::SetWidgetRect(const CFX_RectF& rect) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->SetWidgetRect(rect);

+}

+FWL_ERR CFWL_Widget::GetClientRect(CFX_RectF& rect) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->GetClientRect(rect);

+}

+CFWL_Widget* CFWL_Widget::GetParent() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

+  IFWL_Widget* parent = m_pImp->GetParent();

+  if (parent) {

+    return (CFWL_Widget*)parent->GetPrivateData(gs_pFWLWidget);

+  }

+  return NULL;

+}

+FWL_ERR CFWL_Widget::SetParent(CFWL_Widget* pParent) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->SetParent(pParent ? pParent->GetWidget() : NULL);

+}

+CFWL_Widget* CFWL_Widget::GetOwner() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

+  return NULL;

+}

+FWL_ERR CFWL_Widget::SetOwner(CFWL_Widget* pOwner) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return FWL_ERR_Succeeded;

+}

+FX_DWORD CFWL_Widget::GetStyles() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return m_pImp->GetStyles();

+}

+FWL_ERR CFWL_Widget::ModifyStyles(FX_DWORD dwStylesAdded,

+                                  FX_DWORD dwStylesRemoved) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->ModifyStyles(dwStylesAdded, dwStylesRemoved);

+}

+FX_DWORD CFWL_Widget::GetStylesEx() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return m_pImp->GetStylesEx();

+}

+FWL_ERR CFWL_Widget::ModifyStylesEx(FX_DWORD dwStylesExAdded,

+                                    FX_DWORD dwStylesExRemoved) {

+  return m_pImp->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);

+}

+FX_DWORD CFWL_Widget::GetStates() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->GetStates();

+}

+FWL_ERR CFWL_Widget::SetStates(FX_DWORD dwStates, FX_BOOL bSet) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->SetStates(dwStates, bSet);

+}

+FWL_ERR CFWL_Widget::SetPrivateData(void* module_id,

+                                    void* pData,

+                                    PD_CALLBACK_FREEDATA callback) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->SetPrivateData(module_id, pData, callback);

+}

+void* CFWL_Widget::GetPrivateData(void* module_id) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

+  return m_pImp->GetPrivateData(module_id);

+}

+FWL_ERR CFWL_Widget::Update() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->Update();

+}

+FWL_ERR CFWL_Widget::LockUpdate() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->LockUpdate();

+}

+FWL_ERR CFWL_Widget::UnlockUpdate() {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->UnlockUpdate();

+}

+FX_DWORD CFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);

+  return m_pImp->HitTest(fx, fy);

+}

+FWL_ERR CFWL_Widget::TransformTo(CFWL_Widget* pWidget,

+                                 FX_FLOAT& fx,

+                                 FX_FLOAT& fy) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->TransformTo(pWidget ? pWidget->GetWidget() : NULL, fx, fy);

+}

+FWL_ERR CFWL_Widget::TransformTo(CFWL_Widget* pWidget, CFX_RectF& rt) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->TransformTo(pWidget ? pWidget->GetWidget() : NULL, rt);

+}

+FWL_ERR CFWL_Widget::GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->GetMatrix(matrix, bGlobal);

+}

+FWL_ERR CFWL_Widget::SetMatrix(const CFX_Matrix& matrix) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->SetMatrix(matrix);

+}

+FWL_ERR CFWL_Widget::DrawWidget(CFX_Graphics* pGraphics,

+                                const CFX_Matrix* pMatrix) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  return m_pImp->DrawWidget(pGraphics, pMatrix);

+}

+FWL_ERR CFWL_Widget::GetProperties(CFWL_WidgetProperties& properties) {

+  properties.m_ctmOnParent = m_pProperties->m_ctmOnParent;

+  properties.m_rtWidget = m_pProperties->m_rtWidget;

+  properties.m_dwStyles = m_pProperties->m_dwStyles;

+  properties.m_dwStyleExes = m_pProperties->m_dwStyleExes;

+  properties.m_dwStates = m_pProperties->m_dwStates;

+  properties.m_pParent = m_pProperties->m_pParent;

+  properties.m_pOwner = m_pProperties->m_pOwner;

+  properties.m_wsWindowclass = m_pProperties->m_wsWindowclass;

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_Widget::SetProperties(const CFWL_WidgetProperties& properties) {

+  m_pProperties->m_ctmOnParent = properties.m_ctmOnParent;

+  m_pProperties->m_rtWidget = properties.m_rtWidget;

+  m_pProperties->m_dwStyles = properties.m_dwStyles;

+  m_pProperties->m_dwStyleExes = properties.m_dwStyleExes;

+  m_pProperties->m_dwStates = properties.m_dwStates;

+  m_pProperties->m_pParent = properties.m_pParent;

+  m_pProperties->m_pOwner = properties.m_pOwner;

+  m_pProperties->m_wsWindowclass = properties.m_wsWindowclass;

+  return FWL_ERR_Succeeded;

+}

+IFWL_WidgetDelegate* CFWL_Widget::SetDelegate(IFWL_WidgetDelegate* pDelegate) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);

+  m_pDelegate = m_pImp->SetDelegate(pDelegate);

+  return m_pDelegate;

 }

 CFWL_Widget::CFWL_Widget()

-    : m_pImp(NULL)

-    , m_pDelegate(NULL)

-    , m_pProperties(NULL)

-{

-    m_pProperties = FX_NEW CFWL_WidgetProperties;

-    m_pWidgetMgr = (CFWL_WidgetMgr*)FWL_GetWidgetMgr();

-    FXSYS_assert(m_pWidgetMgr != NULL);

-}

-CFWL_Widget::~CFWL_Widget()

-{

-    if (m_pProperties) {

-        delete m_pProperties;

-        m_pProperties = NULL;

-    }

-    if (m_pImp) {

-        m_pImp->Finalize();

-        m_pImp->Release();

-        m_pImp = NULL;

-    }

-}

-FWL_ERR CFWL_Widget::Repaint(const CFX_RectF *pRect)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    CFX_RectF rect;

-    if (pRect) {

-        rect = *pRect;

-    } else {

-        m_pImp->GetWidgetRect(rect);

-        rect.left = rect.top = 0;

-    }

-    return m_pWidgetMgr->RepaintWidget(m_pImp, &rect);

-}

-FWL_ERR CFWL_Widget::SetFocus(FX_BOOL bFocus)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    IFWL_NoteThread *pThread = m_pImp->GetOwnerThread();

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    IFWL_NoteDriver *pDriver = pThread->GetNoteDriver();

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    if (bFocus) {

-        pDriver->SetFocus(m_pImp);

-    } else {

-        if (((CFWL_NoteDriver*)pDriver)->GetFocus() == m_pImp) {

-            pDriver->SetFocus(NULL);

-        }

-    }

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_Widget::SetGrab(FX_BOOL bSet)

-{

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    IFWL_NoteThread *pThread = m_pImp->GetOwnerThread();

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    CFWL_NoteDriver *pDriver = (CFWL_NoteDriver*)pThread->GetNoteDriver();

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

-    pDriver->SetGrab(m_pImp, bSet);

-    return FWL_ERR_Succeeded;

-}

-void CFWL_Widget::RegisterEventTarget(CFWL_Widget *pEventSource , FX_DWORD dwFilter )

-{

-    _FWL_RETURN_IF_FAIL(m_pImp);

-    IFWL_NoteThread *pThread = m_pImp->GetOwnerThread();

-    _FWL_RETURN_IF_FAIL(pThread);

-    IFWL_NoteDriver *pNoteDriver = pThread->GetNoteDriver();

-    _FWL_RETURN_IF_FAIL(pNoteDriver);

-    IFWL_Widget *pEventSourceImp = !pEventSource ? NULL : pEventSource->GetWidget();

-    pNoteDriver->RegisterEventTarget(GetWidget(), pEventSourceImp, dwFilter);

-}

-void CFWL_Widget::DispatchEvent(CFWL_Event *pEvent)

-{

-    _FWL_RETURN_IF_FAIL(m_pImp);

-    if (m_pImp->GetOuter()) {

-        return;

+    : m_pImp(NULL), m_pDelegate(NULL), m_pProperties(NULL) {

+  m_pProperties = FX_NEW CFWL_WidgetProperties;

+  m_pWidgetMgr = (CFWL_WidgetMgr*)FWL_GetWidgetMgr();

+  FXSYS_assert(m_pWidgetMgr != NULL);

+}

+CFWL_Widget::~CFWL_Widget() {

+  if (m_pProperties) {

+    delete m_pProperties;

+    m_pProperties = NULL;

+  }

+  if (m_pImp) {

+    m_pImp->Finalize();

+    m_pImp->Release();

+    m_pImp = NULL;

+  }

+}

+FWL_ERR CFWL_Widget::Repaint(const CFX_RectF* pRect) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  CFX_RectF rect;

+  if (pRect) {

+    rect = *pRect;

+  } else {

+    m_pImp->GetWidgetRect(rect);

+    rect.left = rect.top = 0;

+  }

+  return m_pWidgetMgr->RepaintWidget(m_pImp, &rect);

+}

+FWL_ERR CFWL_Widget::SetFocus(FX_BOOL bFocus) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  IFWL_NoteThread* pThread = m_pImp->GetOwnerThread();

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  IFWL_NoteDriver* pDriver = pThread->GetNoteDriver();

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  if (bFocus) {

+    pDriver->SetFocus(m_pImp);

+  } else {

+    if (((CFWL_NoteDriver*)pDriver)->GetFocus() == m_pImp) {

+      pDriver->SetFocus(NULL);

     }

-    IFWL_NoteThread *pThread = m_pImp->GetOwnerThread();

-    _FWL_RETURN_IF_FAIL(pThread);

-    IFWL_NoteDriver *pNoteDriver = pThread->GetNoteDriver();

-    _FWL_RETURN_IF_FAIL(pNoteDriver);

-    pNoteDriver->SendNote(pEvent);

-}

-#define FWL_WGT_CalcHeight				2048

-#define FWL_WGT_CalcWidth				2048

-#define FWL_WGT_CalcMultiLineDefWidth	120.0f

-CFX_SizeF CFWL_Widget::CalcTextSize(const CFX_WideString &wsText, FX_BOOL bMultiLine , int32_t iLineWidth )

-{

-    CFX_SizeF sz;

-    sz.Set(0, 0);

-    _FWL_RETURN_VALUE_IF_FAIL(m_pImp, sz);

-    IFWL_ThemeProvider *pTheme = m_pImp->GetThemeProvider();

-    _FWL_RETURN_VALUE_IF_FAIL(pTheme, sz);

-    CFWL_ThemeText calPart;

-    calPart.m_pWidget = m_pImp;

-    calPart.m_wsText = wsText;

-    calPart.m_dwTTOStyles = bMultiLine ? FDE_TTOSTYLE_LineWrap : FDE_TTOSTYLE_SingleLine;

-    calPart.m_iTTOAlign = FDE_TTOALIGNMENT_TopLeft;

-    CFX_RectF rect;

-    FX_FLOAT fWidth = bMultiLine ?

-                      (iLineWidth > 0 ? (FX_FLOAT)iLineWidth : FWL_WGT_CalcMultiLineDefWidth) :

-                      FWL_WGT_CalcWidth;

-    rect.Set(0, 0, fWidth, FWL_WGT_CalcHeight);

-    pTheme->CalcTextRect(&calPart, rect);

-    sz.x = rect.width;

-    sz.y = rect.height;

-    return sz;

-}

-CFWL_WidgetDelegate::CFWL_WidgetDelegate()

-{

-}

-CFWL_WidgetDelegate::~CFWL_WidgetDelegate()

-{

-}

-int32_t CFWL_WidgetDelegate::OnProcessMessage(CFWL_Message *pMessage)

-{

-    return 1;

-}

-FWL_ERR CFWL_WidgetDelegate::OnProcessEvent(CFWL_Event *pEvent)

-{

-    return FWL_ERR_Succeeded;

-}

-FWL_ERR CFWL_WidgetDelegate::OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix )

-{

-    return FWL_ERR_Succeeded;

+  }

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_Widget::SetGrab(FX_BOOL bSet) {

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  IFWL_NoteThread* pThread = m_pImp->GetOwnerThread();

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  CFWL_NoteDriver* pDriver = (CFWL_NoteDriver*)pThread->GetNoteDriver();

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);

+  pDriver->SetGrab(m_pImp, bSet);

+  return FWL_ERR_Succeeded;

+}

+void CFWL_Widget::RegisterEventTarget(CFWL_Widget* pEventSource,

+                                      FX_DWORD dwFilter) {

+  _FWL_RETURN_IF_FAIL(m_pImp);

+  IFWL_NoteThread* pThread = m_pImp->GetOwnerThread();

+  _FWL_RETURN_IF_FAIL(pThread);

+  IFWL_NoteDriver* pNoteDriver = pThread->GetNoteDriver();

+  _FWL_RETURN_IF_FAIL(pNoteDriver);

+  IFWL_Widget* pEventSourceImp =

+      !pEventSource ? NULL : pEventSource->GetWidget();

+  pNoteDriver->RegisterEventTarget(GetWidget(), pEventSourceImp, dwFilter);

+}

+void CFWL_Widget::DispatchEvent(CFWL_Event* pEvent) {

+  _FWL_RETURN_IF_FAIL(m_pImp);

+  if (m_pImp->GetOuter()) {

+    return;

+  }

+  IFWL_NoteThread* pThread = m_pImp->GetOwnerThread();

+  _FWL_RETURN_IF_FAIL(pThread);

+  IFWL_NoteDriver* pNoteDriver = pThread->GetNoteDriver();

+  _FWL_RETURN_IF_FAIL(pNoteDriver);

+  pNoteDriver->SendNote(pEvent);

+}

+#define FWL_WGT_CalcHeight 2048

+#define FWL_WGT_CalcWidth 2048

+#define FWL_WGT_CalcMultiLineDefWidth 120.0f

+CFX_SizeF CFWL_Widget::CalcTextSize(const CFX_WideString& wsText,

+                                    FX_BOOL bMultiLine,

+                                    int32_t iLineWidth) {

+  CFX_SizeF sz;

+  sz.Set(0, 0);

+  _FWL_RETURN_VALUE_IF_FAIL(m_pImp, sz);

+  IFWL_ThemeProvider* pTheme = m_pImp->GetThemeProvider();

+  _FWL_RETURN_VALUE_IF_FAIL(pTheme, sz);

+  CFWL_ThemeText calPart;

+  calPart.m_pWidget = m_pImp;

+  calPart.m_wsText = wsText;

+  calPart.m_dwTTOStyles =

+      bMultiLine ? FDE_TTOSTYLE_LineWrap : FDE_TTOSTYLE_SingleLine;

+  calPart.m_iTTOAlign = FDE_TTOALIGNMENT_TopLeft;

+  CFX_RectF rect;

+  FX_FLOAT fWidth = bMultiLine

+                        ? (iLineWidth > 0 ? (FX_FLOAT)iLineWidth

+                                          : FWL_WGT_CalcMultiLineDefWidth)

+                        : FWL_WGT_CalcWidth;

+  rect.Set(0, 0, fWidth, FWL_WGT_CalcHeight);

+  pTheme->CalcTextRect(&calPart, rect);

+  sz.x = rect.width;

+  sz.y = rect.height;

+  return sz;

+}

+CFWL_WidgetDelegate::CFWL_WidgetDelegate() {}

+CFWL_WidgetDelegate::~CFWL_WidgetDelegate() {}

+int32_t CFWL_WidgetDelegate::OnProcessMessage(CFWL_Message* pMessage) {

+  return 1;

+}

+FWL_ERR CFWL_WidgetDelegate::OnProcessEvent(CFWL_Event* pEvent) {

+  return FWL_ERR_Succeeded;

+}

+FWL_ERR CFWL_WidgetDelegate::OnDrawWidget(CFX_Graphics* pGraphics,

+                                          const CFX_Matrix* pMatrix) {

+  return FWL_ERR_Succeeded;

 }