summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/vcl/sysdata.hxx2
-rw-r--r--vcl/headless/svpdummies.cxx4
-rw-r--r--vcl/headless/svpframe.cxx4
-rw-r--r--vcl/inc/headless/svpdummies.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkobject.hxx2
-rw-r--r--vcl/inc/unx/salframe.h2
-rw-r--r--vcl/inc/unx/salobj.h2
-rw-r--r--vcl/inc/win/salobj.h2
-rw-r--r--vcl/unx/generic/window/salframe.cxx4
-rw-r--r--vcl/unx/generic/window/salobj.cxx6
-rw-r--r--vcl/unx/gtk/window/gtkobject.cxx2
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx2
12 files changed, 16 insertions, 18 deletions
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 57b32e30b480..3cc6aadf8ebe 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -83,8 +83,6 @@ struct SystemEnvData
#endif
};
-#define SystemChildData SystemEnvData
-
// --------------------
// - SystemParentData -
// --------------------
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index a8c4eb60a6ca..c45076bb4923 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -26,8 +26,8 @@
SvpSalObject::SvpSalObject()
{
// fast and easy cross-platform wiping of the data
- memset( (void *)&m_aSystemChildData, 0, sizeof( SystemChildData ) );
- m_aSystemChildData.nSize = sizeof( SystemChildData );
+ memset( (void *)&m_aSystemChildData, 0, sizeof( SystemEnvData ) );
+ m_aSystemChildData.nSize = sizeof( SystemEnvData );
}
SvpSalObject::~SvpSalObject()
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 79b231ff3009..2ce3074dfcd9 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -80,8 +80,8 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
m_nMaxHeight( 0 )
{
// fast and easy cross-platform wiping of the data
- memset( (void *)&m_aSystemChildData, 0, sizeof( SystemChildData ) );
- m_aSystemChildData.nSize = sizeof( SystemChildData );
+ memset( (void *)&m_aSystemChildData, 0, sizeof( SystemEnvData ) );
+ m_aSystemChildData.nSize = sizeof( SystemEnvData );
#ifdef IOS
// Nothing
#elif defined ANDROID
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 01fc5f77021b..84cdf0ed5c5d 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -30,7 +30,7 @@ class SalGraphics;
class SvpSalObject : public SalObject
{
public:
- SystemChildData m_aSystemChildData;
+ SystemEnvData m_aSystemChildData;
SvpSalObject();
virtual ~SvpSalObject();
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index df8ec1f2d638..1690908f477c 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -27,7 +27,7 @@
class GtkSalObject : public SalObject
{
- SystemChildData m_aSystemData;
+ SystemEnvData m_aSystemData;
GtkWidget* m_pSocket;
#if GTK_CHECK_VERSION(3,0,0)
cairo_region_t* m_pRegion;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 1a58b904b00a..5d3183975bff 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -120,7 +120,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
OUString m_sWMClass;
- SystemChildData maSystemChildData;
+ SystemEnvData maSystemChildData;
SalI18N_InputContext *mpInputContext;
Bool mbInputFocus;
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 464cd2343872..96e557076c69 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -60,7 +60,7 @@ private:
class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
{
public:
- SystemChildData maSystemChildData;
+ SystemEnvData maSystemChildData;
SalFrame* mpParent;
XLIB_Window maPrimary;
XLIB_Window maSecondary;
diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h
index 682687203224..c0c6df93a164 100644
--- a/vcl/inc/win/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -32,7 +32,7 @@ public:
HWND mhWnd; // Window handle
HWND mhWndChild; // Child Window handle
HWND mhLastFocusWnd; // Child-Window, welches als letztes den Focus hatte
- SystemChildData maSysData; // SystemEnvData
+ SystemEnvData maSysData; // SystemEnvData
RGNDATA* mpClipRgnData; // ClipRegion-Data
RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data
RECT* mpNextClipRect; // Naechstes ClipRegion-Rect
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 65bd389cede9..6fe079ccff43 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -857,10 +857,10 @@ void X11SalFrame::SetExtendedFrameStyle( SalExtStyle nStyle )
}
}
-const SystemChildData* X11SalFrame::GetSystemData() const
+const SystemEnvData* X11SalFrame::GetSystemData() const
{
X11SalFrame *pFrame = const_cast<X11SalFrame*>(this);
- pFrame->maSystemChildData.nSize = sizeof( SystemChildData );
+ pFrame->maSystemChildData.nSize = sizeof( SystemEnvData );
pFrame->maSystemChildData.pDisplay = GetXDisplay();
pFrame->maSystemChildData.aWindow = pFrame->GetWindow();
pFrame->maSystemChildData.pSalFrame = pFrame;
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 3026c5c8aae9..bc7dfbcc8cc3 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -51,7 +51,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
{
int error_base, event_base;
X11SalObject* pObject = new X11SalObject();
- SystemChildData* pObjData = const_cast<SystemChildData*>(pObject->GetSystemData());
+ SystemEnvData* pObjData = const_cast<SystemEnvData*>(pObject->GetSystemData());
if ( ! XShapeQueryExtension( (Display*)pObjData->pDisplay,
&event_base, &error_base ) )
@@ -236,7 +236,7 @@ SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
X11SalObject::X11SalObject()
{
- maSystemChildData.nSize = sizeof( SystemChildData );
+ maSystemChildData.nSize = sizeof( SystemEnvData );
maSystemChildData.pDisplay = GetGenericData()->GetSalDisplay()->GetDisplay();
maSystemChildData.aWindow = None;
maSystemChildData.pSalFrame = 0;
@@ -412,7 +412,7 @@ void X11SalObject::GrabFocus()
// -----------------------------------------------------------------------
-const SystemChildData* X11SalObject::GetSystemData() const
+const SystemEnvData* X11SalObject::GetSystemData() const
{
return &maSystemChildData;
}
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index b0fa39a5f551..3ba5b0631a87 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -52,7 +52,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow )
// system data
SalDisplay* pDisp = GetGenericData()->GetSalDisplay();
- m_aSystemData.nSize = sizeof( SystemChildData );
+ m_aSystemData.nSize = sizeof( SystemEnvData );
m_aSystemData.pDisplay = pDisp->GetDisplay();
m_aSystemData.aWindow = GDK_WINDOW_XWINDOW(widget_get_window(m_pSocket));
m_aSystemData.pSalFrame = NULL;
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 44d894da50b1..8eda04ae6df9 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -997,7 +997,7 @@ void GtkSalFrame::InitCommon()
gtk_widget_realize( m_pWindow );
//system data
- m_aSystemData.nSize = sizeof( SystemChildData );
+ m_aSystemData.nSize = sizeof( SystemEnvData );
#if !GTK_CHECK_VERSION(3,0,0)
GtkSalDisplay* pDisp = GetGtkSalData()->GetGtkDisplay();
m_aSystemData.pDisplay = pDisp->GetDisplay();
generated by cgit (git 2.34.1) at 2025-01-31 06:42:05 +0000