summaryrefslogtreecommitdiff
path: root/vcl/inc/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc/unx')
-rw-r--r--vcl/inc/unx/gtk/atkbridge.hxx6
-rw-r--r--vcl/inc/unx/i18n_im.hxx4
-rw-r--r--vcl/inc/unx/i18n_xkb.hxx4
-rw-r--r--vcl/inc/unx/pspgraphics.h4
-rw-r--r--vcl/inc/unx/salbmp.h4
-rw-r--r--vcl/inc/unx/saldata.hxx4
-rw-r--r--vcl/inc/unx/saldisp.hxx9
-rw-r--r--vcl/inc/unx/salframe.h4
-rw-r--r--vcl/inc/unx/salgdi.h15
-rw-r--r--vcl/inc/unx/salinst.h6
-rw-r--r--vcl/inc/unx/salobj.h4
-rw-r--r--vcl/inc/unx/salprn.h3
-rw-r--r--vcl/inc/unx/salsys.h4
-rw-r--r--vcl/inc/unx/sm.hxx11
-rw-r--r--vcl/inc/unx/wmadaptor.hxx4
15 files changed, 46 insertions, 40 deletions
diff --git a/vcl/inc/unx/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx
index 959b3aec1fb1..9d51ed0cc194 100644
--- a/vcl/inc/unx/gtk/atkbridge.hxx
+++ b/vcl/inc/unx/gtk/atkbridge.hxx
@@ -28,9 +28,9 @@
#ifndef __ATK_BRIDGE_HXX__
#define __ATK_BRIDGE_HXX__
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
-bool VCL_DLLPUBLIC InitAtkBridge(void);
-void VCL_DLLPUBLIC DeInitAtkBridge(void);
+bool VCLPLUG_GTK_PUBLIC InitAtkBridge(void);
+void VCLPLUG_GTK_PUBLIC DeInitAtkBridge(void);
#endif
diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx
index a22a57b976c8..c54749772dd3 100644
--- a/vcl/inc/unx/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -28,13 +28,13 @@
#ifndef _SAL_I18N_INPUTMETHOD_HXX
#define _SAL_I18N_INPUTMETHOD_HXX
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
extern "C" char* GetMethodName( XIMStyle nStyle, char *pBuf, int nBufSize);
#define bUseInputMethodDefault True
-class VCL_DLLPUBLIC SalI18N_InputMethod
+class VCLPLUG_GEN_PUBLIC SalI18N_InputMethod
{
Bool mbUseable; // system supports locale as well as status
// and preedit style ?
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index db6517cbea0b..2d75ea6f7d23 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -29,9 +29,9 @@
#define _SAL_I18N_XKBDEXTENSION_HXX
#include <sal/types.h>
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
-class VCL_DLLPUBLIC SalI18N_KeyboardExtension
+class VCLPLUG_GEN_PUBLIC SalI18N_KeyboardExtension
{
private:
diff --git a/vcl/inc/unx/pspgraphics.h b/vcl/inc/unx/pspgraphics.h
index f0015c301229..b78c1916ae78 100644
--- a/vcl/inc/unx/pspgraphics.h
+++ b/vcl/inc/unx/pspgraphics.h
@@ -30,8 +30,8 @@
#include "vcl/fontmanager.hxx"
-#include "vcl/dllapi.h"
+#include "vclpluginapi.h"
#include "salgdi.hxx"
#include "sallayout.hxx"
@@ -41,7 +41,7 @@ class ServerFont;
class ImplDevFontAttributes;
class SalInfoPrinter;
-class VCL_DLLPUBLIC PspGraphics : public SalGraphics
+class VCLPLUG_GEN_PUBLIC PspGraphics : public SalGraphics
{
psp::JobData* m_pJobData;
psp::PrinterGfx* m_pPrinterGfx;
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 1da035536179..5f70373322fc 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -34,7 +34,7 @@
#endif
#include <unx/saldisp.hxx>
#include <salbmp.hxx>
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
struct BitmapBuffer;
class BitmapPalette;
@@ -46,7 +46,7 @@ class ImplSalBitmapCache;
// - SalBitmap -
// -------------
-class VCL_DLLPUBLIC X11SalBitmap : public SalBitmap
+class VCLPLUG_GEN_PUBLIC X11SalBitmap : public SalBitmap
{
private:
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 566d17e98a32..ea2a9994baed 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -37,7 +37,7 @@
#ifndef _OSL_MODULE_H
#include <osl/module.h>
#endif
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
class SalXLib;
@@ -55,7 +55,7 @@ typedef unsigned int pthread_t;
#endif
// -=-= SalData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class VCL_DLLPUBLIC X11SalData : public SalData
+class VCLPLUG_GEN_PUBLIC X11SalData : public SalData
{
protected:
BOOL bNoExceptions_;
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index c83c1c56e1c5..6ed61c4a24c8 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -49,7 +49,8 @@ class SalXLib;
#include <hash_map>
#include <tools/gen.hxx>
#include <salwtype.hxx>
-#include <vcl/dllapi.h>
+
+#include <vclpluginapi.h>
// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
class BitmapPalette;
@@ -208,7 +209,7 @@ public:
typedef int(*YieldFunc)(int fd, void* data);
struct YieldEntry;
-class VCL_DLLPUBLIC SalXLib
+class VCLPLUG_GEN_PUBLIC SalXLib
{
protected:
timeval m_aTimeout;
@@ -279,7 +280,7 @@ extern "C" {
typedef Bool(*X_if_predicate)(Display*,XEvent*,XPointer);
}
-class VCL_DLLPUBLIC SalDisplay
+class VCLPLUG_GEN_PUBLIC SalDisplay
{
public:
struct RenderEntry
@@ -524,7 +525,7 @@ inline GC SalDisplay::GetGC( USHORT nDepth, int nScreen ) const
inline Display *SalColormap::GetXDisplay() const
{ return m_pDisplay->GetDisplay(); }
-class VCL_DLLPUBLIC SalX11Display : public SalDisplay
+class VCLPLUG_GEN_PUBLIC SalX11Display : public SalDisplay
{
public:
SalX11Display( Display* pDisp );
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 9f063975173d..3526e12badfe 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -38,7 +38,7 @@
#include <vcl/ptrstyle.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/timer.hxx>
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
#include <list>
@@ -57,7 +57,7 @@ namespace vcl_sal { class WMAdaptor; class NetWMAdaptor; class GnomeWMAdaptor; }
#define SHOWSTATE_NORMAL 1
#define SHOWSTATE_HIDDEN 2
-class VCL_DLLPUBLIC X11SalFrame : public SalFrame
+class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
{
friend class vcl_sal::WMAdaptor;
friend class vcl_sal::NetWMAdaptor;
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index a8804f1b3778..761df76d7ace 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -29,13 +29,16 @@
#define _SV_SALGDI_H
// -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#include "tools/fract.hxx"
+
+#include "vcl/salgtype.hxx"
+#include "vcl/vclenum.hxx"
+
#include "salstd.hxx"
#include "salgdi.hxx"
-#include "vcl/salgtype.hxx"
-#include "tools/fract.hxx"
-#include "vcl/dllapi.h"
-#include <vcl/vclenum.hxx>
-#include <sallayout.hxx>
+#include "sallayout.hxx"
+#include "vclpluginapi.h"
+
#include <deque>
// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -73,7 +76,7 @@ public:
~CairoFontsCache();
};
-class VCL_DLLPUBLIC X11SalGraphics : public SalGraphics
+class VCLPLUG_GEN_PUBLIC X11SalGraphics : public SalGraphics
{
friend class X11FontLayout;
friend class ServerFontLayout;
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 15cb4f1c7e65..6b21737f81f5 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -36,10 +36,10 @@
#ifndef _VOS_THREAD_HXX
#include <vos/thread.hxx>
#endif
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
#include <salinst.hxx>
-class VCL_DLLPUBLIC SalYieldMutex : public vos::OMutex
+class VCLPLUG_GEN_PUBLIC SalYieldMutex : public vos::OMutex
{
protected:
ULONG mnCount;
@@ -57,7 +57,7 @@ public:
};
// -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class VCL_DLLPUBLIC X11SalInstance : public SalInstance
+class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalInstance
{
protected:
SalYieldMutex* mpSalYieldMutex;
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index d2f63dad99aa..d2da11686b42 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -30,8 +30,8 @@
#include <vcl/sv.h>
#include <vcl/sysdata.hxx>
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
#include <salobj.hxx>
class SalClipRegion
@@ -65,7 +65,7 @@ private:
};
-class X11SalObject : public SalObject
+class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
{
public:
SystemChildData maSystemChildData;
diff --git a/vcl/inc/unx/salprn.h b/vcl/inc/unx/salprn.h
index b65792e1351a..1232b6fbc619 100644
--- a/vcl/inc/unx/salprn.h
+++ b/vcl/inc/unx/salprn.h
@@ -32,6 +32,7 @@
#include "printergfx.hxx"
#include "printerjob.hxx"
#include "salprn.hxx"
+#include "vclpluginapi.h"
class PspGraphics;
@@ -107,7 +108,7 @@ public:
class Timer;
namespace vcl_sal {
-class VCL_DLLPUBLIC PrinterUpdate
+class VCLPLUG_GEN_PUBLIC PrinterUpdate
{
static Timer* pPrinterUpdateTimer;
static int nActiveJobs;
diff --git a/vcl/inc/unx/salsys.h b/vcl/inc/unx/salsys.h
index a62a3384a17e..3b21985b8282 100644
--- a/vcl/inc/unx/salsys.h
+++ b/vcl/inc/unx/salsys.h
@@ -37,11 +37,11 @@
#include <vos/thread.hxx>
#endif
#include <salsys.hxx>
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
#include <list>
-class VCL_DLLPUBLIC X11SalSystem : public SalSystem
+class VCLPLUG_GEN_PUBLIC X11SalSystem : public SalSystem
{
public:
X11SalSystem() {}
diff --git a/vcl/inc/unx/sm.hxx b/vcl/inc/unx/sm.hxx
index 4c6a0c356c36..f5123f3e7ae0 100644
--- a/vcl/inc/unx/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -27,10 +27,11 @@
#ifndef _VCL_SM_HXX
#define _VCL_SM_HXX
-#include <tools/link.hxx>
-#include <unx/salunx.h>
+#include "tools/link.hxx"
+#include "unx/salunx.h"
#include <X11/SM/SMlib.h>
-#include <salsession.hxx>
+#include "salsession.hxx"
+#include "vclpluginapi.h"
class SessionManagerClient
{
@@ -60,7 +61,7 @@ class SessionManagerClient
DECL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void* );
DECL_STATIC_LINK( SessionManagerClient, InteractionHdl, void* );
public:
- static VCL_DLLPUBLIC void open(); // needed by other plugins, so export
+ static VCLPLUG_GEN_PUBLIC void open(); // needed by other plugins, so export
static void close();
static bool checkDocumentsSaved();
@@ -69,7 +70,7 @@ public:
static void interactionDone( bool bCancelShutdown );
static String getExecName();
- static VCL_DLLPUBLIC const ByteString& getSessionID();
+ static VCLPLUG_GEN_PUBLIC const ByteString& getSessionID();
};
class SalFrame;
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index e8620db29c6f..88f0e62024a9 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -32,12 +32,12 @@
#include <tools/string.hxx>
#endif
#include <tools/gen.hxx>
-#include <vcl/dllapi.h>
#ifndef _PREX_H
#include <tools/prex.h>
#include <X11/Xlib.h>
#include <tools/postx.h>
#endif
+#include <vclpluginapi.h>
#include <vector>
class SalDisplay;
@@ -45,7 +45,7 @@ class X11SalFrame;
namespace vcl_sal {
-class VCL_DLLPUBLIC WMAdaptor
+class VCLPLUG_GEN_PUBLIC WMAdaptor
{
public:
enum WMAtom {