diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-12-11 14:55:21 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-12-11 15:53:35 +0200 |
| commit | c95a6adceb4e5de8b5a73156eb4e8ee21d59899c (patch) | |
| tree | bc34c22d0e89f75805ad20742c3d8242048803c5 /include | |
| parent | fe445df126ff0be771494dfef3aec09ca82f8aef (diff) | |
No need for a separate <vcl/combobox.h>
Change-Id: Iebf7b44e78fc28c20bdf0cbea84dbfd730b04016
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/combobox.h | 31 | ||||
| -rw-r--r-- | include/vcl/combobox.hxx | 7 |
2 files changed, 5 insertions, 33 deletions
diff --git a/include/vcl/combobox.h b/include/vcl/combobox.h deleted file mode 100644 index d51b670aeba2..000000000000 --- a/include/vcl/combobox.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- 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_COMBOBOX_H -#define INCLUDED_VCL_COMBOBOX_H - -#include <vcl/lstbox.h> - -#define COMBOBOX_APPEND (SAL_MAX_INT32) -#define COMBOBOX_ENTRY_NOTFOUND (SAL_MAX_INT32) -#define COMBOBOX_MAX_ENTRIES (SAL_MAX_INT32 - 1) - -#endif // INCLUDED_VCL_COMBOBOX_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index a215eaff190e..42c012c24e68 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -21,11 +21,14 @@ #define INCLUDED_VCL_COMBOBOX_HXX #include <vcl/dllapi.h> -#include <vcl/combobox.h> #include <vcl/edit.hxx> +#include <vcl/lstbox.h> -class UserDrawEvent; +#define COMBOBOX_APPEND (SAL_MAX_INT32) +#define COMBOBOX_ENTRY_NOTFOUND (SAL_MAX_INT32) +#define COMBOBOX_MAX_ENTRIES (SAL_MAX_INT32 - 1) +class UserDrawEvent; class ImplListBoxFloatingWindow; class ImplListBox; class ImplBtn; |