summaryrefslogtreecommitdiff
path: root/include/svtools/ctrlbox.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/svtools/ctrlbox.hxx
parent7cbbefae224ab85343accb42b03f9431ec693a83 (diff)
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11 Window typedef. Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'include/svtools/ctrlbox.hxx')
-rw-r--r--include/svtools/ctrlbox.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 5d728141791e..de433f61389d 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -155,9 +155,9 @@ class SVT_DLLPUBLIC ColorListBox : public ListBox
SVT_DLLPRIVATE void ImplDestroyColorEntries();
public:
- ColorListBox( Window* pParent,
+ ColorListBox( vcl::Window* pParent,
WinBits nWinStyle = WB_BORDER );
- ColorListBox( Window* pParent, const ResId& rResId );
+ ColorListBox( vcl::Window* pParent, const ResId& rResId );
virtual ~ColorListBox();
virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
@@ -302,7 +302,7 @@ public:
typedef Color (*ColorFunc)(Color);
typedef Color (*ColorDistFunc)(Color, Color);
- LineListBox( Window* pParent, WinBits nWinStyle = WB_BORDER );
+ LineListBox( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER );
virtual ~LineListBox();
/** Set the width in Twips */
@@ -404,7 +404,7 @@ protected:
void LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep = ';' );
void SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep = ';' ) const;
public:
- FontNameBox( Window* pParent,
+ FontNameBox( vcl::Window* pParent,
WinBits nWinStyle = WB_SORT );
virtual ~FontNameBox();
@@ -432,7 +432,7 @@ class SVT_DLLPUBLIC FontStyleBox : public ComboBox
private:
using ComboBox::SetText;
public:
- FontStyleBox( Window* pParent, WinBits nBits );
+ FontStyleBox( vcl::Window* pParent, WinBits nBits );
virtual ~FontStyleBox();
virtual void Select() SAL_OVERRIDE;
@@ -477,7 +477,7 @@ protected:
virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE;
public:
- FontSizeBox( Window* pParent, WinBits nWinStyle = 0 );
+ FontSizeBox( vcl::Window* pParent, WinBits nWinStyle = 0 );
virtual ~FontSizeBox();
void Reformat() SAL_OVERRIDE;