summaryrefslogtreecommitdiff
path: root/xfa/fwl/lightwidget
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl/lightwidget')
-rw-r--r--xfa/fwl/lightwidget/cfwl_barcode.h2
-rw-r--r--xfa/fwl/lightwidget/cfwl_checkbox.h2
-rw-r--r--xfa/fwl/lightwidget/cfwl_combobox.cpp7
-rw-r--r--xfa/fwl/lightwidget/cfwl_combobox.h6
-rw-r--r--xfa/fwl/lightwidget/cfwl_datetimepicker.cpp2
-rw-r--r--xfa/fwl/lightwidget/cfwl_datetimepicker.h2
-rw-r--r--xfa/fwl/lightwidget/cfwl_edit.cpp2
-rw-r--r--xfa/fwl/lightwidget/cfwl_edit.h2
-rw-r--r--xfa/fwl/lightwidget/cfwl_listbox.cpp4
-rw-r--r--xfa/fwl/lightwidget/cfwl_listbox.h6
-rw-r--r--xfa/fwl/lightwidget/cfwl_picturebox.h2
-rw-r--r--xfa/fwl/lightwidget/cfwl_pushbutton.h2
-rw-r--r--xfa/fwl/lightwidget/cfwl_widget.cpp1
13 files changed, 20 insertions, 20 deletions
diff --git a/xfa/fwl/lightwidget/cfwl_barcode.h b/xfa/fwl/lightwidget/cfwl_barcode.h
index 83a58c10bd..4bb3d608aa 100644
--- a/xfa/fwl/lightwidget/cfwl_barcode.h
+++ b/xfa/fwl/lightwidget/cfwl_barcode.h
@@ -7,8 +7,8 @@
#ifndef XFA_FWL_LIGHTWIDGET_CFWL_BARCODE_H_
#define XFA_FWL_LIGHTWIDGET_CFWL_BARCODE_H_
-#include "xfa/fwl/basewidget/ifwl_barcode.h"
#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/core/ifwl_barcode.h"
#include "xfa/fwl/lightwidget/cfwl_edit.h"
class CFWL_Widget;
diff --git a/xfa/fwl/lightwidget/cfwl_checkbox.h b/xfa/fwl/lightwidget/cfwl_checkbox.h
index ef66280b85..343970c3a4 100644
--- a/xfa/fwl/lightwidget/cfwl_checkbox.h
+++ b/xfa/fwl/lightwidget/cfwl_checkbox.h
@@ -7,7 +7,7 @@
#ifndef XFA_FWL_LIGHTWIDGET_CFWL_CHECKBOX_H_
#define XFA_FWL_LIGHTWIDGET_CFWL_CHECKBOX_H_
-#include "xfa/fwl/basewidget/ifwl_checkbox.h"
+#include "xfa/fwl/core/ifwl_checkbox.h"
#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_CheckBox : public CFWL_Widget {
diff --git a/xfa/fwl/lightwidget/cfwl_combobox.cpp b/xfa/fwl/lightwidget/cfwl_combobox.cpp
index 4ec323ae7d..9c4cd05e57 100644
--- a/xfa/fwl/lightwidget/cfwl_combobox.cpp
+++ b/xfa/fwl/lightwidget/cfwl_combobox.cpp
@@ -248,12 +248,13 @@ FWL_Error CFWL_ComboBox::CFWL_ComboBoxDP::GetCaption(
return FWL_Error::Succeeded;
}
-int32_t CFWL_ComboBox::CFWL_ComboBoxDP::CountItems(IFWL_Widget* pWidget) {
+int32_t CFWL_ComboBox::CFWL_ComboBoxDP::CountItems(const IFWL_Widget* pWidget) {
return m_ItemArray.size();
}
-IFWL_ListItem* CFWL_ComboBox::CFWL_ComboBoxDP::GetItem(IFWL_Widget* pWidget,
- int32_t nIndex) {
+IFWL_ListItem* CFWL_ComboBox::CFWL_ComboBoxDP::GetItem(
+ const IFWL_Widget* pWidget,
+ int32_t nIndex) {
if (nIndex < 0 || static_cast<size_t>(nIndex) >= m_ItemArray.size())
return nullptr;
diff --git a/xfa/fwl/lightwidget/cfwl_combobox.h b/xfa/fwl/lightwidget/cfwl_combobox.h
index bbcec3bb8b..b6dee570cb 100644
--- a/xfa/fwl/lightwidget/cfwl_combobox.h
+++ b/xfa/fwl/lightwidget/cfwl_combobox.h
@@ -10,7 +10,7 @@
#include <memory>
#include <vector>
-#include "xfa/fwl/basewidget/ifwl_combobox.h"
+#include "xfa/fwl/core/ifwl_combobox.h"
#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_WidgetProperties;
@@ -82,8 +82,8 @@ class CFWL_ComboBox : public CFWL_Widget {
CFX_WideString& wsCaption) override;
// IFWL_ListBoxDP
- int32_t CountItems(IFWL_Widget* pWidget) override;
- IFWL_ListItem* GetItem(IFWL_Widget* pWidget, int32_t nIndex) override;
+ int32_t CountItems(const IFWL_Widget* pWidget) override;
+ IFWL_ListItem* GetItem(const IFWL_Widget* pWidget, int32_t nIndex) override;
int32_t GetItemIndex(IFWL_Widget* pWidget, IFWL_ListItem* pItem) override;
FX_BOOL SetItemIndex(IFWL_Widget* pWidget,
IFWL_ListItem* pItem,
diff --git a/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp b/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp
index 828f9cfdf8..fccf8eac63 100644
--- a/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/lightwidget/cfwl_datetimepicker.cpp
@@ -8,8 +8,8 @@
#include <memory>
-#include "xfa/fwl/basewidget/ifwl_datetimepicker.h"
#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/core/ifwl_datetimepicker.h"
#include "xfa/fwl/core/ifwl_widget.h"
IFWL_DateTimePicker* CFWL_DateTimePicker::GetWidget() {
diff --git a/xfa/fwl/lightwidget/cfwl_datetimepicker.h b/xfa/fwl/lightwidget/cfwl_datetimepicker.h
index e73919cff4..309988446d 100644
--- a/xfa/fwl/lightwidget/cfwl_datetimepicker.h
+++ b/xfa/fwl/lightwidget/cfwl_datetimepicker.h
@@ -7,7 +7,7 @@
#ifndef XFA_FWL_LIGHTWIDGET_CFWL_DATETIMEPICKER_H_
#define XFA_FWL_LIGHTWIDGET_CFWL_DATETIMEPICKER_H_
-#include "xfa/fwl/basewidget/ifwl_datetimepicker.h"
+#include "xfa/fwl/core/ifwl_datetimepicker.h"
#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_DateTimePicker : public CFWL_Widget {
diff --git a/xfa/fwl/lightwidget/cfwl_edit.cpp b/xfa/fwl/lightwidget/cfwl_edit.cpp
index 5637040e4d..191bbd68eb 100644
--- a/xfa/fwl/lightwidget/cfwl_edit.cpp
+++ b/xfa/fwl/lightwidget/cfwl_edit.cpp
@@ -180,7 +180,7 @@ FWL_Error CFWL_Edit::SetNumberRange(int32_t iMin, int32_t iMax) {
FWL_Error CFWL_Edit::SetBackColor(uint32_t dwColor) {
if (!GetWidget())
return FWL_Error::Indefinite;
- return GetWidget()->SetBackColor(dwColor);
+ return GetWidget()->SetBackgroundColor(dwColor);
}
FWL_Error CFWL_Edit::SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize) {
diff --git a/xfa/fwl/lightwidget/cfwl_edit.h b/xfa/fwl/lightwidget/cfwl_edit.h
index 6c70c437f1..cbca3d9cf4 100644
--- a/xfa/fwl/lightwidget/cfwl_edit.h
+++ b/xfa/fwl/lightwidget/cfwl_edit.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "xfa/fwl/basewidget/ifwl_edit.h"
+#include "xfa/fwl/core/ifwl_edit.h"
#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_WidgetProperties;
diff --git a/xfa/fwl/lightwidget/cfwl_listbox.cpp b/xfa/fwl/lightwidget/cfwl_listbox.cpp
index eb984d670e..a0fff486cd 100644
--- a/xfa/fwl/lightwidget/cfwl_listbox.cpp
+++ b/xfa/fwl/lightwidget/cfwl_listbox.cpp
@@ -217,11 +217,11 @@ FWL_Error CFWL_ListBox::CFWL_ListBoxDP::GetCaption(IFWL_Widget* pWidget,
return FWL_Error::Succeeded;
}
-int32_t CFWL_ListBox::CFWL_ListBoxDP::CountItems(IFWL_Widget* pWidget) {
+int32_t CFWL_ListBox::CFWL_ListBoxDP::CountItems(const IFWL_Widget* pWidget) {
return pdfium::CollectionSize<int32_t>(m_ItemArray);
}
-IFWL_ListItem* CFWL_ListBox::CFWL_ListBoxDP::GetItem(IFWL_Widget* pWidget,
+IFWL_ListItem* CFWL_ListBox::CFWL_ListBoxDP::GetItem(const IFWL_Widget* pWidget,
int32_t nIndex) {
if (nIndex < 0 || nIndex >= CountItems(pWidget))
return nullptr;
diff --git a/xfa/fwl/lightwidget/cfwl_listbox.h b/xfa/fwl/lightwidget/cfwl_listbox.h
index a3bba8bfea..4a251ca9f2 100644
--- a/xfa/fwl/lightwidget/cfwl_listbox.h
+++ b/xfa/fwl/lightwidget/cfwl_listbox.h
@@ -10,8 +10,8 @@
#include <memory>
#include <vector>
-#include "xfa/fwl/basewidget/ifwl_listbox.h"
#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/core/ifwl_listbox.h"
#include "xfa/fwl/core/ifwl_widget.h"
#include "xfa/fwl/lightwidget/cfwl_widget.h"
@@ -60,8 +60,8 @@ class CFWL_ListBox : public CFWL_Widget {
CFX_WideString& wsCaption) override;
// IFWL_ListBoxDP:
- int32_t CountItems(IFWL_Widget* pWidget) override;
- IFWL_ListItem* GetItem(IFWL_Widget* pWidget, int32_t nIndex) override;
+ int32_t CountItems(const IFWL_Widget* pWidget) override;
+ IFWL_ListItem* GetItem(const IFWL_Widget* pWidget, int32_t nIndex) override;
int32_t GetItemIndex(IFWL_Widget* pWidget, IFWL_ListItem* pItem) override;
FX_BOOL SetItemIndex(IFWL_Widget* pWidget,
IFWL_ListItem* pItem,
diff --git a/xfa/fwl/lightwidget/cfwl_picturebox.h b/xfa/fwl/lightwidget/cfwl_picturebox.h
index c039892b66..149f3c9965 100644
--- a/xfa/fwl/lightwidget/cfwl_picturebox.h
+++ b/xfa/fwl/lightwidget/cfwl_picturebox.h
@@ -7,8 +7,8 @@
#ifndef XFA_FWL_LIGHTWIDGET_CFWL_PICTUREBOX_H_
#define XFA_FWL_LIGHTWIDGET_CFWL_PICTUREBOX_H_
-#include "xfa/fwl/basewidget/ifwl_picturebox.h"
#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/core/ifwl_picturebox.h"
#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_PictureBox : public CFWL_Widget {
diff --git a/xfa/fwl/lightwidget/cfwl_pushbutton.h b/xfa/fwl/lightwidget/cfwl_pushbutton.h
index 13629fa923..0199dbb778 100644
--- a/xfa/fwl/lightwidget/cfwl_pushbutton.h
+++ b/xfa/fwl/lightwidget/cfwl_pushbutton.h
@@ -7,7 +7,7 @@
#ifndef XFA_FWL_LIGHTWIDGET_CFWL_PUSHBUTTON_H_
#define XFA_FWL_LIGHTWIDGET_CFWL_PUSHBUTTON_H_
-#include "xfa/fwl/basewidget/ifwl_pushbutton.h"
+#include "xfa/fwl/core/ifwl_pushbutton.h"
#include "xfa/fwl/lightwidget/cfwl_widget.h"
class CFWL_PushButton : public CFWL_Widget {
diff --git a/xfa/fwl/lightwidget/cfwl_widget.cpp b/xfa/fwl/lightwidget/cfwl_widget.cpp
index 3a5478a433..fe2b35c46b 100644
--- a/xfa/fwl/lightwidget/cfwl_widget.cpp
+++ b/xfa/fwl/lightwidget/cfwl_widget.cpp
@@ -11,7 +11,6 @@
#include "xfa/fwl/core/cfwl_widgetmgr.h"
#include "xfa/fwl/core/fwl_noteimp.h"
#include "xfa/fwl/core/fwl_noteimp.h"
-#include "xfa/fwl/core/fwl_widgetimp.h"
#include "xfa/fwl/core/ifwl_app.h"
#include "xfa/fwl/core/ifwl_themeprovider.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 09:27:05 +0000