summaryrefslogtreecommitdiff
path: root/include/postwin.h
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-08-16 11:48:48 +0300
committerTor Lillqvist <tml@collabora.com>2014-08-16 18:45:57 +0300
commita8669b56b194a7cd6da771dfb9904710da24c0b4 (patch)
tree4ccf0d74b1a8170a51fab26fecc39c115c3174ce /include/postwin.h
parentbc19caa4f17ccbcd6e08634ae635fd9c741473ad (diff)
fdo#82580: Win32 GetObject() simplification
We call the Win32 GetObject() in just one source file and there it is the A version we mean. (As such, as we call it to get BITMAP objects, which do not have different A and W variants, we could as well call GetObjectW().) Note that we have several own member functions called GetObject(), so until those are renamed we still need to #undef the GetObject definition (from <windows.h>). (No, I am not working on the EasyHack fdo#82580 as a whole. It is intended for some less mature LO contributor. I just did a few small things because I couldn't resist.) Change-Id: Idab79503b3d899ef19f0608677752a62b20302ff
Diffstat (limited to 'include/postwin.h')
-rw-r--r--include/postwin.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/include/postwin.h b/include/postwin.h
index a76bcb875226..64ac27eb5837 100644
--- a/include/postwin.h
+++ b/include/postwin.h
@@ -34,16 +34,7 @@
#undef WB_LEFT
#undef WB_RIGHT
-#ifdef GetObject
#undef GetObject
-#ifdef UNICODE
-#define WIN_GetObject GetObjectW
-#else
-#define WIN_GetObject GetObjectA
-#endif
-#else
-#define WIN_GetObject GetObject
-#endif
#ifdef SetPrinter
#undef SetPrinter