[Libreoffice-commits] core.git: include/sal vcl/aqua vcl/coretext vcl/inc vcl/Library_vcl.mk vcl/osx vcl/Package_osxres.mk vcl/quartz vcl/README vcl/source
Tor Lillqvist
tml at collabora.com
Fri Dec 6 05:15:19 PST 2013
dev/null |binary
include/sal/log-areas.dox | 1
vcl/Library_vcl.mk | 124 -
vcl/Package_osxres.mk | 2
vcl/README | 10
vcl/aqua/source/a11y/aqua11yactionwrapper.h | 35
vcl/aqua/source/a11y/aqua11yactionwrapper.mm | 77
vcl/aqua/source/a11y/aqua11ycomponentwrapper.h | 39
vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm | 102 -
vcl/aqua/source/a11y/aqua11yfactory.mm | 219 --
vcl/aqua/source/a11y/aqua11yfocuslistener.cxx | 110 -
vcl/aqua/source/a11y/aqua11yfocuslistener.hxx | 54
vcl/aqua/source/a11y/aqua11yfocustracker.cxx | 284 --
vcl/aqua/source/a11y/aqua11ylistener.cxx | 153 -
vcl/aqua/source/a11y/aqua11yrolehelper.h | 36
vcl/aqua/source/a11y/aqua11yrolehelper.mm | 270 --
vcl/aqua/source/a11y/aqua11yselectionwrapper.h | 37
vcl/aqua/source/a11y/aqua11yselectionwrapper.mm | 88
vcl/aqua/source/a11y/aqua11ytablewrapper.h | 38
vcl/aqua/source/a11y/aqua11ytablewrapper.mm | 204 --
vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h | 32
vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm | 355 ---
vcl/aqua/source/a11y/aqua11ytextwrapper.h | 58
vcl/aqua/source/a11y/aqua11ytextwrapper.mm | 293 ---
vcl/aqua/source/a11y/aqua11yutil.h | 32
vcl/aqua/source/a11y/aqua11yutil.mm | 46
vcl/aqua/source/a11y/aqua11yvaluewrapper.h | 40
vcl/aqua/source/a11y/aqua11yvaluewrapper.mm | 87
vcl/aqua/source/a11y/aqua11ywrapper.mm | 1150 ------------
vcl/aqua/source/a11y/aqua11ywrapperbutton.h | 35
vcl/aqua/source/a11y/aqua11ywrapperbutton.mm | 54
vcl/aqua/source/a11y/aqua11ywrappercheckbox.h | 35
vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm | 58
vcl/aqua/source/a11y/aqua11ywrappercombobox.h | 44
vcl/aqua/source/a11y/aqua11ywrappercombobox.mm | 155 -
vcl/aqua/source/a11y/aqua11ywrappergroup.h | 34
vcl/aqua/source/a11y/aqua11ywrappergroup.mm | 49
vcl/aqua/source/a11y/aqua11ywrapperlist.h | 33
vcl/aqua/source/a11y/aqua11ywrapperlist.mm | 40
vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h | 35
vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm | 57
vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h | 33
vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm | 40
vcl/aqua/source/a11y/aqua11ywrapperrow.h | 34
vcl/aqua/source/a11y/aqua11ywrapperrow.mm | 49
vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h | 35
vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm | 77
vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h | 33
vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm | 43
vcl/aqua/source/a11y/aqua11ywrappersplitter.h | 33
vcl/aqua/source/a11y/aqua11ywrappersplitter.mm | 40
vcl/aqua/source/a11y/aqua11ywrapperstatictext.h | 34
vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm | 48
vcl/aqua/source/a11y/aqua11ywrappertabgroup.h | 33
vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm | 42
vcl/aqua/source/a11y/aqua11ywrappertextarea.h | 33
vcl/aqua/source/a11y/aqua11ywrappertextarea.mm | 40
vcl/aqua/source/a11y/aqua11ywrappertoolbar.h | 33
vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm | 42
vcl/aqua/source/a11y/documentfocuslistener.cxx | 241 --
vcl/aqua/source/a11y/documentfocuslistener.hxx | 91
vcl/aqua/source/a11y/readme.txt | 8
vcl/aqua/source/app/saldata.cxx | 265 --
vcl/aqua/source/app/salinst.cxx | 1207 ------------
vcl/aqua/source/app/salnstimer.mm | 48
vcl/aqua/source/app/salsys.cxx | 190 --
vcl/aqua/source/app/saltimer.cxx | 126 -
vcl/aqua/source/app/vclnsapp.mm | 517 -----
vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 741 -------
vcl/aqua/source/dtrans/DataFlavorMapping.hxx | 141 -
vcl/aqua/source/dtrans/DragActionConversion.cxx | 86
vcl/aqua/source/dtrans/DragActionConversion.hxx | 40
vcl/aqua/source/dtrans/DragSource.cxx | 372 ---
vcl/aqua/source/dtrans/DragSource.hxx | 136 -
vcl/aqua/source/dtrans/DragSourceContext.cxx | 61
vcl/aqua/source/dtrans/DragSourceContext.hxx | 61
vcl/aqua/source/dtrans/DropTarget.cxx | 596 ------
vcl/aqua/source/dtrans/DropTarget.hxx | 163 -
vcl/aqua/source/dtrans/HtmlFmtFlt.cxx | 168 -
vcl/aqua/source/dtrans/HtmlFmtFlt.hxx | 41
vcl/aqua/source/dtrans/OSXTransferable.cxx | 203 --
vcl/aqua/source/dtrans/OSXTransferable.hxx | 90
vcl/aqua/source/dtrans/PictToBmpFlt.cxx | 76
vcl/aqua/source/dtrans/PictToBmpFlt.hxx | 39
vcl/aqua/source/dtrans/aqua_clipboard.cxx | 372 ---
vcl/aqua/source/dtrans/aqua_clipboard.hxx | 175 -
vcl/aqua/source/dtrans/service_entry.cxx | 68
vcl/aqua/source/gdi/aquaprintaccessoryview.mm | 1381 --------------
vcl/aqua/source/gdi/aquaprintview.mm | 75
vcl/aqua/source/gdi/salgdicommon.cxx | 1755 ------------------
vcl/aqua/source/gdi/salgdiutils.cxx | 299 ---
vcl/aqua/source/gdi/salmathutils.cxx | 154 -
vcl/aqua/source/gdi/salnativewidgets.cxx | 1462 ---------------
vcl/aqua/source/gdi/salprn.cxx | 755 -------
vcl/aqua/source/gdi/salvd.cxx | 261 --
vcl/aqua/source/res/MainMenu.nib/classes.nib | 4
vcl/aqua/source/res/MainMenu.nib/info.nib | 21
vcl/aqua/source/window/salframe.cxx | 1769 ------------------
vcl/aqua/source/window/salframeview.mm | 1805 -------------------
vcl/aqua/source/window/salmenu.cxx | 963 ----------
vcl/aqua/source/window/salnsmenu.mm | 207 --
vcl/aqua/source/window/salobj.cxx | 206 --
vcl/coretext/ctfonts.cxx | 478 -----
vcl/coretext/ctfonts.hxx | 28
vcl/coretext/ctlayout.cxx | 501 -----
vcl/coretext/salgdi.cxx | 889 ---------
vcl/inc/aqua/aqua11yfactory.h | 41
vcl/inc/aqua/aqua11yfocustracker.hxx | 100 -
vcl/inc/aqua/aqua11ylistener.hxx | 58
vcl/inc/aqua/aqua11ywrapper.h | 110 -
vcl/inc/aqua/aquaprintview.h | 61
vcl/inc/aqua/aquavcltypes.h | 30
vcl/inc/aqua/keyboardfocuslistener.hxx | 38
vcl/inc/aqua/saldata.hxx | 120 -
vcl/inc/aqua/salframe.h | 217 --
vcl/inc/aqua/salframeview.h | 208 --
vcl/inc/aqua/salinst.h | 175 -
vcl/inc/aqua/salmathutils.hxx | 81
vcl/inc/aqua/salmenu.h | 114 -
vcl/inc/aqua/salnativewidgets.h | 64
vcl/inc/aqua/salnsmenu.h | 62
vcl/inc/aqua/salnstimer.h | 34
vcl/inc/aqua/salobj.h | 75
vcl/inc/aqua/salprn.h | 165 -
vcl/inc/aqua/salsys.h | 51
vcl/inc/aqua/saltimer.h | 48
vcl/inc/aqua/salvd.h | 85
vcl/inc/aqua/svsys.h | 29
vcl/inc/aqua/vclnsapp.h | 68
vcl/inc/coretext/common.h | 53
vcl/inc/coretext/salgdi.h | 433 ----
vcl/inc/headless/svpframe.hxx | 2
vcl/inc/headless/svpgdi.hxx | 2
vcl/inc/osx/a11yfactory.h | 42
vcl/inc/osx/a11yfocustracker.hxx | 100 +
vcl/inc/osx/a11ylistener.hxx | 58
vcl/inc/osx/a11ywrapper.h | 110 +
vcl/inc/osx/keyboardfocuslistener.hxx | 39
vcl/inc/osx/osxvcltypes.h | 30
vcl/inc/osx/printview.h | 60
vcl/inc/osx/saldata.hxx | 120 +
vcl/inc/osx/salframe.h | 217 ++
vcl/inc/osx/salframeview.h | 208 ++
vcl/inc/osx/salinst.h | 175 +
vcl/inc/osx/salmenu.h | 114 +
vcl/inc/osx/salnativewidgets.h | 64
vcl/inc/osx/salnsmenu.h | 61
vcl/inc/osx/salnstimer.h | 35
vcl/inc/osx/salobj.h | 75
vcl/inc/osx/salprn.h | 165 +
vcl/inc/osx/salsys.h | 51
vcl/inc/osx/saltimer.h | 48
vcl/inc/osx/salvd.h | 85
vcl/inc/osx/svsys.h | 29
vcl/inc/osx/vclnsapp.h | 68
vcl/inc/quartz/common.h | 53
vcl/inc/quartz/salbmp.h | 2
vcl/inc/quartz/salgdi.h | 433 ++++
vcl/inc/quartz/salmathutils.hxx | 81
vcl/inc/saldatabasic.hxx | 2
vcl/inc/svsys.h | 2
vcl/osx/DataFlavorMapping.cxx | 741 +++++++
vcl/osx/DataFlavorMapping.hxx | 141 +
vcl/osx/DragActionConversion.cxx | 86
vcl/osx/DragActionConversion.hxx | 40
vcl/osx/DragSource.cxx | 372 +++
vcl/osx/DragSource.hxx | 135 +
vcl/osx/DragSourceContext.cxx | 61
vcl/osx/DragSourceContext.hxx | 59
vcl/osx/DropTarget.cxx | 596 ++++++
vcl/osx/DropTarget.hxx | 163 +
vcl/osx/HtmlFmtFlt.cxx | 168 +
vcl/osx/HtmlFmtFlt.hxx | 41
vcl/osx/OSXTransferable.cxx | 203 ++
vcl/osx/OSXTransferable.hxx | 90
vcl/osx/PictToBmpFlt.cxx | 76
vcl/osx/PictToBmpFlt.hxx | 39
vcl/osx/README.a11y | 7
vcl/osx/a11yactionwrapper.h | 35
vcl/osx/a11yactionwrapper.mm | 77
vcl/osx/a11ycomponentwrapper.h | 39
vcl/osx/a11ycomponentwrapper.mm | 102 +
vcl/osx/a11yfactory.mm | 219 ++
vcl/osx/a11yfocuslistener.cxx | 110 +
vcl/osx/a11yfocuslistener.hxx | 54
vcl/osx/a11yfocustracker.cxx | 284 ++
vcl/osx/a11ylistener.cxx | 153 +
vcl/osx/a11yrolehelper.h | 36
vcl/osx/a11yrolehelper.mm | 270 ++
vcl/osx/a11yselectionwrapper.h | 37
vcl/osx/a11yselectionwrapper.mm | 88
vcl/osx/a11ytablewrapper.h | 38
vcl/osx/a11ytablewrapper.mm | 204 ++
vcl/osx/a11ytextattributeswrapper.h | 32
vcl/osx/a11ytextattributeswrapper.mm | 355 +++
vcl/osx/a11ytextwrapper.h | 58
vcl/osx/a11ytextwrapper.mm | 293 +++
vcl/osx/a11yutil.h | 32
vcl/osx/a11yutil.mm | 46
vcl/osx/a11yvaluewrapper.h | 40
vcl/osx/a11yvaluewrapper.mm | 87
vcl/osx/a11ywrapper.mm | 1150 ++++++++++++
vcl/osx/a11ywrapperbutton.h | 35
vcl/osx/a11ywrapperbutton.mm | 54
vcl/osx/a11ywrappercheckbox.h | 35
vcl/osx/a11ywrappercheckbox.mm | 58
vcl/osx/a11ywrappercombobox.h | 44
vcl/osx/a11ywrappercombobox.mm | 155 +
vcl/osx/a11ywrappergroup.h | 34
vcl/osx/a11ywrappergroup.mm | 49
vcl/osx/a11ywrapperlist.h | 33
vcl/osx/a11ywrapperlist.mm | 40
vcl/osx/a11ywrapperradiobutton.h | 35
vcl/osx/a11ywrapperradiobutton.mm | 57
vcl/osx/a11ywrapperradiogroup.h | 33
vcl/osx/a11ywrapperradiogroup.mm | 40
vcl/osx/a11ywrapperrow.h | 34
vcl/osx/a11ywrapperrow.mm | 49
vcl/osx/a11ywrapperscrollarea.h | 35
vcl/osx/a11ywrapperscrollarea.mm | 77
vcl/osx/a11ywrapperscrollbar.h | 33
vcl/osx/a11ywrapperscrollbar.mm | 43
vcl/osx/a11ywrappersplitter.h | 33
vcl/osx/a11ywrappersplitter.mm | 40
vcl/osx/a11ywrapperstatictext.h | 34
vcl/osx/a11ywrapperstatictext.mm | 48
vcl/osx/a11ywrappertabgroup.h | 33
vcl/osx/a11ywrappertabgroup.mm | 42
vcl/osx/a11ywrappertextarea.h | 33
vcl/osx/a11ywrappertextarea.mm | 40
vcl/osx/a11ywrappertoolbar.h | 33
vcl/osx/a11ywrappertoolbar.mm | 42
vcl/osx/clipboard.cxx | 372 +++
vcl/osx/clipboard.hxx | 175 +
vcl/osx/documentfocuslistener.cxx | 241 ++
vcl/osx/documentfocuslistener.hxx | 92
vcl/osx/printaccessoryview.mm | 1381 ++++++++++++++
vcl/osx/printview.mm | 75
vcl/osx/res/MainMenu.nib/classes.nib | 4
vcl/osx/res/MainMenu.nib/info.nib | 21
vcl/osx/res/MainMenu.nib/keyedobjects.nib |binary
vcl/osx/res/cursors/airbrush.png |binary
vcl/osx/res/cursors/ase.png |binary
vcl/osx/res/cursors/asn.png |binary
vcl/osx/res/cursors/asne.png |binary
vcl/osx/res/cursors/asns.png |binary
vcl/osx/res/cursors/asnswe.png |binary
vcl/osx/res/cursors/asnw.png |binary
vcl/osx/res/cursors/ass.png |binary
vcl/osx/res/cursors/asse.png |binary
vcl/osx/res/cursors/assw.png |binary
vcl/osx/res/cursors/asw.png |binary
vcl/osx/res/cursors/aswe.png |binary
vcl/osx/res/cursors/chain.png |binary
vcl/osx/res/cursors/chainnot.png |binary
vcl/osx/res/cursors/chart.png |binary
vcl/osx/res/cursors/copydata.png |binary
vcl/osx/res/cursors/copydlnk.png |binary
vcl/osx/res/cursors/copyf.png |binary
vcl/osx/res/cursors/copyf2.png |binary
vcl/osx/res/cursors/copyflnk.png |binary
vcl/osx/res/cursors/crook.png |binary
vcl/osx/res/cursors/crop.png |binary
vcl/osx/res/cursors/darc.png |binary
vcl/osx/res/cursors/dbezier.png |binary
vcl/osx/res/cursors/dcapt.png |binary
vcl/osx/res/cursors/dcirccut.png |binary
vcl/osx/res/cursors/dconnect.png |binary
vcl/osx/res/cursors/dellipse.png |binary
vcl/osx/res/cursors/detectiv.png |binary
vcl/osx/res/cursors/dfree.png |binary
vcl/osx/res/cursors/dline.png |binary
vcl/osx/res/cursors/dpie.png |binary
vcl/osx/res/cursors/dpolygon.png |binary
vcl/osx/res/cursors/drect.png |binary
vcl/osx/res/cursors/dtext.png |binary
vcl/osx/res/cursors/fill.png |binary
vcl/osx/res/cursors/help.png |binary
vcl/osx/res/cursors/hourglass.png |binary
vcl/osx/res/cursors/hshear.png |binary
vcl/osx/res/cursors/linkdata.png |binary
vcl/osx/res/cursors/linkf.png |binary
vcl/osx/res/cursors/magnify.png |binary
vcl/osx/res/cursors/mirror.png |binary
vcl/osx/res/cursors/movebw.png |binary
vcl/osx/res/cursors/movedata.png |binary
vcl/osx/res/cursors/movedlnk.png |binary
vcl/osx/res/cursors/movef.png |binary
vcl/osx/res/cursors/movef2.png |binary
vcl/osx/res/cursors/moveflnk.png |binary
vcl/osx/res/cursors/movept.png |binary
vcl/osx/res/cursors/neswsize.png |binary
vcl/osx/res/cursors/notallow.png |binary
vcl/osx/res/cursors/nullptr.png |binary
vcl/osx/res/cursors/nwsesize.png |binary
vcl/osx/res/cursors/pen.png |binary
vcl/osx/res/cursors/pivotcol.png |binary
vcl/osx/res/cursors/pivotdel.png |binary
vcl/osx/res/cursors/pivotfld.png |binary
vcl/osx/res/cursors/pivotrow.png |binary
vcl/osx/res/cursors/pntbrsh.png |binary
vcl/osx/res/cursors/rotate.png |binary
vcl/osx/res/cursors/tblsele.png |binary
vcl/osx/res/cursors/tblsels.png |binary
vcl/osx/res/cursors/tblselse.png |binary
vcl/osx/res/cursors/tblselsw.png |binary
vcl/osx/res/cursors/tblselw.png |binary
vcl/osx/res/cursors/timemove.png |binary
vcl/osx/res/cursors/timesize.png |binary
vcl/osx/res/cursors/vshear.png |binary
vcl/osx/res/cursors/vtext.png |binary
vcl/osx/saldata.cxx | 265 ++
vcl/osx/salframe.cxx | 1769 ++++++++++++++++++
vcl/osx/salframeview.mm | 1805 +++++++++++++++++++
vcl/osx/salinst.cxx | 1207 ++++++++++++
vcl/osx/salmenu.cxx | 963 ++++++++++
vcl/osx/salnativewidgets.cxx | 1462 +++++++++++++++
vcl/osx/salnsmenu.mm | 207 ++
vcl/osx/salnstimer.mm | 48
vcl/osx/salobj.cxx | 206 ++
vcl/osx/salprn.cxx | 755 +++++++
vcl/osx/salsys.cxx | 190 ++
vcl/osx/saltimer.cxx | 126 +
vcl/osx/salvd.cxx | 261 ++
vcl/osx/service_entry.cxx | 68
vcl/osx/vclnsapp.mm | 517 +++++
vcl/quartz/ctfonts.cxx | 478 +++++
vcl/quartz/ctfonts.hxx | 28
vcl/quartz/ctlayout.cxx | 501 +++++
vcl/quartz/salbmp.cxx | 2
vcl/quartz/salgdi.cxx | 889 +++++++++
vcl/quartz/salgdicommon.cxx | 1755 ++++++++++++++++++
vcl/quartz/salgdiutils.cxx | 299 +++
vcl/quartz/salmathutils.cxx | 154 +
vcl/source/app/svapp.cxx | 2
vcl/source/app/svmainhook.cxx | 2
vcl/source/control/edit.cxx | 8
vcl/source/control/scrbar.cxx | 4
vcl/source/control/spinfld.cxx | 2
vcl/source/window/brdwin.cxx | 6
vcl/source/window/window.cxx | 2
341 files changed, 27133 insertions(+), 27130 deletions(-)
New commits:
commit c49721950cb3d897b35f08bf871239308680b18e
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Dec 5 22:01:05 2013 +0200
Re-organize OS X and iOS code in vcl a bit
Now with the ATSUI code gone is a good time for some
re-organisation. Get rid of "aqua" in file names and the separate
"coretext" folders. CoreText is all we use now for OS X (and has
always been so for iOS), so no need for a "coretext" folder, we can
keep the CoreText-using code under "quartz". Keep OS X -specific code
in "osx". Ditto for headers.
Keep "Aqua" as part of class names for now, though.
This is also preparation for planned further unification between OS X
and iOS code.
Change-Id: Ic60bd73fea4ab98183e7c8a09c7d3f66b9a34223
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 3463a05..3d916e6 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -346,6 +346,7 @@ certain functionality.
@li @c vcl.kde4 - KDE4
@li @c vcl.layout - Widget layout
@li @c vcl.plugadapt - the Unix/X11 backend plugin mechanism
+ at li @c vcl.osx.print
@li @c vcl.scrollbar - Scroll Bars
@li @c vcl.sm - Session Manager
@li @c vcl.unity
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index fb7816f..72d665a 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -341,9 +341,9 @@ vcl_quartz_code= \
vcl/quartz/utils \
vcl_coretext_code= \
- vcl/coretext/ctfonts \
- vcl/coretext/ctlayout \
- vcl/coretext/salgdi \
+ vcl/quartz/ctfonts \
+ vcl/quartz/ctlayout \
+ vcl/quartz/salgdi \
# GUIBASE specific stuff
@@ -366,68 +366,68 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
))
$(eval $(call gb_Library_add_objcxxobjects,vcl,\
- vcl/aqua/source/a11y/aqua11yactionwrapper \
- vcl/aqua/source/a11y/aqua11ycomponentwrapper \
- vcl/aqua/source/a11y/aqua11yfactory \
- vcl/aqua/source/a11y/aqua11yrolehelper \
- vcl/aqua/source/a11y/aqua11yselectionwrapper \
- vcl/aqua/source/a11y/aqua11ytablewrapper \
- vcl/aqua/source/a11y/aqua11ytextattributeswrapper \
- vcl/aqua/source/a11y/aqua11ytextwrapper \
- vcl/aqua/source/a11y/aqua11yutil \
- vcl/aqua/source/a11y/aqua11yvaluewrapper \
- vcl/aqua/source/a11y/aqua11ywrapper \
- vcl/aqua/source/a11y/aqua11ywrapperbutton \
- vcl/aqua/source/a11y/aqua11ywrappercheckbox \
- vcl/aqua/source/a11y/aqua11ywrappercombobox \
- vcl/aqua/source/a11y/aqua11ywrappergroup \
- vcl/aqua/source/a11y/aqua11ywrapperlist \
- vcl/aqua/source/a11y/aqua11ywrapperradiobutton \
- vcl/aqua/source/a11y/aqua11ywrapperradiogroup \
- vcl/aqua/source/a11y/aqua11ywrapperrow \
- vcl/aqua/source/a11y/aqua11ywrapperscrollarea \
- vcl/aqua/source/a11y/aqua11ywrapperscrollbar \
- vcl/aqua/source/a11y/aqua11ywrappersplitter \
- vcl/aqua/source/a11y/aqua11ywrapperstatictext \
- vcl/aqua/source/a11y/aqua11ywrappertabgroup \
- vcl/aqua/source/a11y/aqua11ywrappertextarea \
- vcl/aqua/source/a11y/aqua11ywrappertoolbar \
- vcl/aqua/source/app/salnstimer \
- vcl/aqua/source/app/vclnsapp \
- vcl/aqua/source/gdi/aquaprintaccessoryview \
- vcl/aqua/source/gdi/aquaprintview \
- vcl/aqua/source/window/salframeview \
- vcl/aqua/source/window/salnsmenu \
+ vcl/osx/a11yactionwrapper \
+ vcl/osx/a11ycomponentwrapper \
+ vcl/osx/a11yfactory \
+ vcl/osx/a11yrolehelper \
+ vcl/osx/a11yselectionwrapper \
+ vcl/osx/a11ytablewrapper \
+ vcl/osx/a11ytextattributeswrapper \
+ vcl/osx/a11ytextwrapper \
+ vcl/osx/a11yutil \
+ vcl/osx/a11yvaluewrapper \
+ vcl/osx/a11ywrapper \
+ vcl/osx/a11ywrapperbutton \
+ vcl/osx/a11ywrappercheckbox \
+ vcl/osx/a11ywrappercombobox \
+ vcl/osx/a11ywrappergroup \
+ vcl/osx/a11ywrapperlist \
+ vcl/osx/a11ywrapperradiobutton \
+ vcl/osx/a11ywrapperradiogroup \
+ vcl/osx/a11ywrapperrow \
+ vcl/osx/a11ywrapperscrollarea \
+ vcl/osx/a11ywrapperscrollbar \
+ vcl/osx/a11ywrappersplitter \
+ vcl/osx/a11ywrapperstatictext \
+ vcl/osx/a11ywrappertabgroup \
+ vcl/osx/a11ywrappertextarea \
+ vcl/osx/a11ywrappertoolbar \
+ vcl/osx/salnstimer \
+ vcl/osx/vclnsapp \
+ vcl/osx/printaccessoryview \
+ vcl/osx/printview \
+ vcl/osx/salframeview \
+ vcl/osx/salnsmenu \
))
$(eval $(call gb_Library_add_exception_objects,vcl,\
- vcl/aqua/source/a11y/aqua11yfocuslistener \
- vcl/aqua/source/a11y/aqua11yfocustracker \
- vcl/aqua/source/a11y/aqua11ylistener \
- vcl/aqua/source/a11y/documentfocuslistener \
- vcl/aqua/source/app/saldata \
- vcl/aqua/source/app/salinst \
- vcl/aqua/source/app/salsys \
- vcl/aqua/source/app/saltimer \
- vcl/aqua/source/dtrans/DataFlavorMapping \
- vcl/aqua/source/dtrans/DragActionConversion \
- vcl/aqua/source/dtrans/DragSource \
- vcl/aqua/source/dtrans/DragSourceContext \
- vcl/aqua/source/dtrans/DropTarget \
- vcl/aqua/source/dtrans/HtmlFmtFlt \
- vcl/aqua/source/dtrans/OSXTransferable \
- vcl/aqua/source/dtrans/PictToBmpFlt \
- vcl/aqua/source/dtrans/aqua_clipboard \
- vcl/aqua/source/dtrans/service_entry \
+ vcl/osx/a11yfocuslistener \
+ vcl/osx/a11yfocustracker \
+ vcl/osx/a11ylistener \
+ vcl/osx/documentfocuslistener \
+ vcl/osx/saldata \
+ vcl/osx/salinst \
+ vcl/osx/salsys \
+ vcl/osx/saltimer \
+ vcl/osx/DataFlavorMapping \
+ vcl/osx/DragActionConversion \
+ vcl/osx/DragSource \
+ vcl/osx/DragSourceContext \
+ vcl/osx/DropTarget \
+ vcl/osx/HtmlFmtFlt \
+ vcl/osx/OSXTransferable \
+ vcl/osx/PictToBmpFlt \
+ vcl/osx/clipboard \
+ vcl/osx/service_entry \
$(vcl_quartz_code) \
- vcl/aqua/source/gdi/salgdicommon \
- vcl/aqua/source/gdi/salgdiutils \
- vcl/aqua/source/gdi/salmathutils \
- vcl/aqua/source/gdi/salnativewidgets \
- vcl/aqua/source/gdi/salprn \
- vcl/aqua/source/gdi/salvd \
- vcl/aqua/source/window/salframe \
- vcl/aqua/source/window/salmenu \
- vcl/aqua/source/window/salobj \
+ vcl/quartz/salgdicommon \
+ vcl/quartz/salgdiutils \
+ vcl/quartz/salmathutils \
+ vcl/osx/salnativewidgets \
+ vcl/osx/salprn \
+ vcl/osx/salvd \
+ vcl/osx/salframe \
+ vcl/osx/salmenu \
+ vcl/osx/salobj \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
$(if $(filter X86_64,$(CPUNAME)),,QuickTime) \
diff --git a/vcl/Package_osxres.mk b/vcl/Package_osxres.mk
index bc669ee..224853f 100644
--- a/vcl/Package_osxres.mk
+++ b/vcl/Package_osxres.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,vcl_osxres,$(SRCDIR)/vcl/aqua/source/res))
+$(eval $(call gb_Package_Package,vcl_osxres,$(SRCDIR)/vcl/osx/res))
$(eval $(call gb_Package_add_files_with_dir,vcl_osxres,Resources,\
MainMenu.nib/classes.nib \
diff --git a/vcl/README b/vcl/README
index e386843..5d3a760 100644
--- a/vcl/README
+++ b/vcl/README
@@ -17,14 +17,16 @@ headless/
+ a backend renderer that draws to bitmaps
android/
- + Android backend (work in progress, does work to some extent)
+ + Android backend
-aqua/
+osx/
+ OS X backend
ios/
- + iOS backend (work in progres, does not work, needs re-think
- and re-write)
+ + iOS backend
+
+quartz/
+ + code common to OS X and iOS
win/
+ Windows backend
diff --git a/vcl/aqua/source/a11y/readme.txt b/vcl/aqua/source/a11y/readme.txt
deleted file mode 100644
index 19e80ab..0000000
--- a/vcl/aqua/source/a11y/readme.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Naming scheme:
-
-aqua11yXYZhelper: Helper class providing static methods
-
-aqua11yXYZwrapper: Wrapper around one (or two) UNO-interfaces
-
-aqua11ywrapperXYZ: Subclass of aqua11ywrapper for a specific AXRole
-
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index f5fe6dd..34bf77b 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -18,6 +18,7 @@
*/
#ifndef INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
+#define INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
#include <vcl/sysdata.hxx>
#include <basegfx/range/b2ibox.hxx>
@@ -135,6 +136,7 @@ public:
static SvpSalFrame* GetFocusFrame() { return s_pFocusFrame; }
};
+
#endif // INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index fc0e3c5..d04f020 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -27,7 +27,7 @@
#include "sallayout.hxx"
#ifdef IOS
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
#include <premac.h>
#include <CoreGraphics/CoreGraphics.h>
#include <postmac.h>
diff --git a/vcl/inc/aqua/aqua11yfactory.h b/vcl/inc/osx/a11yfactory.h
similarity index 91%
rename from vcl/inc/aqua/aqua11yfactory.h
rename to vcl/inc/osx/a11yfactory.h
index 2a4a7dc..c739f3e 100644
--- a/vcl/inc/aqua/aqua11yfactory.h
+++ b/vcl/inc/osx/a11yfactory.h
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H
-#define INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H
+#ifndef INCLUDED_VCL_INC_OSX_A11YFACTORY_H
+#define INCLUDED_VCL_INC_OSX_A11YFACTORY_H
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "osxvcltypes.h"
+#include "a11ywrapper.h"
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@interface AquaA11yFactory : NSObject
@@ -36,6 +36,7 @@
+(void)registerView: (NSView *) theView;
+(void)revokeView: (NSView *) theViewt;
@end
-#endif // INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H
+
+#endif // INCLUDED_VCL_INC_OSX_A11YFACTORY_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
similarity index 95%
rename from vcl/inc/aqua/aqua11yfocustracker.hxx
rename to vcl/inc/osx/a11yfocustracker.hxx
index 22896c2..22b37d2 100644
--- a/vcl/inc/aqua/aqua11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX
-#define INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX
+#ifndef INCLUDED_VCL_INC_OSX_A11YFOCUSTRACKER_HXX
+#define INCLUDED_VCL_INC_OSX_A11YFOCUSTRACKER_HXX
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -95,6 +95,6 @@ private:
const ::com::sun::star::uno::Reference< DocumentFocusListener > m_xDocumentFocusListener;
};
-#endif // INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX
+#endif // INCLUDED_VCL_INC_OSX_A11YFOCUSTRACKER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx
similarity index 90%
rename from vcl/inc/aqua/aqua11ylistener.hxx
rename to vcl/inc/osx/a11ylistener.hxx
index 97c71ef..8f7176d 100644
--- a/vcl/inc/aqua/aqua11ylistener.hxx
+++ b/vcl/inc/osx/a11ylistener.hxx
@@ -17,14 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX
-#define INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX
+#ifndef INCLUDED_VCL_INC_OSX_A11YLISTENER_HXX
+#define INCLUDED_VCL_INC_OSX_A11YLISTENER_HXX
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <cppuhelper/implbase1.hxx>
-#include "aqua11yfocustracker.hxx"
-#include "aquavcltypes.h"
+#include "a11yfocustracker.hxx"
+#include "osxvcltypes.h"
#include <set>
#include <com/sun/star/awt/Rectangle.hpp>
@@ -54,5 +54,5 @@ private:
::com::sun::star::awt::Rectangle m_oldBounds;
};
-#endif // INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX
+#endif // INCLUDED_VCL_INC_OSX_A11YLISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11ywrapper.h b/vcl/inc/osx/a11ywrapper.h
similarity index 97%
rename from vcl/inc/aqua/aqua11ywrapper.h
rename to vcl/inc/osx/a11ywrapper.h
index 95edcae..7f291b4 100644
--- a/vcl/inc/aqua/aqua11ywrapper.h
+++ b/vcl/inc/osx/a11ywrapper.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H
-#define INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H
+#ifndef INCLUDED_VCL_INC_OSX_A11YWRAPPER_H
+#define INCLUDED_VCL_INC_OSX_A11YWRAPPER_H
-#include "aquavcltypes.h"
+#include "osxvcltypes.h"
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
@@ -105,6 +105,6 @@ struct ReferenceWrapper
-(::com::sun::star::accessibility::XAccessibleTextMarkup *)accessibleTextMarkup;
@end
-#endif // INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H
+#endif // INCLUDED_VCL_INC_OSX_A11YWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/keyboardfocuslistener.hxx b/vcl/inc/osx/keyboardfocuslistener.hxx
similarity index 88%
rename from vcl/inc/aqua/keyboardfocuslistener.hxx
rename to vcl/inc/osx/keyboardfocuslistener.hxx
index 45979e2..3c13f77 100644
--- a/vcl/inc/aqua/keyboardfocuslistener.hxx
+++ b/vcl/inc/osx/keyboardfocuslistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX
-#define INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX
+#ifndef INCLUDED_VCL_INC_OSX_KEYBOARDFOCUSLISTENER_HXX
+#define INCLUDED_VCL_INC_OSX_KEYBOARDFOCUSLISTENER_HXX
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -34,5 +34,6 @@ public:
virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) = 0;
};
-#endif // INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX
+#endif // INCLUDED_VCL_INC_OSX_KEYBOARDFOCUSLISTENER_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aquavcltypes.h b/vcl/inc/osx/osxvcltypes.h
similarity index 88%
rename from vcl/inc/aqua/aquavcltypes.h
rename to vcl/inc/osx/osxvcltypes.h
index 5101a5a..f1659c4 100644
--- a/vcl/inc/aqua/aquavcltypes.h
+++ b/vcl/inc/osx/osxvcltypes.h
@@ -17,14 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H
-#define INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H
+#ifndef INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H
+#define INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H
#include "premac.h"
#import <Cocoa/Cocoa.h>
#import <AppKit/NSEvent.h>
#include "postmac.h"
-#endif // INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H
+#endif // INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aquaprintview.h b/vcl/inc/osx/printview.h
similarity index 93%
rename from vcl/inc/aqua/aquaprintview.h
rename to vcl/inc/osx/printview.h
index fbd8077..e396bd8 100644
--- a/vcl/inc/aqua/aquaprintview.h
+++ b/vcl/inc/osx/printview.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_AQUAPRINTVIEW_H
-#define INCLUDED_VCL_INC_AQUA_AQUAPRINTVIEW_H
+#ifndef INCLUDED_VCL_INC_OSX_PRINTVIEW_H
+#define INCLUDED_VCL_INC_OSX_PRINTVIEW_H
#include "premac.h"
#include <Cocoa/Cocoa.h>
@@ -55,7 +55,6 @@ struct PrintAccessoryViewState
+(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController withState: (PrintAccessoryViewState*)pState;
@end
-
-#endif
+#endif // INCLUDED_VCL_INC_OSX_PRINTVIEW_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/osx/saldata.hxx
similarity index 97%
rename from vcl/inc/aqua/saldata.hxx
rename to vcl/inc/osx/saldata.hxx
index 74e10f5..c9c44bf 100644
--- a/vcl/inc/aqua/saldata.hxx
+++ b/vcl/inc/osx/saldata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALDATA_HXX
-#define INCLUDED_VCL_INC_AQUA_SALDATA_HXX
+#ifndef INCLUDED_VCL_INC_OSX_SALDATA_HXX
+#define INCLUDED_VCL_INC_OSX_SALDATA_HXX
#include <config_features.h>
@@ -115,6 +115,6 @@ sal_Bool ImplSalYieldMutexTryToAcquire();
void ImplSalYieldMutexAcquire();
void ImplSalYieldMutexRelease();
-#endif // INCLUDED_VCL_INC_AQUA_SALDATA_HXX
+#endif // INCLUDED_VCL_INC_OSX_SALDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/osx/salframe.h
similarity index 97%
rename from vcl/inc/aqua/salframe.h
rename to vcl/inc/osx/salframe.h
index 06a8270..464a54a 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALFRAME_H
-#define INCLUDED_VCL_INC_AQUA_SALFRAME_H
+#ifndef INCLUDED_VCL_INC_OSX_SALFRAME_H
+#define INCLUDED_VCL_INC_OSX_SALFRAME_H
#include <premac.h>
#include <IOKit/pwr_mgt/IOPMLib.h>
@@ -26,9 +26,9 @@
#include "vcl/sysdata.hxx"
-#include "aqua/salmenu.h"
-#include "aqua/saldata.hxx"
-#include "aqua/aquavcltypes.h"
+#include "osx/salmenu.h"
+#include "osx/saldata.hxx"
+#include "osx/osxvcltypes.h"
#include "salframe.hxx"
@@ -212,6 +212,6 @@ public:
AquaSalFrame& operator=(const AquaSalFrame&);
};
-#endif // INCLUDED_VCL_INC_AQUA_SALFRAME_H
+#endif // INCLUDED_VCL_INC_OSX_SALFRAME_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salframeview.h b/vcl/inc/osx/salframeview.h
similarity index 98%
rename from vcl/inc/aqua/salframeview.h
rename to vcl/inc/osx/salframeview.h
index 4be71b3..3217499 100644
--- a/vcl/inc/aqua/salframeview.h
+++ b/vcl/inc/osx/salframeview.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALFRAMEVIEW_H
-#define INCLUDED_VCL_INC_AQUA_SALFRAMEVIEW_H
+#ifndef INCLUDED_VCL_INC_OSX_SALFRAMEVIEW_H
+#define INCLUDED_VCL_INC_OSX_SALFRAMEVIEW_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface SalFrameWindow : NSWindow
{
@@ -203,6 +203,6 @@
@end
-#endif
+#endif // INCLUDED_VCL_INC_OSX_SALFRAMEVIEW_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salinst.h b/vcl/inc/osx/salinst.h
similarity index 97%
rename from vcl/inc/aqua/salinst.h
rename to vcl/inc/osx/salinst.h
index 2e6045b..62b7f85 100644
--- a/vcl/inc/aqua/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -17,15 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALINST_H
-#define INCLUDED_VCL_INC_AQUA_SALINST_H
+#ifndef INCLUDED_VCL_INC_OSX_SALINST_H
+#define INCLUDED_VCL_INC_OSX_SALINST_H
#include "comphelper/solarmutex.hxx"
#include "osl/thread.hxx"
#include "osl/conditn.h"
#include <vcl/solarmutex.hxx>
-#include "aqua/aquavcltypes.h"
+#include "osx/osxvcltypes.h"
#include "salinst.hxx"
@@ -170,6 +170,6 @@ class YieldMutexReleaser
CGImageRef CreateCGImage( const Image& );
NSImage* CreateNSImage( const Image& );
-#endif // INCLUDED_VCL_INC_AQUA_SALINST_H
+#endif // INCLUDED_VCL_INC_OSX_SALINST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salmenu.h b/vcl/inc/osx/salmenu.h
similarity index 97%
rename from vcl/inc/aqua/salmenu.h
rename to vcl/inc/osx/salmenu.h
index 4be94ea..925a339 100644
--- a/vcl/inc/aqua/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALMENU_H
-#define INCLUDED_VCL_INC_AQUA_SALMENU_H
+#ifndef INCLUDED_VCL_INC_OSX_SALMENU_H
+#define INCLUDED_VCL_INC_OSX_SALMENU_H
#include "premac.h"
#include <Cocoa/Cocoa.h>
@@ -109,6 +109,6 @@ public:
NSMenuItem* mpMenuItem; // The NSMenuItem
};
-#endif // INCLUDED_VCL_INC_AQUA_SALMENU_H
+#endif // INCLUDED_VCL_INC_OSX_SALMENU_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salnativewidgets.h b/vcl/inc/osx/salnativewidgets.h
similarity index 92%
rename from vcl/inc/aqua/salnativewidgets.h
rename to vcl/inc/osx/salnativewidgets.h
index 5c67a82..2a98762 100644
--- a/vcl/inc/aqua/salnativewidgets.h
+++ b/vcl/inc/osx/salnativewidgets.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H
-#define INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H
+#ifndef INCLUDED_VCL_INC_OSX_SALNATIVEWIDGETS_H
+#define INCLUDED_VCL_INC_OSX_SALNATIVEWIDGETS_H
// since 10.4 ... no metrics are returned, and we have to fix the values
#define BUTTON_WIDTH 16
@@ -59,6 +59,6 @@
#define CLIP_FUZZ 1
-#endif // INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H
+#endif // INCLUDED_VCL_INC_OSX_SALNATIVEWIDGETS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salnsmenu.h b/vcl/inc/osx/salnsmenu.h
similarity index 93%
rename from vcl/inc/aqua/salnsmenu.h
rename to vcl/inc/osx/salnsmenu.h
index 5859612..47c410b 100644
--- a/vcl/inc/aqua/salnsmenu.h
+++ b/vcl/inc/osx/salnsmenu.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALNSMENU_H
-#define INCLUDED_VCL_INC_AQUA_SALNSMENU_H
+#ifndef INCLUDED_VCL_INC_OSX_SALNSMENU_H
+#define INCLUDED_VCL_INC_OSX_SALNSMENU_H
class AquaSalMenu;
class AquaSalMenuItem;
@@ -56,7 +56,6 @@ class AquaSalMenuItem;
-(void)menuItemTriggered: (id)aSender;
@end
-
-#endif
+#endif // INCLUDED_VCL_INC_OSX_SALNSMENU_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salnstimer.h b/vcl/inc/osx/salnstimer.h
similarity index 89%
rename from vcl/inc/aqua/salnstimer.h
rename to vcl/inc/osx/salnstimer.h
index 3d05fc8..cce2746 100644
--- a/vcl/inc/aqua/salnstimer.h
+++ b/vcl/inc/osx/salnstimer.h
@@ -16,8 +16,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALNSTIMER_H
-#define INCLUDED_VCL_INC_AQUA_SALNSTIMER_H
+
+#ifndef INCLUDED_VCL_INC_OSX_SALNSTIMER_H
+#define INCLUDED_VCL_INC_OSX_SALNSTIMER_H
#include "premac.h"
#include "Cocoa/Cocoa.h"
@@ -29,6 +30,6 @@
-(void)timerElapsed:(NSTimer*)pTimer;
@end
-#endif
+#endif // INCLUDED_VCL_INC_OSX_SALNSTIMER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salobj.h b/vcl/inc/osx/salobj.h
similarity index 95%
rename from vcl/inc/aqua/salobj.h
rename to vcl/inc/osx/salobj.h
index 0bd8282..397299c 100644
--- a/vcl/inc/aqua/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALOBJ_H
-#define INCLUDED_VCL_INC_AQUA_SALOBJ_H
+#ifndef INCLUDED_VCL_INC_OSX_SALOBJ_H
+#define INCLUDED_VCL_INC_OSX_SALOBJ_H
#include "vcl/sysdata.hxx"
#include "salobj.hxx"
@@ -70,6 +70,6 @@ public:
virtual const SystemEnvData* GetSystemData() const;
};
-#endif // INCLUDED_VCL_INC_AQUA_SALOBJ_H
+#endif // INCLUDED_VCL_INC_OSX_SALOBJ_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salprn.h b/vcl/inc/osx/salprn.h
similarity index 97%
rename from vcl/inc/aqua/salprn.h
rename to vcl/inc/osx/salprn.h
index cd8c326..906a61d 100644
--- a/vcl/inc/aqua/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALPRN_H
-#define INCLUDED_VCL_INC_AQUA_SALPRN_H
+#ifndef INCLUDED_VCL_INC_OSX_SALPRN_H
+#define INCLUDED_VCL_INC_OSX_SALPRN_H
-#include "aqua/aquavcltypes.h"
+#include "osx/osxvcltypes.h"
#include "salprn.hxx"
@@ -160,6 +160,6 @@ inline double TenMuToPt( double nUnits ) { return floor(((nUnits)/fPtTo100thMM)+
-#endif // INCLUDED_VCL_INC_AQUA_SALPRN_H
+#endif // INCLUDED_VCL_INC_OSX_SALPRN_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salsys.h b/vcl/inc/osx/salsys.h
similarity index 93%
rename from vcl/inc/aqua/salsys.h
rename to vcl/inc/osx/salsys.h
index e68bdbb..816cffc 100644
--- a/vcl/inc/aqua/salsys.h
+++ b/vcl/inc/osx/salsys.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALSYS_H
-#define INCLUDED_VCL_INC_AQUA_SALSYS_H
+#ifndef INCLUDED_VCL_INC_OSX_SALSYS_H
+#define INCLUDED_VCL_INC_OSX_SALSYS_H
#include "salsys.hxx"
@@ -46,6 +46,6 @@ public:
};
-#endif // INCLUDED_VCL_INC_AQUA_SALSYS_H
+#endif // INCLUDED_VCL_INC_OSX_SALSYS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/saltimer.h b/vcl/inc/osx/saltimer.h
similarity index 91%
rename from vcl/inc/aqua/saltimer.h
rename to vcl/inc/osx/saltimer.h
index e51740f..993a2ef 100644
--- a/vcl/inc/aqua/saltimer.h
+++ b/vcl/inc/osx/saltimer.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALTIMER_H
-#define INCLUDED_VCL_INC_AQUA_SALTIMER_H
+#ifndef INCLUDED_VCL_INC_OSX_SALTIMER_H
+#define INCLUDED_VCL_INC_OSX_SALTIMER_H
#include "premac.h"
#include <Cocoa/Cocoa.h>
@@ -43,6 +43,6 @@ class AquaSalTimer : public SalTimer
static bool bDispatchTimer;
};
-#endif
+#endif // INCLUDED_VCL_INC_OSX_SALTIMER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salvd.h b/vcl/inc/osx/salvd.h
similarity index 94%
rename from vcl/inc/aqua/salvd.h
rename to vcl/inc/osx/salvd.h
index 09e2a01..1c32ad4 100644
--- a/vcl/inc/aqua/salvd.h
+++ b/vcl/inc/osx/salvd.h
@@ -17,14 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALVD_H
-#define INCLUDED_VCL_INC_AQUA_SALVD_H
+#ifndef INCLUDED_VCL_INC_OSX_SALVD_H
+#define INCLUDED_VCL_INC_OSX_SALVD_H
#include "premac.h"
#include <ApplicationServices/ApplicationServices.h>
#include "postmac.h"
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
#include "salvd.hxx"
@@ -80,6 +80,6 @@ public:
// =======================================================================
-#endif // INCLUDED_VCL_INC_AQUA_SALVD_H
+#endif // INCLUDED_VCL_INC_OSX_SALVD_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/svsys.h b/vcl/inc/osx/svsys.h
similarity index 89%
rename from vcl/inc/aqua/svsys.h
rename to vcl/inc/osx/svsys.h
index 89bb7dc..7c5451c 100644
--- a/vcl/inc/aqua/svsys.h
+++ b/vcl/inc/osx/svsys.h
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SVSYS_H
-#define INCLUDED_VCL_INC_AQUA_SVSYS_H
+#ifndef INCLUDED_VCL_INC_OSX_SVSYS_H
+#define INCLUDED_VCL_INC_OSX_SVSYS_H
#include "premac.h"
#include "Cocoa/Cocoa.h"
#include "postmac.h"
-#endif // INCLUDED_VCL_INC_AQUA_SVSYS_H
+#endif // INCLUDED_VCL_INC_OSX_SVSYS_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/vclnsapp.h b/vcl/inc/osx/vclnsapp.h
similarity index 95%
rename from vcl/inc/aqua/vclnsapp.h
rename to vcl/inc/osx/vclnsapp.h
index 7413361..38ad251 100644
--- a/vcl/inc/aqua/vclnsapp.h
+++ b/vcl/inc/osx/vclnsapp.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_VCLNSAPP_H
-#define INCLUDED_VCL_INC_AQUA_VCLNSAPP_H
+#ifndef INCLUDED_VCL_INC_OSX_VCLNSAPP_H
+#define INCLUDED_VCL_INC_OSX_VCLNSAPP_H
#include <config_features.h>
@@ -63,6 +63,6 @@ class AquaSalFrame;
-(void)cycleFrameBackward: (AquaSalFrame*)pCurFrame;
@end
-#endif
+#endif // INCLUDED_VCL_INC_OSX_VCLNSAPP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/coretext/common.h b/vcl/inc/quartz/common.h
similarity index 93%
rename from vcl/inc/coretext/common.h
rename to vcl/inc/quartz/common.h
index 1f1211b..2d9b717 100644
--- a/vcl/inc/coretext/common.h
+++ b/vcl/inc/quartz/common.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_CORETEXT_COMMON_H
-#define INCLUDED_VCL_INC_CORETEXT_COMMON_H
+#ifndef INCLUDED_VCL_INC_QUARTZ_COMMON_H
+#define INCLUDED_VCL_INC_QUARTZ_COMMON_H
#include <iostream>
@@ -48,6 +48,6 @@
std::ostream &operator <<(std::ostream& s, CTFontRef pFont);
-#endif // INCLUDED_VCL_INC_CORETEXT_COMMON_H
+#endif // INCLUDED_VCL_INC_QUARTZ_COMMON_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index f7d8d63..a645999 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -27,7 +27,7 @@
#include "vcl/salbtype.hxx"
#ifdef MACOSX
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
#else
#include "headless/svpgdi.hxx"
#endif
diff --git a/vcl/inc/coretext/salgdi.h b/vcl/inc/quartz/salgdi.h
similarity index 99%
rename from vcl/inc/coretext/salgdi.h
rename to vcl/inc/quartz/salgdi.h
index d6f8682..49140fa 100644
--- a/vcl/inc/coretext/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_CORETEXT_SALGDI_H
-#define INCLUDED_VCL_INC_CORETEXT_SALGDI_H
+#ifndef INCLUDED_VCL_INC_QUARTZ_SALGDI_H
+#define INCLUDED_VCL_INC_QUARTZ_SALGDI_H
#include <vector>
@@ -27,8 +27,8 @@
#include "premac.h"
#ifdef MACOSX
#include <ApplicationServices/ApplicationServices.h>
-#include "aqua/aquavcltypes.h"
-#include "aqua/salframe.h"
+#include "osx/osxvcltypes.h"
+#include "osx/salframe.h"
#else
#include <CoreGraphics/CoreGraphics.h>
#include <CoreText/CoreText.h>
@@ -428,6 +428,6 @@ inline void AquaSalGraphics::RefreshRect( const NSRect& rRect )
#endif
-#endif // INCLUDED_VCL_INC_CORETEXT_SALGDI_H
+#endif // INCLUDED_VCL_INC_QUARTZ_SALGDI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salmathutils.hxx b/vcl/inc/quartz/salmathutils.hxx
similarity index 94%
rename from vcl/inc/aqua/salmathutils.hxx
rename to vcl/inc/quartz/salmathutils.hxx
index e3c223e..5c6641b 100644
--- a/vcl/inc/aqua/salmathutils.hxx
+++ b/vcl/inc/quartz/salmathutils.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX
-#define INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX
+#ifndef INCLUDED_VCL_INC_QUARTZ_SALMATHUTILS_HXX
+#define INCLUDED_VCL_INC_QUARTZ_SALMATHUTILS_HXX
#ifdef __cplusplus
extern "C" {
@@ -76,6 +76,6 @@ unsigned long Euclidian2Norm ( const LRectCoorVector pVec );
}
#endif
-#endif // INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX
+#endif // INCLUDED_VCL_INC_QUARTZ_SALMATHUTILS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index 4ec1a9f..3d2d2c0 100644
--- a/vcl/inc/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -27,7 +27,7 @@
#include "vcl/dllapi.h"
#ifdef IOS
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
#endif
namespace psp
diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h
index 997b3fb..9add1a9 100644
--- a/vcl/inc/svsys.h
+++ b/vcl/inc/svsys.h
@@ -23,7 +23,7 @@
#ifdef WNT
#include "win/svsys.h"
#elif defined MACOSX
-#include "aqua/svsys.h"
+#include "osx/svsys.h"
#elif defined IOS
#include "ios/svsys.h"
#elif defined ANDROID
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
similarity index 100%
rename from vcl/aqua/source/dtrans/DataFlavorMapping.cxx
rename to vcl/osx/DataFlavorMapping.cxx
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
similarity index 97%
rename from vcl/aqua/source/dtrans/DataFlavorMapping.hxx
rename to vcl/osx/DataFlavorMapping.hxx
index f5c579e..70f7736 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/osx/DataFlavorMapping.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DATAFLAVORMAPPING_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DATAFLAVORMAPPING_HXX
+#ifndef INCLUDED_VCL_OSX_DATAFLAVORMAPPING_HXX
+#define INCLUDED_VCL_OSX_DATAFLAVORMAPPING_HXX
#include <com/sun/star/datatransfer/DataFlavor.hpp>
#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
@@ -136,6 +136,6 @@ private:
typedef boost::shared_ptr<DataFlavorMapper> DataFlavorMapperPtr_t;
-#endif
+#endif // INCLUDED_VCL_OSX_DATAFLAVORMAPPING_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DragActionConversion.cxx b/vcl/osx/DragActionConversion.cxx
similarity index 100%
rename from vcl/aqua/source/dtrans/DragActionConversion.cxx
rename to vcl/osx/DragActionConversion.cxx
diff --git a/vcl/aqua/source/dtrans/DragActionConversion.hxx b/vcl/osx/DragActionConversion.hxx
similarity index 100%
rename from vcl/aqua/source/dtrans/DragActionConversion.hxx
rename to vcl/osx/DragActionConversion.hxx
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/osx/DragSource.cxx
similarity index 99%
rename from vcl/aqua/source/dtrans/DragSource.cxx
rename to vcl/osx/DragSource.cxx
index 5786224..7202928 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -28,10 +28,10 @@
#include "DragSource.hxx"
#include "DragSourceContext.hxx"
-#include "aqua_clipboard.hxx"
+#include "clipboard.hxx"
#include "DragActionConversion.hxx"
-#include "aqua/salframe.h"
+#include "osx/salframe.h"
#include <memory>
diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/osx/DragSource.hxx
similarity index 96%
rename from vcl/aqua/source/dtrans/DragSource.hxx
rename to vcl/osx/DragSource.hxx
index be4443a..625388e 100644
--- a/vcl/aqua/source/dtrans/DragSource.hxx
+++ b/vcl/osx/DragSource.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCE_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCE_HXX
+#ifndef INCLUDED_VCL_OSX_DRAGSOURCE_HXX
+#define INCLUDED_VCL_OSX_DRAGSOURCE_HXX
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
@@ -41,7 +41,7 @@ class DragSource;
class AquaSalFrame;
/* The functions declared in this protocol are actually
- declared in vcl/aqua/inc/salframe.h. Because we want
+ declared in vcl/inc/osx/salframe.h. Because we want
to avoid importing VCL headers in UNO services and
on the other hand want to avoid warnings caused by
gcc complaining about unknowness of these functions
@@ -130,7 +130,6 @@ public:
};
-
-#endif
+#endif // INCLUDED_VCL_OSX_DRAGSOURCE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.cxx b/vcl/osx/DragSourceContext.cxx
similarity index 100%
rename from vcl/aqua/source/dtrans/DragSourceContext.cxx
rename to vcl/osx/DragSourceContext.cxx
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx
similarity index 93%
rename from vcl/aqua/source/dtrans/DragSourceContext.hxx
rename to vcl/osx/DragSourceContext.hxx
index 6d8d0d9..f27518e 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.hxx
+++ b/vcl/osx/DragSourceContext.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCECONTEXT_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCECONTEXT_HXX
+#ifndef INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX
+#define INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
@@ -54,8 +54,6 @@ public:
throw( com::sun::star::uno::RuntimeException);
};
-
-
-#endif
+#endif // INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/osx/DropTarget.cxx
similarity index 99%
rename from vcl/aqua/source/dtrans/DropTarget.cxx
rename to vcl/osx/DropTarget.cxx
index fd762a9..e4d3a6b 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -24,7 +24,7 @@
#include "comphelper/makesequence.hxx"
#include <cppuhelper/interfacecontainer.hxx>
-#include "aqua_clipboard.hxx"
+#include "clipboard.hxx"
#include "DropTarget.hxx"
#include "DragActionConversion.hxx"
@@ -37,8 +37,8 @@
#include <Carbon/Carbon.h>
#include <postmac.h>
-#include <aqua/salframe.h>
-#include <aqua/salframeview.h>
+#include <osx/salframe.h>
+#include <osx/salframeview.h>
using namespace cppu;
using namespace osl;
diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/osx/DropTarget.hxx
similarity index 97%
rename from vcl/aqua/source/dtrans/DropTarget.hxx
rename to vcl/osx/DropTarget.hxx
index 9318d80..0eea030 100644
--- a/vcl/aqua/source/dtrans/DropTarget.hxx
+++ b/vcl/osx/DropTarget.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DROPTARGET_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DROPTARGET_HXX
+#ifndef INCLUDED_VCL_OSX_DROPTARGET_HXX
+#define INCLUDED_VCL_OSX_DROPTARGET_HXX
#include "DataFlavorMapping.hxx"
#include <cppuhelper/compbase5.hxx>
@@ -44,7 +44,7 @@ class DropTarget;
class AquaSalFrame;
/* The functions declared in this protocol are actually
- declared in vcl/aqua/inc/salframe.h. Because we want
+ declared in vcl/inc/osx/salframe.h. Because we want
to avoid importing VCL headers in UNO services and
on the other hand want to avoid warnings caused by
gcc complaining about unknowness of these functions
@@ -158,6 +158,6 @@ private:
sal_Int8 mDefaultActions;
};
-#endif
+#endif // INCLUDED_VCL_OSX_DROPTARGET_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx
similarity index 100%
rename from vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
rename to vcl/osx/HtmlFmtFlt.cxx
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx b/vcl/osx/HtmlFmtFlt.hxx
similarity index 92%
rename from vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
rename to vcl/osx/HtmlFmtFlt.hxx
index 393aed8..77a9249 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
+++ b/vcl/osx/HtmlFmtFlt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_HTMLFMTFLT_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_HTMLFMTFLT_HXX
+#ifndef INCLUDED_VCL_OSX_HTMLFMTFLT_HXX
+#define INCLUDED_VCL_OSX_HTMLFMTFLT_HXX
#include <com/sun/star/uno/Sequence.hxx>
@@ -36,6 +36,6 @@ com::sun::star::uno::Sequence<sal_Int8> HTMLFormatToTextHtml(const com::sun::sta
*/
bool isHTMLFormat (const com::sun::star::uno::Sequence<sal_Int8>& aHtmlSequence);
-#endif
+#endif // INCLUDED_VCL_OSX_HTMLFMTFLT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
similarity index 100%
rename from vcl/aqua/source/dtrans/OSXTransferable.cxx
rename to vcl/osx/OSXTransferable.cxx
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
similarity index 100%
rename from vcl/aqua/source/dtrans/OSXTransferable.hxx
rename to vcl/osx/OSXTransferable.hxx
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
similarity index 100%
rename from vcl/aqua/source/dtrans/PictToBmpFlt.cxx
rename to vcl/osx/PictToBmpFlt.cxx
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx b/vcl/osx/PictToBmpFlt.hxx
similarity index 91%
rename from vcl/aqua/source/dtrans/PictToBmpFlt.hxx
rename to vcl/osx/PictToBmpFlt.hxx
index 65a7771..59f1f2d 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
+++ b/vcl/osx/PictToBmpFlt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_PICTTOBMPFLT_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_PICTTOBMPFLT_HXX
+#ifndef INCLUDED_VCL_OSX_PICTTOBMPFLT_HXX
+#define INCLUDED_VCL_OSX_PICTTOBMPFLT_HXX
#include <com/sun/star/uno/Sequence.hxx>
@@ -34,6 +34,6 @@ bool PNGToImage( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
com::sun::star::uno::Sequence<sal_Int8>& rImgData,
NSBitmapImageFileType eOutFormat);
-#endif
+#endif // INCLUDED_VCL_OSX_PICTTOBMPFLT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/README.a11y b/vcl/osx/README.a11y
new file mode 100644
index 0000000..4422713
--- /dev/null
+++ b/vcl/osx/README.a11y
@@ -0,0 +1,7 @@
+Naming scheme:
+
+a11yXYZhelper: Helper class providing static methods
+
+a11yXYZwrapper: Wrapper around one (or two) UNO-interfaces
+
+a11ywrapperXYZ: Subclass of a11ywrapper for a specific AXRole
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/osx/a11yactionwrapper.h
similarity index 82%
rename from vcl/aqua/source/a11y/aqua11yactionwrapper.h
rename to vcl/osx/a11yactionwrapper.h
index c92473c..0fda9a3 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h
+++ b/vcl/osx/a11yactionwrapper.h
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H
-#include "aqua/aquavcltypes.h"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/osxvcltypes.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yActionWrapper : NSObject
{
@@ -30,6 +30,6 @@
+(void)doAction:(NSString *)action ofElement:(AquaA11yWrapper *)wrapper;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm b/vcl/osx/a11yactionwrapper.mm
similarity index 98%
rename from vcl/aqua/source/a11y/aqua11yactionwrapper.mm
rename to vcl/osx/a11yactionwrapper.mm
index d9842a8..31dc395 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
+++ b/vcl/osx/a11yactionwrapper.mm
@@ -18,10 +18,10 @@
*/
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
#include "quartz/utils.h"
-#include "aqua11yactionwrapper.h"
+#include "a11yactionwrapper.h"
// Wrapper for XAccessibleAction
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/osx/a11ycomponentwrapper.h
similarity index 84%
rename from vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
rename to vcl/osx/a11ycomponentwrapper.h
index 74d804e..450f068 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
+++ b/vcl/osx/a11ycomponentwrapper.h
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H
-#include "aqua/aquavcltypes.h"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/osxvcltypes.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yComponentWrapper : NSObject
{
@@ -34,6 +34,6 @@
+(void)setFocusedAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm b/vcl/osx/a11ycomponentwrapper.mm
similarity index 98%
rename from vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
rename to vcl/osx/a11ycomponentwrapper.mm
index 41df52b..b91029d 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
+++ b/vcl/osx/a11ycomponentwrapper.mm
@@ -18,8 +18,8 @@
*/
#include "quartz/utils.h"
-#include "aqua11ycomponentwrapper.h"
-#include "aqua11yrolehelper.h"
+#include "a11ycomponentwrapper.h"
+#include "a11yrolehelper.h"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11yfactory.mm b/vcl/osx/a11yfactory.mm
similarity index 93%
rename from vcl/aqua/source/a11y/aqua11yfactory.mm
rename to vcl/osx/a11yfactory.mm
index 64f1783..30437a8 100644
--- a/vcl/aqua/source/a11y/aqua11yfactory.mm
+++ b/vcl/osx/a11yfactory.mm
@@ -18,28 +18,28 @@
*/
-#include "aqua/salinst.h"
-#include "aqua/aqua11yfactory.h"
-#include "aqua/aqua11yfocustracker.hxx"
-
-#include "aqua11yfocuslistener.hxx"
-#include "aqua11yrolehelper.h"
-#include "aqua11ywrapperbutton.h"
-#include "aqua11ywrapperstatictext.h"
-#include "aqua11ywrappertextarea.h"
-#include "aqua11ywrappercheckbox.h"
-#include "aqua11ywrappercombobox.h"
-#include "aqua11ywrappergroup.h"
-#include "aqua11ywrapperlist.h"
-#include "aqua11ywrapperradiobutton.h"
-#include "aqua11ywrapperradiogroup.h"
-#include "aqua11ywrapperrow.h"
-#include "aqua11ywrapperscrollarea.h"
-#include "aqua11ywrapperscrollbar.h"
-#include "aqua11ywrappersplitter.h"
-#include "aqua11ywrappertabgroup.h"
-#include "aqua11ywrappertoolbar.h"
-#include "aqua11ytablewrapper.h"
+#include "osx/salinst.h"
+#include "osx/a11yfactory.h"
+#include "osx/a11yfocustracker.hxx"
+
+#include "a11yfocuslistener.hxx"
+#include "a11yrolehelper.h"
+#include "a11ywrapperbutton.h"
+#include "a11ywrapperstatictext.h"
+#include "a11ywrappertextarea.h"
+#include "a11ywrappercheckbox.h"
+#include "a11ywrappercombobox.h"
+#include "a11ywrappergroup.h"
+#include "a11ywrapperlist.h"
+#include "a11ywrapperradiobutton.h"
+#include "a11ywrapperradiogroup.h"
+#include "a11ywrapperrow.h"
+#include "a11ywrapperscrollarea.h"
+#include "a11ywrapperscrollbar.h"
+#include "a11ywrappersplitter.h"
+#include "a11ywrappertabgroup.h"
+#include "a11ywrappertoolbar.h"
+#include "a11ytablewrapper.h"
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx
similarity index 96%
rename from vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
rename to vcl/osx/a11yfocuslistener.cxx
index 5a0c339..c4e2960 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/osx/a11yfocuslistener.cxx
@@ -20,10 +20,10 @@
#include <salhelper/refobj.hxx>
-#include "aqua/aqua11yfocustracker.hxx"
-#include "aqua/aqua11yfactory.h"
+#include "osx/a11yfocustracker.hxx"
+#include "osx/a11yfactory.h"
-#include "aqua11yfocuslistener.hxx"
+#include "a11yfocuslistener.hxx"
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/osx/a11yfocuslistener.hxx
similarity index 86%
rename from vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
rename to vcl/osx/a11yfocuslistener.hxx
index a889683..42d5c35 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/osx/a11yfocuslistener.hxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
+#ifndef INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
+#define INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
#include <salhelper/refobj.hxx>
-#include "aqua/keyboardfocuslistener.hxx"
-#include "aqua/aquavcltypes.h"
+#include "osx/keyboardfocuslistener.hxx"
+#include "osx/osxvcltypes.h"
class AquaA11yFocusListener :
public KeyboardFocusListener,
@@ -49,6 +49,6 @@ public:
virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
};
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
+#endif // INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx
similarity index 99%
rename from vcl/aqua/source/a11y/aqua11yfocustracker.cxx
rename to vcl/osx/a11yfocustracker.cxx
index b38af80..1017969 100644
--- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
+++ b/vcl/osx/a11yfocustracker.cxx
@@ -23,7 +23,7 @@
#include "vcl/toolbox.hxx"
#include "vcl/menu.hxx"
-#include "aqua/aqua11yfocustracker.hxx"
+#include "osx/a11yfocustracker.hxx"
#include "documentfocuslistener.hxx"
diff --git a/vcl/aqua/source/a11y/aqua11ylistener.cxx b/vcl/osx/a11ylistener.cxx
similarity index 96%
rename from vcl/aqua/source/a11y/aqua11ylistener.cxx
rename to vcl/osx/a11ylistener.cxx
index 46babf9..dafabb7 100644
--- a/vcl/aqua/source/a11y/aqua11ylistener.cxx
+++ b/vcl/osx/a11ylistener.cxx
@@ -17,13 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "aqua/salinst.h"
-#include "aqua/aqua11ylistener.hxx"
-#include "aqua/aqua11yfactory.h"
-#include "aqua/aqua11yfocustracker.hxx"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/salinst.h"
+#include "osx/a11ylistener.hxx"
+#include "osx/a11yfactory.h"
+#include "osx/a11yfocustracker.hxx"
+#include "osx/a11ywrapper.h"
-#include "aqua11ytextwrapper.h"
+#include "a11ytextwrapper.h"
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/osx/a11yrolehelper.h
similarity index 86%
rename from vcl/aqua/source/a11y/aqua11yrolehelper.h
rename to vcl/osx/a11yrolehelper.h
index a45cde4..21b2ff5 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.h
+++ b/vcl/osx/a11yrolehelper.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
+#ifndef INCLUDED_VCL_OSX_A11YROLEHELPER_H
+#define INCLUDED_VCL_OSX_A11YROLEHELPER_H
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@interface AquaA11yRoleHelper : NSObject
@@ -31,6 +31,6 @@
+(id)getRoleDescriptionFrom: (NSString *) role with: (NSString *) subRole;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
+#endif // INCLUDED_VCL_OSX_A11YROLEHELPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.mm b/vcl/osx/a11yrolehelper.mm
similarity index 99%
rename from vcl/aqua/source/a11y/aqua11yrolehelper.mm
rename to vcl/osx/a11yrolehelper.mm
index 0d55279..2940a4b 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.mm
+++ b/vcl/osx/a11yrolehelper.mm
@@ -18,9 +18,9 @@
*/
-#include "aqua/aqua11yfactory.h"
+#include "osx/a11yfactory.h"
-#include "aqua11yrolehelper.h"
+#include "a11yrolehelper.h"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/osx/a11yselectionwrapper.h
similarity index 83%
rename from vcl/aqua/source/a11y/aqua11yselectionwrapper.h
rename to vcl/osx/a11yselectionwrapper.h
index af3c297..9b254d7 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
+++ b/vcl/osx/a11yselectionwrapper.h
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H
-#include "aqua/aquavcltypes.h"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/osxvcltypes.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11ySelectionWrapper : NSObject
{
@@ -32,6 +32,6 @@
+(void)setSelectedChildrenAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm b/vcl/osx/a11yselectionwrapper.mm
similarity index 96%
rename from vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
rename to vcl/osx/a11yselectionwrapper.mm
index 929d454..e341aed 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
+++ b/vcl/osx/a11yselectionwrapper.mm
@@ -18,10 +18,10 @@
*/
-#include "aqua/salinst.h"
-#include "aqua/aqua11yfactory.h"
+#include "osx/salinst.h"
+#include "osx/a11yfactory.h"
-#include "aqua11yselectionwrapper.h"
+#include "a11yselectionwrapper.h"
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/osx/a11ytablewrapper.h
similarity index 85%
rename from vcl/aqua/source/a11y/aqua11ytablewrapper.h
rename to vcl/osx/a11ytablewrapper.h
index 09b3ff7..94b29bd 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h
+++ b/vcl/osx/a11ytablewrapper.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
#define MAXIMUM_ACCESSIBLE_TABLE_CELLS 1000
@@ -33,6 +33,6 @@
-(id)rowsAttribute;
-(id)columnsAttribute;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm b/vcl/osx/a11ytablewrapper.mm
similarity index 99%
rename from vcl/aqua/source/a11y/aqua11ytablewrapper.mm
rename to vcl/osx/a11ytablewrapper.mm
index 52ff2a8..f772efc 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
+++ b/vcl/osx/a11ytablewrapper.mm
@@ -18,9 +18,9 @@
*/
-#include "aqua/aqua11yfactory.h"
+#include "osx/a11yfactory.h"
-#include "aqua11ytablewrapper.h"
+#include "a11ytablewrapper.h"
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::awt;
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/osx/a11ytextattributeswrapper.h
similarity index 82%
rename from vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
rename to vcl/osx/a11ytextattributeswrapper.h
index 4464bd3..03e3b3a 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
+++ b/vcl/osx/a11ytextattributeswrapper.h
@@ -17,16 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YTEXTATTRIBUTESWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YTEXTATTRIBUTESWRAPPER_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yTextAttributesWrapper : NSObject
{
}
+(NSMutableAttributedString *)createAttributedStringForElement:(AquaA11yWrapper *)wrapper inOrigRange:(id)origRange;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YTEXTATTRIBUTESWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm
similarity index 99%
rename from vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
rename to vcl/osx/a11ytextattributeswrapper.mm
index a30b8d2..3391037 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -18,11 +18,11 @@
*/
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
#include "quartz/utils.h"
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
-#include "aqua11ytextattributeswrapper.h"
+#include "a11ytextattributeswrapper.h"
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
#include <com/sun/star/awt/FontUnderline.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/osx/a11ytextwrapper.h
similarity index 92%
rename from vcl/aqua/source/a11y/aqua11ytextwrapper.h
rename to vcl/osx/a11ytextwrapper.h
index 91b2bd9..c1830a2 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h
+++ b/vcl/osx/a11ytextwrapper.h
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YTEXTWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YTEXTWRAPPER_H
-#include "aqua/aquavcltypes.h"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/osxvcltypes.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yTextWrapper : NSObject
{
@@ -53,6 +53,6 @@
+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YTEXTWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm b/vcl/osx/a11ytextwrapper.mm
similarity index 98%
rename from vcl/aqua/source/a11y/aqua11ytextwrapper.mm
rename to vcl/osx/a11ytextwrapper.mm
index ab02eaf..29d525d 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
+++ b/vcl/osx/a11ytextwrapper.mm
@@ -18,11 +18,11 @@
*/
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
#include "quartz/utils.h"
-#include "aqua11ytextwrapper.h"
-#include "aqua11ytextattributeswrapper.h"
-#include "aqua11yutil.h"
+#include "a11ytextwrapper.h"
+#include "a11ytextattributeswrapper.h"
+#include "a11yutil.h"
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11yutil.h b/vcl/osx/a11yutil.h
similarity index 88%
rename from vcl/aqua/source/a11y/aqua11yutil.h
rename to vcl/osx/a11yutil.h
index 6f597dc..5cc5dc4 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.h
+++ b/vcl/osx/a11yutil.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
+#ifndef INCLUDED_VCL_OSX_A11YUTIL_H
+#define INCLUDED_VCL_OSX_A11YUTIL_H
#include <com/sun/star/awt/Point.hpp>
@@ -28,5 +28,5 @@
+(::com::sun::star::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
+#endif // INCLUDED_VCL_OSX_A11YUTIL_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yutil.mm b/vcl/osx/a11yutil.mm
similarity index 97%
rename from vcl/aqua/source/a11y/aqua11yutil.mm
rename to vcl/osx/a11yutil.mm
index 086fa0a..68438643 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.mm
+++ b/vcl/osx/a11yutil.mm
@@ -18,9 +18,9 @@
*/
-#include "aqua/aquavcltypes.h"
+#include "osx/osxvcltypes.h"
-#include "aqua11yutil.h"
+#include "a11yutil.h"
using namespace ::com::sun::star::awt;
diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/osx/a11yvaluewrapper.h
similarity index 83%
rename from vcl/aqua/source/a11y/aqua11yvaluewrapper.h
rename to vcl/osx/a11yvaluewrapper.h
index 6aa2eab..3ff33d4 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
+++ b/vcl/osx/a11yvaluewrapper.h
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YVALUEWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YVALUEWRAPPER_H
-#include "aqua/salinst.h"
-#include "aqua/aquavcltypes.h"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/salinst.h"
+#include "osx/osxvcltypes.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yValueWrapper : NSObject
{
@@ -35,6 +35,6 @@
+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YVALUEWRAPPER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm b/vcl/osx/a11yvaluewrapper.mm
similarity index 97%
rename from vcl/aqua/source/a11y/aqua11yvaluewrapper.mm
rename to vcl/osx/a11yvaluewrapper.mm
index 93a479a..539eb91 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm
+++ b/vcl/osx/a11yvaluewrapper.mm
@@ -18,8 +18,8 @@
*/
-#include "aqua11yvaluewrapper.h"
-#include "aqua11ywrapperstatictext.h"
+#include "a11yvaluewrapper.h"
+#include "a11ywrapperstatictext.h"
using namespace ::com::sun::star::uno;
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/osx/a11ywrapper.mm
similarity index 99%
rename from vcl/aqua/source/a11y/aqua11ywrapper.mm
rename to vcl/osx/a11ywrapper.mm
index 672fad5..85ee3ff 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -18,24 +18,24 @@
*/
-#include "aqua/salinst.h"
-#include "aqua/saldata.hxx"
+#include "osx/salinst.h"
+#include "osx/saldata.hxx"
-#include "aqua/aqua11ywrapper.h"
-#include "aqua/aqua11ylistener.hxx"
-#include "aqua/aqua11yfactory.h"
-#include "aqua/aqua11yfocustracker.hxx"
+#include "osx/a11ywrapper.h"
+#include "osx/a11ylistener.hxx"
+#include "osx/a11yfactory.h"
+#include "osx/a11yfocustracker.hxx"
#include "quartz/utils.h"
-#include "aqua11yfocuslistener.hxx"
-#include "aqua11yactionwrapper.h"
-#include "aqua11ycomponentwrapper.h"
-#include "aqua11yselectionwrapper.h"
-#include "aqua11ytablewrapper.h"
-#include "aqua11ytextwrapper.h"
-#include "aqua11yvaluewrapper.h"
-#include "aqua11yrolehelper.h"
+#include "a11yfocuslistener.hxx"
+#include "a11yactionwrapper.h"
+#include "a11ycomponentwrapper.h"
+#include "a11yselectionwrapper.h"
+#include "a11ytablewrapper.h"
+#include "a11ytextwrapper.h"
+#include "a11yvaluewrapper.h"
+#include "a11yrolehelper.h"
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/osx/a11ywrapperbutton.h
similarity index 83%
rename from vcl/aqua/source/a11y/aqua11ywrapperbutton.h
rename to vcl/osx/a11ywrapperbutton.h
index ecb747f..0bf115f 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
+++ b/vcl/osx/a11ywrapperbutton.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERBUTTON_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERBUTTON_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperButton : AquaA11yWrapper
{
@@ -30,6 +30,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERBUTTON_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm b/vcl/osx/a11ywrapperbutton.mm
similarity index 95%
rename from vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
rename to vcl/osx/a11ywrapperbutton.mm
index f1e8322..eab7e07 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
+++ b/vcl/osx/a11ywrapperbutton.mm
@@ -18,10 +18,10 @@
*/
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
-#include "aqua11ywrapperbutton.h"
-#include "aqua11ytextwrapper.h"
+#include "a11ywrapperbutton.h"
+#include "a11ytextwrapper.h"
// Wrapper for AXButton role
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/osx/a11ywrappercheckbox.h
similarity index 83%
rename from vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
rename to vcl/osx/a11ywrappercheckbox.h
index d5d4a89..58cd298 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/osx/a11ywrappercheckbox.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERCHECKBOX_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERCHECKBOX_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperCheckBox : AquaA11yWrapper
{
@@ -30,6 +30,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERCHECKBOX_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm b/vcl/osx/a11ywrappercheckbox.mm
similarity index 94%
rename from vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
rename to vcl/osx/a11ywrappercheckbox.mm
index 288dfe9..e8ea2a0 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
+++ b/vcl/osx/a11ywrappercheckbox.mm
@@ -18,11 +18,11 @@
*/
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
-#include "aqua11ywrappercheckbox.h"
-#include "aqua11yvaluewrapper.h"
-#include "aqua11ytextwrapper.h"
+#include "a11ywrappercheckbox.h"
+#include "a11yvaluewrapper.h"
+#include "a11ytextwrapper.h"
// Wrapper for AXCheckbox role
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/osx/a11ywrappercombobox.h
similarity index 87%
rename from vcl/aqua/source/a11y/aqua11ywrappercombobox.h
rename to vcl/osx/a11ywrappercombobox.h
index 6c8c1fe..1305884 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
+++ b/vcl/osx/a11ywrappercombobox.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERCOMBOBOX_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERCOMBOBOX_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
@interface AquaA11yWrapperComboBox : AquaA11yWrapper
@@ -39,6 +39,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERCOMBOBOX_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm b/vcl/osx/a11ywrappercombobox.mm
similarity index 98%
rename from vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
rename to vcl/osx/a11ywrappercombobox.mm
index 554a946..2467718 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
+++ b/vcl/osx/a11ywrappercombobox.mm
@@ -18,10 +18,10 @@
*/
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
-#include "aqua11ywrappercombobox.h"
-#include "aqua11yrolehelper.h"
+#include "a11ywrappercombobox.h"
+#include "a11yrolehelper.h"
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/osx/a11ywrappergroup.h
similarity index 83%
rename from vcl/aqua/source/a11y/aqua11ywrappergroup.h
rename to vcl/osx/a11ywrappergroup.h
index d018927..af2baea 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h
+++ b/vcl/osx/a11ywrappergroup.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERGROUP_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERGROUP_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperGroup : AquaA11yWrapper
{
@@ -29,6 +29,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERGROUP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm b/vcl/osx/a11ywrappergroup.mm
similarity index 96%
rename from vcl/aqua/source/a11y/aqua11ywrappergroup.mm
rename to vcl/osx/a11ywrappergroup.mm
index 4ca15d8..3eb864f 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
+++ b/vcl/osx/a11ywrappergroup.mm
@@ -18,8 +18,8 @@
*/
-#include "aqua/salinst.h"
-#include "aqua11ywrappergroup.h"
+#include "osx/salinst.h"
+#include "a11ywrappergroup.h"
// Wrapper for AXGroup role
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/osx/a11ywrapperlist.h
similarity index 83%
rename from vcl/aqua/source/a11y/aqua11ywrapperlist.h
rename to vcl/osx/a11ywrapperlist.h
index 14fc22b..65f605a 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h
+++ b/vcl/osx/a11ywrapperlist.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERLIST_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERLIST_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperList : AquaA11yWrapper
{
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERLIST_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm b/vcl/osx/a11ywrapperlist.mm
similarity index 96%
rename from vcl/aqua/source/a11y/aqua11ywrapperlist.mm
rename to vcl/osx/a11ywrapperlist.mm
index e75aac4..e10bf72 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
+++ b/vcl/osx/a11ywrapperlist.mm
@@ -18,8 +18,8 @@
*/
-#include "aqua/salinst.h"
-#include "aqua11ywrapperlist.h"
+#include "osx/salinst.h"
+#include "a11ywrapperlist.h"
using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/osx/a11ywrapperradiobutton.h
similarity index 83%
rename from vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
rename to vcl/osx/a11ywrapperradiobutton.h
index 9b31303..83e3f5f 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/osx/a11ywrapperradiobutton.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERRADIOBUTTON_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERRADIOBUTTON_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperRadioButton : AquaA11yWrapper
{
@@ -30,6 +30,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERRADIOBUTTON_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm b/vcl/osx/a11ywrapperradiobutton.mm
similarity index 94%
rename from vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
rename to vcl/osx/a11ywrapperradiobutton.mm
index b4f08f1..cfd8dbd 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
+++ b/vcl/osx/a11ywrapperradiobutton.mm
@@ -18,10 +18,10 @@
*/
-#include "aqua/salinst.h"
-#include "aqua11ywrapperradiobutton.h"
-#include "aqua11ytextwrapper.h"
-#include "aqua11yvaluewrapper.h"
+#include "osx/salinst.h"
+#include "a11ywrapperradiobutton.h"
+#include "a11ytextwrapper.h"
+#include "a11yvaluewrapper.h"
// Wrapper for AXRadioButton role
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/osx/a11ywrapperradiogroup.h
similarity index 82%
rename from vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
rename to vcl/osx/a11ywrapperradiogroup.h
index d02193d..6ae98cb 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
+++ b/vcl/osx/a11ywrapperradiogroup.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERRADIOGROUP_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERRADIOGROUP_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperRadioGroup : AquaA11yWrapper
{
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERRADIOGROUP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm b/vcl/osx/a11ywrapperradiogroup.mm
similarity index 93%
rename from vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
rename to vcl/osx/a11ywrapperradiogroup.mm
index b8c7ddb..d66192d 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
+++ b/vcl/osx/a11ywrapperradiogroup.mm
@@ -18,9 +18,9 @@
*/
-#include "aqua/salinst.h"
-#include "aqua11ywrapperradiogroup.h"
-#include "aqua11ytextwrapper.h"
+#include "osx/salinst.h"
+#include "a11ywrapperradiogroup.h"
+#include "a11ytextwrapper.h"
// Wrapper for AXRadioGroup role
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/osx/a11ywrapperrow.h
similarity index 83%
rename from vcl/aqua/source/a11y/aqua11ywrapperrow.h
rename to vcl/osx/a11ywrapperrow.h
index fa7b64d..45cd747 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h
+++ b/vcl/osx/a11ywrapperrow.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERROW_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERROW_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperRow : AquaA11yWrapper
{
@@ -29,6 +29,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERROW_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm b/vcl/osx/a11ywrapperrow.mm
similarity index 95%
rename from vcl/aqua/source/a11y/aqua11ywrapperrow.mm
rename to vcl/osx/a11ywrapperrow.mm
index d62b3ed..8bcef80 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
+++ b/vcl/osx/a11ywrapperrow.mm
@@ -18,10 +18,10 @@
*/
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
-#include "aqua11ywrapperrow.h"
-#include "aqua11ytextwrapper.h"
+#include "a11ywrapperrow.h"
+#include "a11ytextwrapper.h"
// Wrapper for AXRow role
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/osx/a11ywrapperscrollarea.h
similarity index 83%
rename from vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
rename to vcl/osx/a11ywrapperscrollarea.h
index e58acb2..35a2aa1 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
+++ b/vcl/osx/a11ywrapperscrollarea.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERSCROLLAREA_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERSCROLLAREA_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperScrollArea : AquaA11yWrapper
{
@@ -30,6 +30,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERSCROLLAREA_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm b/vcl/osx/a11ywrapperscrollarea.mm
similarity index 95%
rename from vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
rename to vcl/osx/a11ywrapperscrollarea.mm
index e447ce6..f70f449 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
+++ b/vcl/osx/a11ywrapperscrollarea.mm
@@ -18,11 +18,11 @@
*/
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
-#include "aqua11ywrapperscrollarea.h"
-#include "aqua11ywrapperscrollbar.h"
-#include "aqua11yrolehelper.h"
+#include "a11ywrapperscrollarea.h"
+#include "a11ywrapperscrollbar.h"
+#include "a11yrolehelper.h"
// Wrapper for AXScrollArea role
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/osx/a11ywrapperscrollbar.h
similarity index 82%
rename from vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
rename to vcl/osx/a11ywrapperscrollbar.h
index c2ca6d9..a6d8707 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
+++ b/vcl/osx/a11ywrapperscrollbar.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERSCROLLBAR_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERSCROLLBAR_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperScrollBar : AquaA11yWrapper
{
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERSCROLLBAR_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm b/vcl/osx/a11ywrapperscrollbar.mm
similarity index 96%
rename from vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
rename to vcl/osx/a11ywrapperscrollbar.mm
index 7fdaf41..3717cafc 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
+++ b/vcl/osx/a11ywrapperscrollbar.mm
@@ -18,9 +18,9 @@
*/
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
-#include "aqua11ywrapperscrollbar.h"
+#include "a11ywrapperscrollbar.h"
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/osx/a11ywrappersplitter.h
similarity index 82%
rename from vcl/aqua/source/a11y/aqua11ywrappersplitter.h
rename to vcl/osx/a11ywrappersplitter.h
index 27eaa9b..18cdb6e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
+++ b/vcl/osx/a11ywrappersplitter.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERSPLITTER_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERSPLITTER_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperSplitter : AquaA11yWrapper
{
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERSPLITTER_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm b/vcl/osx/a11ywrappersplitter.mm
similarity index 95%
rename from vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
rename to vcl/osx/a11ywrappersplitter.mm
index ab2095b..66db6dc 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
+++ b/vcl/osx/a11ywrappersplitter.mm
@@ -18,8 +18,8 @@
*/
-#include "aqua/salinst.h"
-#include "aqua11ywrappersplitter.h"
+#include "osx/salinst.h"
+#include "a11ywrappersplitter.h"
using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/osx/a11ywrapperstatictext.h
similarity index 82%
rename from vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
rename to vcl/osx/a11ywrapperstatictext.h
index 627d6e3..a210d80 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
+++ b/vcl/osx/a11ywrapperstatictext.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERSTATICTEXT_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERSTATICTEXT_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperStaticText : AquaA11yWrapper
{
@@ -29,6 +29,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERSTATICTEXT_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm b/vcl/osx/a11ywrapperstatictext.mm
similarity index 96%
rename from vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
rename to vcl/osx/a11ywrapperstatictext.mm
index aa871a8..ce0d7c4 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
+++ b/vcl/osx/a11ywrapperstatictext.mm
@@ -18,8 +18,8 @@
*/
-#include "aqua/salinst.h"
-#include "aqua11ywrapperstatictext.h"
+#include "osx/salinst.h"
+#include "a11ywrapperstatictext.h"
// Wrapper for AXStaticText role
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/osx/a11ywrappertabgroup.h
similarity index 82%
rename from vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
rename to vcl/osx/a11ywrappertabgroup.h
index bd0937e..b340d75 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
+++ b/vcl/osx/a11ywrappertabgroup.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERTABGROUP_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERTABGROUP_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperTabGroup : AquaA11yWrapper
{
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERTABGROUP_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm b/vcl/osx/a11ywrappertabgroup.mm
similarity index 96%
rename from vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
rename to vcl/osx/a11ywrappertabgroup.mm
index 6520921..0174e43 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
+++ b/vcl/osx/a11ywrappertabgroup.mm
@@ -18,8 +18,8 @@
*/
-#include "aqua/salinst.h"
-#include "aqua11ywrappertabgroup.h"
+#include "osx/salinst.h"
+#include "a11ywrappertabgroup.h"
// Wrapper for AXTabGroup role
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/osx/a11ywrappertextarea.h
similarity index 82%
rename from vcl/aqua/source/a11y/aqua11ywrappertextarea.h
rename to vcl/osx/a11ywrappertextarea.h
index e39fcdc..a0cf4f6 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
+++ b/vcl/osx/a11ywrappertextarea.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERTEXTAREA_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERTEXTAREA_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperTextArea : AquaA11yWrapper
{
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERTEXTAREA_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm b/vcl/osx/a11ywrappertextarea.mm
similarity index 96%
rename from vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
rename to vcl/osx/a11ywrappertextarea.mm
index 2949a63..9b4fbf9 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
+++ b/vcl/osx/a11ywrappertextarea.mm
@@ -18,8 +18,8 @@
*/
-#include "aqua/salinst.h"
-#include "aqua11ywrappertextarea.h"
+#include "osx/salinst.h"
+#include "a11ywrappertextarea.h"
// Wrapper for AXTextArea role
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/osx/a11ywrappertoolbar.h
similarity index 82%
rename from vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
rename to vcl/osx/a11ywrappertoolbar.h
index 6c38821..64bd142 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
+++ b/vcl/osx/a11ywrappertoolbar.h
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERTOOLBAR_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERTOOLBAR_H
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
@interface AquaA11yWrapperToolbar : AquaA11yWrapper
{
@@ -28,6 +28,6 @@
-(NSArray *)accessibilityAttributeNames;
@end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERTOOLBAR_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm b/vcl/osx/a11ywrappertoolbar.mm
similarity index 96%
rename from vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
rename to vcl/osx/a11ywrappertoolbar.mm
index 76c1bc6..9636d78 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
+++ b/vcl/osx/a11ywrappertoolbar.mm
@@ -18,8 +18,8 @@
*/
-#include "aqua/salinst.h"
-#include "aqua11ywrappertoolbar.h"
+#include "osx/salinst.h"
+#include "a11ywrappertoolbar.h"
// Wrapper for AXToolbar role
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/osx/clipboard.cxx
similarity index 99%
rename from vcl/aqua/source/dtrans/aqua_clipboard.cxx
rename to vcl/osx/clipboard.cxx
index ac3bcae..72feefe 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/osx/clipboard.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "aqua_clipboard.hxx"
+#include "clipboard.hxx"
#include "DataFlavorMapping.hxx"
#include "OSXTransferable.hxx"
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/osx/clipboard.hxx
similarity index 98%
rename from vcl/aqua/source/dtrans/aqua_clipboard.hxx
rename to vcl/osx/clipboard.hxx
index ba0aecd..1424e34 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx
+++ b/vcl/osx/clipboard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_AQUA_CLIPBOARD_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_AQUA_CLIPBOARD_HXX
+#ifndef INCLUDED_VCL_OSX_CLIPBOARD_HXX
+#define INCLUDED_VCL_OSX_CLIPBOARD_HXX
#include "DataFlavorMapping.hxx"
#include <rtl/ustring.hxx>
@@ -170,6 +170,6 @@ private:
EventListener* mEventListener;
};
-#endif
+#endif // INCLUDED_VCL_OSX_CLIPBOARD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx
similarity index 100%
rename from vcl/aqua/source/a11y/documentfocuslistener.cxx
rename to vcl/osx/documentfocuslistener.cxx
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx
similarity index 94%
rename from vcl/aqua/source/a11y/documentfocuslistener.hxx
rename to vcl/osx/documentfocuslistener.hxx
index 1baba33..1a604a6 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/osx/documentfocuslistener.hxx
@@ -17,14 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
+#ifndef INCLUDED_VCL_OSX_DOCUMENTFOCUSLISTENER_HXX
+#define INCLUDED_VCL_OSX_DOCUMENTFOCUSLISTENER_HXX
#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <cppuhelper/implbase1.hxx>
-#include "aqua/aqua11yfocustracker.hxx"
+#include "osx/a11yfocustracker.hxx"
#include <set>
@@ -87,5 +87,6 @@ private:
AquaA11yFocusTracker& m_aFocusTracker;
};
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
+#endif // INCLUDED_VCL_OSX_DOCUMENTFOCUSLISTENER_HXX
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/osx/printaccessoryview.mm
similarity index 99%
rename from vcl/aqua/source/gdi/aquaprintaccessoryview.mm
rename to vcl/osx/printaccessoryview.mm
index 5c6ea0e..517dcc0 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -27,8 +27,8 @@
#include "vcl/svapp.hxx"
#include "vcl/unohelp.hxx"
-#include "aqua/aquaprintview.h"
-#include "aqua/salinst.h"
+#include "osx/printview.h"
+#include "osx/salinst.h"
#include "quartz/utils.h"
#include "svdata.hxx"
@@ -499,7 +499,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
}
else
{
- SAL_INFO( "vcl.aqua.print", "Unsupported class" << ([pSender class] ? [NSStringFromClass([pSender class]) UTF8String] : "nil"));
+ SAL_INFO( "vcl.osx.print", "Unsupported class" << ([pSender class] ? [NSStringFromClass([pSender class]) UTF8String] : "nil"));
}
mpController->updateEnableState();
}
@@ -531,7 +531,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
}
else
{
- SAL_INFO( "vcl.aqua.print", "Unsupported class" << ([pSender class] ? [NSStringFromClass([pSender class]) UTF8String] : "nil"));
+ SAL_INFO( "vcl.osx.print", "Unsupported class" << ([pSender class] ? [NSStringFromClass([pSender class]) UTF8String] : "nil"));
}
mpController->updateEnableState();
}
@@ -1338,7 +1338,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
}
else
{
- SAL_INFO( "vcl.aqua.print", "Unsupported UI option \"" << aCtrlType << "\"");
+ SAL_INFO( "vcl.osx.print", "Unsupported UI option \"" << aCtrlType << "\"");
}
}
diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/osx/printview.mm
similarity index 97%
rename from vcl/aqua/source/gdi/aquaprintview.mm
rename to vcl/osx/printview.mm
index d7957ee..d2f4ac0 100644
--- a/vcl/aqua/source/gdi/aquaprintview.mm
+++ b/vcl/osx/printview.mm
@@ -20,8 +20,8 @@
#include "vcl/print.hxx"
-#include "aqua/aquaprintview.h"
-#include "aqua/salprn.h"
+#include "osx/printview.h"
+#include "osx/salprn.h"
@implementation AquaPrintView
-(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter
diff --git a/vcl/aqua/source/res/MainMenu.nib/classes.nib b/vcl/osx/res/MainMenu.nib/classes.nib
similarity index 100%
rename from vcl/aqua/source/res/MainMenu.nib/classes.nib
rename to vcl/osx/res/MainMenu.nib/classes.nib
diff --git a/vcl/aqua/source/res/MainMenu.nib/info.nib b/vcl/osx/res/MainMenu.nib/info.nib
similarity index 100%
rename from vcl/aqua/source/res/MainMenu.nib/info.nib
rename to vcl/osx/res/MainMenu.nib/info.nib
diff --git a/vcl/aqua/source/res/MainMenu.nib/keyedobjects.nib b/vcl/osx/res/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from vcl/aqua/source/res/MainMenu.nib/keyedobjects.nib
rename to vcl/osx/res/MainMenu.nib/keyedobjects.nib
diff --git a/vcl/aqua/source/res/cursors/airbrush.png b/vcl/osx/res/cursors/airbrush.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/airbrush.png
rename to vcl/osx/res/cursors/airbrush.png
diff --git a/vcl/aqua/source/res/cursors/ase.png b/vcl/osx/res/cursors/ase.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/ase.png
rename to vcl/osx/res/cursors/ase.png
diff --git a/vcl/aqua/source/res/cursors/asn.png b/vcl/osx/res/cursors/asn.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/asn.png
rename to vcl/osx/res/cursors/asn.png
diff --git a/vcl/aqua/source/res/cursors/asne.png b/vcl/osx/res/cursors/asne.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/asne.png
rename to vcl/osx/res/cursors/asne.png
diff --git a/vcl/aqua/source/res/cursors/asns.png b/vcl/osx/res/cursors/asns.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/asns.png
rename to vcl/osx/res/cursors/asns.png
diff --git a/vcl/aqua/source/res/cursors/asnswe.png b/vcl/osx/res/cursors/asnswe.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/asnswe.png
rename to vcl/osx/res/cursors/asnswe.png
diff --git a/vcl/aqua/source/res/cursors/asnw.png b/vcl/osx/res/cursors/asnw.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/asnw.png
rename to vcl/osx/res/cursors/asnw.png
diff --git a/vcl/aqua/source/res/cursors/ass.png b/vcl/osx/res/cursors/ass.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/ass.png
rename to vcl/osx/res/cursors/ass.png
diff --git a/vcl/aqua/source/res/cursors/asse.png b/vcl/osx/res/cursors/asse.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/asse.png
rename to vcl/osx/res/cursors/asse.png
diff --git a/vcl/aqua/source/res/cursors/assw.png b/vcl/osx/res/cursors/assw.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/assw.png
rename to vcl/osx/res/cursors/assw.png
diff --git a/vcl/aqua/source/res/cursors/asw.png b/vcl/osx/res/cursors/asw.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/asw.png
rename to vcl/osx/res/cursors/asw.png
diff --git a/vcl/aqua/source/res/cursors/aswe.png b/vcl/osx/res/cursors/aswe.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/aswe.png
rename to vcl/osx/res/cursors/aswe.png
diff --git a/vcl/aqua/source/res/cursors/chain.png b/vcl/osx/res/cursors/chain.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/chain.png
rename to vcl/osx/res/cursors/chain.png
diff --git a/vcl/aqua/source/res/cursors/chainnot.png b/vcl/osx/res/cursors/chainnot.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/chainnot.png
rename to vcl/osx/res/cursors/chainnot.png
diff --git a/vcl/aqua/source/res/cursors/chart.png b/vcl/osx/res/cursors/chart.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/chart.png
rename to vcl/osx/res/cursors/chart.png
diff --git a/vcl/aqua/source/res/cursors/copydata.png b/vcl/osx/res/cursors/copydata.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/copydata.png
rename to vcl/osx/res/cursors/copydata.png
diff --git a/vcl/aqua/source/res/cursors/copydlnk.png b/vcl/osx/res/cursors/copydlnk.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/copydlnk.png
rename to vcl/osx/res/cursors/copydlnk.png
diff --git a/vcl/aqua/source/res/cursors/copyf.png b/vcl/osx/res/cursors/copyf.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/copyf.png
rename to vcl/osx/res/cursors/copyf.png
diff --git a/vcl/aqua/source/res/cursors/copyf2.png b/vcl/osx/res/cursors/copyf2.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/copyf2.png
rename to vcl/osx/res/cursors/copyf2.png
diff --git a/vcl/aqua/source/res/cursors/copyflnk.png b/vcl/osx/res/cursors/copyflnk.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/copyflnk.png
rename to vcl/osx/res/cursors/copyflnk.png
diff --git a/vcl/aqua/source/res/cursors/crook.png b/vcl/osx/res/cursors/crook.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/crook.png
rename to vcl/osx/res/cursors/crook.png
diff --git a/vcl/aqua/source/res/cursors/crop.png b/vcl/osx/res/cursors/crop.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/crop.png
rename to vcl/osx/res/cursors/crop.png
diff --git a/vcl/aqua/source/res/cursors/darc.png b/vcl/osx/res/cursors/darc.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/darc.png
rename to vcl/osx/res/cursors/darc.png
diff --git a/vcl/aqua/source/res/cursors/dbezier.png b/vcl/osx/res/cursors/dbezier.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/dbezier.png
rename to vcl/osx/res/cursors/dbezier.png
diff --git a/vcl/aqua/source/res/cursors/dcapt.png b/vcl/osx/res/cursors/dcapt.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/dcapt.png
rename to vcl/osx/res/cursors/dcapt.png
diff --git a/vcl/aqua/source/res/cursors/dcirccut.png b/vcl/osx/res/cursors/dcirccut.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/dcirccut.png
rename to vcl/osx/res/cursors/dcirccut.png
diff --git a/vcl/aqua/source/res/cursors/dconnect.png b/vcl/osx/res/cursors/dconnect.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/dconnect.png
rename to vcl/osx/res/cursors/dconnect.png
diff --git a/vcl/aqua/source/res/cursors/dellipse.png b/vcl/osx/res/cursors/dellipse.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/dellipse.png
rename to vcl/osx/res/cursors/dellipse.png
diff --git a/vcl/aqua/source/res/cursors/detectiv.png b/vcl/osx/res/cursors/detectiv.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/detectiv.png
rename to vcl/osx/res/cursors/detectiv.png
diff --git a/vcl/aqua/source/res/cursors/dfree.png b/vcl/osx/res/cursors/dfree.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/dfree.png
rename to vcl/osx/res/cursors/dfree.png
diff --git a/vcl/aqua/source/res/cursors/dline.png b/vcl/osx/res/cursors/dline.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/dline.png
rename to vcl/osx/res/cursors/dline.png
diff --git a/vcl/aqua/source/res/cursors/dpie.png b/vcl/osx/res/cursors/dpie.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/dpie.png
rename to vcl/osx/res/cursors/dpie.png
diff --git a/vcl/aqua/source/res/cursors/dpolygon.png b/vcl/osx/res/cursors/dpolygon.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/dpolygon.png
rename to vcl/osx/res/cursors/dpolygon.png
diff --git a/vcl/aqua/source/res/cursors/drect.png b/vcl/osx/res/cursors/drect.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/drect.png
rename to vcl/osx/res/cursors/drect.png
diff --git a/vcl/aqua/source/res/cursors/dtext.png b/vcl/osx/res/cursors/dtext.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/dtext.png
rename to vcl/osx/res/cursors/dtext.png
diff --git a/vcl/aqua/source/res/cursors/fill.png b/vcl/osx/res/cursors/fill.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/fill.png
rename to vcl/osx/res/cursors/fill.png
diff --git a/vcl/aqua/source/res/cursors/help.png b/vcl/osx/res/cursors/help.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/help.png
rename to vcl/osx/res/cursors/help.png
diff --git a/vcl/aqua/source/res/cursors/hourglass.png b/vcl/osx/res/cursors/hourglass.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/hourglass.png
rename to vcl/osx/res/cursors/hourglass.png
diff --git a/vcl/aqua/source/res/cursors/hshear.png b/vcl/osx/res/cursors/hshear.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/hshear.png
rename to vcl/osx/res/cursors/hshear.png
diff --git a/vcl/aqua/source/res/cursors/linkdata.png b/vcl/osx/res/cursors/linkdata.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/linkdata.png
rename to vcl/osx/res/cursors/linkdata.png
diff --git a/vcl/aqua/source/res/cursors/linkf.png b/vcl/osx/res/cursors/linkf.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/linkf.png
rename to vcl/osx/res/cursors/linkf.png
diff --git a/vcl/aqua/source/res/cursors/magnify.png b/vcl/osx/res/cursors/magnify.png
similarity index 100%
rename from vcl/aqua/source/res/cursors/magnify.png
rename to vcl/osx/res/cursors/magnify.png
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list