[Libreoffice-commits] core.git: vcl/osx

[Stephan Bergmann]

 vcl/osx/cuidraw.hxx          |   47 +++++++++++++++++++++++++++++++++++++++++++
 vcl/osx/salnativewidgets.cxx |    8 +------
 2 files changed, 49 insertions(+), 6 deletions(-)

New commits:
commit 279fc1a2ae2ae8d51768e438787c3bc9a59df55e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Aug 4 18:16:39 2014 +0200

    loplugin:externandnotdefined
    
    Change-Id: I5337cd288e3f5d6f7c42d7a1f5c9b2dbce5f06b4

diff --git a/vcl/osx/cuidraw.hxx b/vcl/osx/cuidraw.hxx
new file mode 100644
index 0000000..02cd2cd
--- /dev/null
+++ b/vcl/osx/cuidraw.hxx
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_OSX_CUIDRAW_HXX
+#define INCLUDED_VCL_OSX_CUIDRAW_HXX
+
+#include <sal/config.h>
+
+#include <premac.h>
+#include <Carbon/Carbon.h>
+#include <postmac.h>
+
+#include <config_features.h>
+
+#if !HAVE_FEATURE_MACOSX_SANDBOX
+
+extern "C" {
+
+typedef CFTypeRef CUIRendererRef;
+
+void CUIDraw(
+    CUIRendererRef r, CGRect rect, CGContextRef ctx, CFDictionaryRef options,
+    CFDictionaryRef * result);
+
+}
+
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 5aebe47..1dd622c 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -34,18 +34,14 @@
 #include <Carbon/Carbon.h>
 #include "postmac.h"
 
+#include <cuidraw.hxx>
+
 #ifndef NSAppKitVersionNumber10_7
 #define NSAppKitVersionNumber10_7 1138
 #endif
 
 #if !HAVE_FEATURE_MACOSX_SANDBOX
 
-extern "C"
-{
-    typedef CFTypeRef CUIRendererRef;
-    void CUIDraw(CUIRendererRef r, CGRect rect, CGContextRef ctx, CFDictionaryRef options, CFDictionaryRef* result);
-}
-
 @interface NSWindow(CoreUIRendererPrivate)
 + (CUIRendererRef)coreUIRenderer;
 @end