summaryrefslogtreecommitdiff
path: root/xfa/fwl/core
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl/core')
-rw-r--r--xfa/fwl/core/fwl_appimp.cpp16
-rw-r--r--xfa/fwl/core/fwl_formimp.h1
-rw-r--r--xfa/fwl/core/fwl_noteimp.cpp12
-rw-r--r--xfa/fwl/core/fwl_noteimp.h6
-rw-r--r--xfa/fwl/core/fwl_sdadapterimp.cpp4
-rw-r--r--xfa/fwl/core/fwl_sdadapterimp.h1
-rw-r--r--xfa/fwl/core/ifwl_adapterwidgetmgr.h1
-rw-r--r--xfa/fwl/core/ifwl_app.h6
8 files changed, 4 insertions, 43 deletions
diff --git a/xfa/fwl/core/fwl_appimp.cpp b/xfa/fwl/core/fwl_appimp.cpp
index 8492be791f..95ed0c90cc 100644
--- a/xfa/fwl/core/fwl_appimp.cpp
+++ b/xfa/fwl/core/fwl_appimp.cpp
@@ -89,9 +89,6 @@ IFWL_AdapterNative* FWL_GetAdapterNative() {
return NULL;
return pApp->GetAdapterNative();
}
-IFWL_ThemeProvider* FWL_GetThemeProvider() {
- return NULL;
-}
static IFWL_App* _theApp = NULL;
IFWL_App* FWL_GetApp() {
return _theApp;
@@ -99,16 +96,3 @@ IFWL_App* FWL_GetApp() {
void FWL_SetApp(IFWL_App* pApp) {
_theApp = pApp;
}
-FWL_ERR FWL_SetFullScreen(IFWL_Widget* pWidget, FX_BOOL bFullScreen) {
- if (!pWidget)
- return FWL_ERR_Succeeded;
- IFWL_Thread* pNoteTread = pWidget->GetOwnerThread();
- if (!pNoteTread)
- return FWL_ERR_Succeeded;
- CFWL_NoteDriver* pNoteDriver =
- static_cast<CFWL_NoteDriver*>(pNoteTread->GetNoteDriver());
- if (!pNoteTread)
- return FWL_ERR_Succeeded;
- pNoteDriver->NotifyFullScreenMode(pWidget, bFullScreen);
- return FWL_GetAdapterWidgetMgr()->SetFullScreen(pWidget, bFullScreen);
-}
diff --git a/xfa/fwl/core/fwl_formimp.h b/xfa/fwl/core/fwl_formimp.h
index 4e419f8ffc..66e96b33b8 100644
--- a/xfa/fwl/core/fwl_formimp.h
+++ b/xfa/fwl/core/fwl_formimp.h
@@ -24,6 +24,7 @@ class CFWL_FormImpDelegate;
#define FWL_SYSBUTTONSTATE_Hover 0x0001
#define FWL_SYSBUTTONSTATE_Pressed 0x0002
#define FWL_SYSBUTTONSTATE_Disabled 0x0010
+
class CFWL_SysBtn {
public:
CFWL_SysBtn() {
diff --git a/xfa/fwl/core/fwl_noteimp.cpp b/xfa/fwl/core/fwl_noteimp.cpp
index 355531b407..a01eea9138 100644
--- a/xfa/fwl/core/fwl_noteimp.cpp
+++ b/xfa/fwl/core/fwl_noteimp.cpp
@@ -73,7 +73,6 @@ void CFWL_NoteLoop::GenerateCommondEvent(uint32_t dwCommand) {
}
CFWL_NoteDriver::CFWL_NoteDriver()
: m_sendEventCalled(0),
- m_bFullScreen(FALSE),
m_pHover(nullptr),
m_pFocus(nullptr),
m_pGrab(nullptr) {
@@ -326,10 +325,7 @@ void CFWL_NoteDriver::NotifyTargetDestroy(IFWL_Widget* pNoteTarget) {
}
}
}
-void CFWL_NoteDriver::NotifyFullScreenMode(IFWL_Widget* pNoteTarget,
- FX_BOOL bFullScreen) {
- m_bFullScreen = bFullScreen;
-}
+
FWL_ERR CFWL_NoteDriver::RegisterForm(CFWL_WidgetImp* pForm) {
if (!pForm)
return FWL_ERR_Indefinite;
@@ -468,17 +464,11 @@ FX_BOOL CFWL_NoteDriver::DispatchMessage(CFWL_Message* pMessage,
}
FX_BOOL CFWL_NoteDriver::DoActivate(CFWL_MsgActivate* pMsg,
IFWL_Widget* pMessageForm) {
- if (m_bFullScreen) {
- return FALSE;
- }
pMsg->m_pDstTarget = pMessageForm;
return (pMsg->m_pDstTarget)->GetStates() & FWL_WGTSTATE_Deactivated;
}
FX_BOOL CFWL_NoteDriver::DoDeactivate(CFWL_MsgDeactivate* pMsg,
IFWL_Widget* pMessageForm) {
- if (m_bFullScreen) {
- return FALSE;
- }
int32_t iTrackLoop = m_noteLoopQueue.GetSize();
if (iTrackLoop <= 0)
return FALSE;
diff --git a/xfa/fwl/core/fwl_noteimp.h b/xfa/fwl/core/fwl_noteimp.h
index a0af7ea91e..0a0c8424e8 100644
--- a/xfa/fwl/core/fwl_noteimp.h
+++ b/xfa/fwl/core/fwl_noteimp.h
@@ -70,7 +70,6 @@ class CFWL_NoteDriver : public IFWL_NoteDriver {
void SetHover(IFWL_Widget* pHover);
void NotifyTargetHide(IFWL_Widget* pNoteTarget);
void NotifyTargetDestroy(IFWL_Widget* pNoteTarget);
- void NotifyFullScreenMode(IFWL_Widget* pNoteTarget, FX_BOOL bFullScreen);
FWL_ERR RegisterForm(CFWL_WidgetImp* pForm);
FWL_ERR UnRegisterForm(CFWL_WidgetImp* pForm);
FX_BOOL QueueMessage(CFWL_Message* pMessage);
@@ -101,15 +100,12 @@ class CFWL_NoteDriver : public IFWL_NoteDriver {
CFX_PtrArray m_noteLoopQueue;
CFX_MapPtrToPtr m_eventTargets;
int32_t m_sendEventCalled;
- FX_BOOL m_bFullScreen;
IFWL_Widget* m_pHover;
IFWL_Widget* m_pFocus;
IFWL_Widget* m_pGrab;
CFWL_NoteLoop* m_pNoteLoop;
};
-typedef CFX_MapPtrTemplate<void*, uint32_t> CFWL_EventSource;
-
class CFWL_EventTarget {
public:
CFWL_EventTarget(CFWL_NoteDriver* pNoteDriver, IFWL_Widget* pListener)
@@ -123,7 +119,7 @@ class CFWL_EventTarget {
void FlagInvalid() { m_bInvalid = TRUE; }
protected:
- CFWL_EventSource m_eventSources;
+ CFX_MapPtrTemplate<void*, uint32_t> m_eventSources;
IFWL_Widget* m_pListener;
CFWL_NoteDriver* m_pNoteDriver;
FX_BOOL m_bInvalid;
diff --git a/xfa/fwl/core/fwl_sdadapterimp.cpp b/xfa/fwl/core/fwl_sdadapterimp.cpp
index 50246517cc..9732414ea1 100644
--- a/xfa/fwl/core/fwl_sdadapterimp.cpp
+++ b/xfa/fwl/core/fwl_sdadapterimp.cpp
@@ -89,10 +89,6 @@ FWL_ERR CFWL_SDAdapterWidgetMgr::SetTransparent(IFWL_Widget* pWidget,
uint32_t dwAlpha) {
return FWL_ERR_Succeeded;
}
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetFullScreen(IFWL_Widget* pWidget,
- FX_BOOL bFullScreen) {
- return FWL_ERR_Succeeded;
-}
FX_BOOL CFWL_SDAdapterWidgetMgr::CheckMessage() {
return TRUE;
}
diff --git a/xfa/fwl/core/fwl_sdadapterimp.h b/xfa/fwl/core/fwl_sdadapterimp.h
index 3968b22ab6..d91c88213e 100644
--- a/xfa/fwl/core/fwl_sdadapterimp.h
+++ b/xfa/fwl/core/fwl_sdadapterimp.h
@@ -46,7 +46,6 @@ class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr {
const CFX_WideStringC& wsCaption);
virtual FWL_ERR SetBorderRegion(IFWL_Widget* pWidget, CFX_Path* pPath);
virtual FWL_ERR SetTransparent(IFWL_Widget* pWidget, uint32_t dwAlpha);
- virtual FWL_ERR SetFullScreen(IFWL_Widget* pWidget, FX_BOOL bFullScreen);
virtual FX_BOOL CheckMessage();
virtual FX_BOOL IsIdleMessage();
virtual FWL_ERR DispatchMessage();
diff --git a/xfa/fwl/core/ifwl_adapterwidgetmgr.h b/xfa/fwl/core/ifwl_adapterwidgetmgr.h
index 1e8405ab2f..8744c6b078 100644
--- a/xfa/fwl/core/ifwl_adapterwidgetmgr.h
+++ b/xfa/fwl/core/ifwl_adapterwidgetmgr.h
@@ -44,7 +44,6 @@ class IFWL_AdapterWidgetMgr {
virtual FWL_ERR SetNormal(IFWL_Widget* pWidget) = 0;
virtual FWL_ERR SetMaximize(IFWL_Widget* pWidget) = 0;
virtual FWL_ERR SetMinimize(IFWL_Widget* pWidget) = 0;
- virtual FWL_ERR SetFullScreen(IFWL_Widget* pWidget, FX_BOOL bFullScreen) = 0;
virtual FX_BOOL CheckMessage() = 0;
virtual FX_BOOL IsIdleMessage() = 0;
virtual FWL_ERR DispatchMessage() = 0;
diff --git a/xfa/fwl/core/ifwl_app.h b/xfa/fwl/core/ifwl_app.h
index d969c4b35c..3fb0940ed4 100644
--- a/xfa/fwl/core/ifwl_app.h
+++ b/xfa/fwl/core/ifwl_app.h
@@ -34,12 +34,8 @@ class IFWL_App : public IFWL_Thread {
IFWL_App* FWL_GetApp();
void FWL_SetApp(IFWL_App* pApp);
+
IFWL_AdapterNative* FWL_GetAdapterNative();
IFWL_AdapterWidgetMgr* FWL_GetAdapterWidgetMgr();
-IFWL_ThemeProvider* FWL_GetThemeProvider();
-extern FWL_ERR FWL_Execute(const CFX_WideStringC& wsExecutable,
- const CFX_WideStringC& wsParameters);
-FWL_ERR FWL_SetFullScreen(IFWL_Widget* pWidget, FX_BOOL bFullScreen);
-FX_BOOL FWL_AppIsActived();
#endif // XFA_FWL_CORE_IFWL_APP_H_
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 06:10:27 +0000