diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/vcl | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (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/vcl')
63 files changed, 518 insertions, 492 deletions
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index 3464d03de94c..d877e6d3dc46 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> #include <vcl/dllapi.h> -class Window; +namespace vcl { class Window; } class ResId; class Link; @@ -69,10 +69,10 @@ public: static VclAbstractDialogFactory* Create(); // nDialogId was previously a ResId without ResMgr; the ResourceId is now // an implementation detail of the factory - virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ) = 0; + virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) = 0; // creates instance of PasswordToOpenModifyDialog from cui - virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) = 0; + virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) = 0; }; #endif diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 3a955433bc33..958b0f394be9 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -61,7 +61,7 @@ protected: SAL_DLLPRIVATE long ImplGetButtonSize(); public: - ButtonDialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); + ButtonDialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); virtual ~ButtonDialog(); virtual void Resize() SAL_OVERRIDE; diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index f9adddb84585..4e62f41f95fc 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -44,7 +44,7 @@ class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable { public: typedef std::map<OString, OString> stringmap; - typedef ::Window* (*customMakeWidget)(::Window *pParent, stringmap &rVec); + typedef vcl::Window* (*customMakeWidget)(vcl::Window *pParent, stringmap &rVec); private: typedef boost::ptr_map<OUString, osl::Module> ModuleMap; //We store these until the builder is deleted, that way we can use the @@ -73,10 +73,10 @@ private: struct WinAndId { OString m_sID; - ::Window *m_pWindow; + vcl::Window *m_pWindow; short m_nResponseId; PackingData m_aPackingData; - WinAndId(const OString &rId, ::Window *pWindow, bool bVertical) + WinAndId(const OString &rId, vcl::Window *pWindow, bool bVertical) : m_sID(rId) , m_pWindow(pWindow) , m_nResponseId(RET_CANCEL) @@ -184,7 +184,7 @@ private: } }; - typedef std::map< ::Window*, stringmap> AtkMap; + typedef std::map< vcl::Window*, stringmap> AtkMap; struct ParserState { @@ -209,7 +209,7 @@ private: Translations m_aTranslations; - std::map< ::Window*, ::Window*> m_aRedundantParentWidgets; + std::map< vcl::Window*, vcl::Window*> m_aRedundantParentWidgets; std::vector<SizeGroup> m_aSizeGroups; @@ -232,17 +232,17 @@ private: OString m_sID; OString m_sHelpRoot; ResHookProc m_pStringReplace; - ::Window *m_pParent; + vcl::Window *m_pParent; bool m_bToplevelHasDeferredInit; bool m_bToplevelHasDeferredProperties; bool m_bToplevelParentFound; ParserState *m_pParserState; - ::Window *get_by_name(const OString& sID); + vcl::Window *get_by_name(const OString& sID); void delete_by_name(const OString& sID); class sortIntoBestTabTraversalOrder - : public std::binary_function<const ::Window*, const ::Window*, bool> + : public std::binary_function<const vcl::Window*, const vcl::Window*, bool> { VclBuilder *m_pBuilder; public: @@ -250,22 +250,22 @@ private: : m_pBuilder(pBuilder) { } - bool operator()(const ::Window *pA, const ::Window *pB) const; + bool operator()(const vcl::Window *pA, const vcl::Window *pB) const; }; /// XFrame to be able to extract labels and other properties of the UNO commands (like of .uno:Bold). css::uno::Reference<css::frame::XFrame> m_xFrame; public: - VclBuilder(::Window *pParent, const OUString& sUIRootDir, const OUString& sUIFile, + VclBuilder(vcl::Window *pParent, const OUString& sUIRootDir, const OUString& sUIFile, const OString& sID = OString(), const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); ~VclBuilder(); - ::Window *get_widget_root(); + vcl::Window *get_widget_root(); //sID must exist and be of type T template <typename T> T* get(T*& ret, const OString& sID) { - ::Window *w = get_by_name(sID); + vcl::Window *w = get_by_name(sID); SAL_WARN_IF(!w, "vcl.layout", "widget \"" << sID.getStr() << "\" not found in .ui"); SAL_WARN_IF(!dynamic_cast<T*>(w), "vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to correspond to vcl type " << typeid(T).name()); @@ -281,9 +281,9 @@ public: return ret; } //sID may not exist, but must be of type T if it does - template <typename T /*= ::Window if we had c++11*/> T* get(const OString& sID) + template <typename T /*= vcl::Window if we had c++11*/> T* get(const OString& sID) { - ::Window *w = get_by_name(sID); + vcl::Window *w = get_by_name(sID); SAL_WARN_IF(w && !dynamic_cast<T*>(w), "vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to correspond to vcl type " << typeid(T).name()); assert(!w || dynamic_cast<T*>(w)); @@ -293,16 +293,16 @@ public: PopupMenu* get_menu(const OString& sID); //given an sID return the response value for that widget - short get_response(const ::Window *pWindow) const; + short get_response(const vcl::Window *pWindow) const; - OString get_by_window(const ::Window *pWindow) const; - void delete_by_window(const ::Window *pWindow); + OString get_by_window(const vcl::Window *pWindow) const; + void delete_by_window(const vcl::Window *pWindow); //release ownership of pWindow, i.e. don't delete it - void drop_ownership(const ::Window *pWindow); + void drop_ownership(const vcl::Window *pWindow); //apply the properties of rProps to pWindow - static void set_properties(::Window *pWindow, const stringmap &rProps); + static void set_properties(vcl::Window *pWindow, const stringmap &rProps); //Convert _ gtk markup to ~ vcl markup static OString convertMnemonicMarkup(const OString &rIn); @@ -322,8 +322,8 @@ public: void setDeferredProperties(); //Helpers to retrofit all the existing code to the builder - static void reorderWithinParent(std::vector< ::Window*>& rChilds, bool bIsButtonBox); - static void reorderWithinParent(::Window &rWindow, sal_uInt16 nNewPosition); + static void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox); + static void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition); /// Get label of the command (like of .uno:Save) from the description service static OUString getCommandLabel(const OUString& rCommand, const css::uno::Reference<css::uno::XComponentContext>& rContext, const OUString& rModuleId); @@ -335,12 +335,12 @@ public: css::uno::Reference<css::frame::XFrame> getFrame() { return m_xFrame; } private: - ::Window *insertObject(::Window *pParent, + vcl::Window *insertObject(vcl::Window *pParent, const OString &rClass, const OString &rID, stringmap &rProps, stringmap &rPangoAttributes, stringmap &rAtkProps, std::vector<OString> &rItems); - ::Window *makeObject(::Window *pParent, + vcl::Window *makeObject(vcl::Window *pParent, const OString &rClass, const OString &rID, stringmap &rVec, const std::vector<OString> &rItems); @@ -358,10 +358,10 @@ private: void handleTranslations(xmlreader::XmlReader &reader); - void handleChild(::Window *pParent, xmlreader::XmlReader &reader); - ::Window* handleObject(::Window *pParent, xmlreader::XmlReader &reader); - void handlePacking(::Window *pCurrent, ::Window *pParent, xmlreader::XmlReader &reader); - void applyPackingProperty(::Window *pCurrent, ::Window *pParent, xmlreader::XmlReader &reader); + void handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader); + vcl::Window* handleObject(vcl::Window *pParent, xmlreader::XmlReader &reader); + void handlePacking(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader); + void applyPackingProperty(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader); void collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rVec); void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap); void collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rMap); @@ -376,21 +376,21 @@ private: void handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex); void handleAdjustment(const OString &rID, stringmap &rProperties); void handleTextBuffer(const OString &rID, stringmap &rProperties); - void handleTabChild(::Window *pParent, xmlreader::XmlReader &reader); + void handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &reader); void handleMenu(xmlreader::XmlReader &reader, const OString &rID); std::vector<OString> handleItems(xmlreader::XmlReader &reader, const OString &rID); void handleSizeGroup(xmlreader::XmlReader &reader, const OString &rID); - void handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, ::Window *pWindow); + void handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, vcl::Window *pWindow); void handleActionWidget(xmlreader::XmlReader &reader); - PackingData get_window_packing_data(const ::Window *pWindow) const; - void set_window_packing_position(const ::Window *pWindow, sal_Int32 nPosition); + PackingData get_window_packing_data(const vcl::Window *pWindow) const; + void set_window_packing_position(const vcl::Window *pWindow, sal_Int32 nPosition); - ::Window* prepareWidgetOwnScrolling(::Window *pParent, WinBits &rWinStyle); - void cleanupWidgetOwnScrolling(::Window *pScrollParent, ::Window *pWindow, stringmap &rMap); + vcl::Window* prepareWidgetOwnScrolling(vcl::Window *pParent, WinBits &rWinStyle); + void cleanupWidgetOwnScrolling(vcl::Window *pScrollParent, vcl::Window *pWindow, stringmap &rMap); void set_response(const OString& sID, short nResponse); }; @@ -421,7 +421,7 @@ public: { return m_pUIBuilder->get<T>(ret, sID); } - template <typename T /*= ::Window if we had c++11*/> T* get(const OString & sID) + template <typename T /*= vcl::Window if we had c++11*/> T* get(const OString & sID) { return m_pUIBuilder->get<T>(sID); } diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index c06ff8c766c8..7a9623286569 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -112,7 +112,7 @@ protected: Link maToggleHdl; SAL_DLLPRIVATE void ImplInitPushButtonData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawFlags, const Rectangle& rRect, bool bLayout, bool bMenuBtnSep ); @@ -126,14 +126,14 @@ protected: SAL_DLLPRIVATE PushButton( const PushButton & ); SAL_DLLPRIVATE PushButton& operator=( const PushButton & ); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); using Control::ImplInitSettings; using Window::ImplInit; public: SAL_DLLPRIVATE void ImplSetDefButton( bool bSet ); - SAL_DLLPRIVATE static void ImplDrawPushButtonFrame( Window* pDev, Rectangle& rRect, sal_uInt16 nStyle ); - SAL_DLLPRIVATE static bool ImplHitTestPushButton( Window* pDev, const Point& rPos ); + SAL_DLLPRIVATE static void ImplDrawPushButtonFrame( vcl::Window* pDev, Rectangle& rRect, sal_uInt16 nStyle ); + SAL_DLLPRIVATE static bool ImplHitTestPushButton( vcl::Window* pDev, const Point& rPos ); SAL_DLLPRIVATE bool ImplIsDefButton() const; protected: @@ -145,8 +145,8 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: - explicit PushButton( Window* pParent, WinBits nStyle = 0 ); - explicit PushButton( Window* pParent, const ResId& ); + explicit PushButton( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit PushButton( vcl::Window* pParent, const ResId& ); virtual ~PushButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -210,14 +210,14 @@ class VCL_DLLPUBLIC OKButton : public PushButton protected: using PushButton::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE OKButton (const OKButton &); SAL_DLLPRIVATE OKButton & operator= (const OKButton &); public: - explicit OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON ); + explicit OKButton( vcl::Window* pParent, WinBits nStyle = WB_DEFBUTTON ); virtual void Click() SAL_OVERRIDE; }; @@ -228,14 +228,14 @@ class VCL_DLLPUBLIC CancelButton : public PushButton protected: using PushButton::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE CancelButton (const CancelButton &); SAL_DLLPRIVATE CancelButton & operator= (const CancelButton &); public: - explicit CancelButton( Window* pParent, WinBits nStyle = 0 ); + explicit CancelButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void Click() SAL_OVERRIDE; }; @@ -243,7 +243,7 @@ public: class VCL_DLLPUBLIC CloseButton : public CancelButton { public: - explicit CloseButton(Window* pParent, WinBits nStyle = 0); + explicit CloseButton(vcl::Window* pParent, WinBits nStyle = 0); }; @@ -256,15 +256,15 @@ class VCL_DLLPUBLIC HelpButton : public PushButton protected: using PushButton::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE HelpButton( const HelpButton & ); SAL_DLLPRIVATE HelpButton & operator= ( const HelpButton & ); public: - explicit HelpButton( Window* pParent, WinBits nStyle = 0 ); - explicit HelpButton( Window* pParent, const ResId& ); + explicit HelpButton( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit HelpButton( vcl::Window* pParent, const ResId& ); virtual void Click() SAL_OVERRIDE; }; @@ -291,7 +291,7 @@ private: // to the left or right ( depending on RTL or LTR settings ) bool mbLegacyNoTextAlign; SAL_DLLPRIVATE void ImplInitRadioButtonData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawRadioButtonState(); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -311,7 +311,7 @@ private: protected: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: @@ -335,8 +335,8 @@ protected: void DrawRadioButtonState( ); public: - explicit RadioButton( Window* pParent, WinBits nWinStyle = 0 ); - explicit RadioButton( Window* pParent, const ResId& ); + explicit RadioButton( vcl::Window* pParent, WinBits nWinStyle = 0 ); + explicit RadioButton( vcl::Window* pParent, const ResId& ); virtual ~RadioButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -420,7 +420,7 @@ private: // to the left or right ( depending on RTL or LTR settings ) bool mbLegacyNoTextAlign; SAL_DLLPRIVATE void ImplInitCheckBoxData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplInvalidateOrDrawCheckBoxState(); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -438,7 +438,7 @@ private: protected: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); virtual void FillLayoutData() const SAL_OVERRIDE; virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; @@ -452,8 +452,8 @@ public: SAL_DLLPRIVATE void ImplCheck(); SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); public: - explicit CheckBox( Window* pParent, WinBits nStyle = 0 ); - explicit CheckBox( Window* pParent, const ResId& ); + explicit CheckBox( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit CheckBox( vcl::Window* pParent, const ResId& ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; @@ -522,8 +522,8 @@ private: SAL_DLLPRIVATE ImageButton & operator= ( const ImageButton & ); public: - ImageButton( Window* pParent, WinBits nStyle = 0 ); - ImageButton( Window* pParent, const ResId& rResId ); + ImageButton( vcl::Window* pParent, WinBits nStyle = 0 ); + ImageButton( vcl::Window* pParent, const ResId& rResId ); virtual ~ImageButton(); }; @@ -534,7 +534,7 @@ class VCL_DLLPUBLIC ImageRadioButton : public RadioButton SAL_DLLPRIVATE ImageRadioButton & operator= ( const ImageRadioButton & ); public: - explicit ImageRadioButton( Window* pParent, WinBits nStyle = 0 ); + explicit ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~ImageRadioButton(); }; @@ -545,7 +545,7 @@ class VCL_DLLPUBLIC TriStateBox : public CheckBox SAL_DLLPRIVATE TriStateBox & operator= ( const TriStateBox & ); public: - explicit TriStateBox( Window* pParent, WinBits nStyle = 0 ); + explicit TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~TriStateBox(); }; @@ -554,7 +554,7 @@ class VCL_DLLPUBLIC DisclosureButton : public CheckBox protected: SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState() SAL_OVERRIDE; public: - explicit DisclosureButton( Window* pParent, WinBits nStyle = 0 ); + explicit DisclosureButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; }; diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index b80d088ab748..3928a4cb1be6 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -81,7 +81,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplCalcEditHeight(); @@ -92,8 +92,8 @@ protected: virtual void FillLayoutData() const SAL_OVERRIDE; public: - explicit ComboBox( Window* pParent, WinBits nStyle = 0 ); - explicit ComboBox( Window* pParent, const ResId& ); + explicit ComboBox( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit ComboBox( vcl::Window* pParent, const ResId& ); virtual ~ComboBox(); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 02b1acb2669e..11582347936d 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -34,7 +34,7 @@ class StyleSettings; // - Control - -class VCL_DLLPUBLIC Control : public Window +class VCL_DLLPUBLIC Control : public vcl::Window { protected: ::vcl::ImplControlData* mpControlData; @@ -125,8 +125,8 @@ public: SAL_DLLPRIVATE void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect ); public: - explicit Control( Window* pParent, WinBits nWinStyle = 0 ); - explicit Control( Window* pParent, const ResId& ); + explicit Control( vcl::Window* pParent, WinBits nWinStyle = 0 ); + explicit Control( vcl::Window* pParent, const ResId& ); virtual ~Control(); virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index 0fa4b8277ec5..2d3b83c0b119 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -25,7 +25,7 @@ #include <vcl/dllapi.h> struct ImplCursorData; -class Window; +namespace vcl { class Window; } // Cursor styles #define CURSOR_SHADOW ((sal_uInt16)0x0001) @@ -40,7 +40,7 @@ class VCL_DLLPUBLIC Cursor { private: ImplCursorData* mpData; - Window* mpWindow; // only for shadow cursor + vcl::Window* mpWindow; // only for shadow cursor long mnSlant; Size maSize; Point maPos; @@ -71,8 +71,8 @@ public: void Hide(); bool IsVisible() const { return mbVisible; } - void SetWindow( Window* pWindow ); - Window* GetWindow() const { return mpWindow; } + void SetWindow( vcl::Window* pWindow ); + vcl::Window* GetWindow() const { return mpWindow; } void SetPos( const Point& rNewPos ); const Point& GetPos() const { return maPos; } diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx index c61f93f9632f..3c6e9aa303c0 100644 --- a/include/vcl/debugevent.hxx +++ b/include/vcl/debugevent.hxx @@ -21,7 +21,7 @@ class VCL_DLLPUBLIC DebugEventInjector : Timer { sal_uInt32 mnEventsLeft; DebugEventInjector( sal_uInt32 nMaxEvents ); - Window *ChooseWindow(); + vcl::Window *ChooseWindow(); void InjectTextEvent(); void InjectMenuEvent(); void InjectMouseEvent(); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index ff9f249f3367..85060404a3f4 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -27,7 +27,7 @@ // parameter to pass to the dialog constructor if really no parent is wanted // whereas NULL chooses the default dialog parent -#define DIALOG_NO_PARENT ((Window*)0xffffffff) +#define DIALOG_NO_PARENT ((vcl::Window*)0xffffffff) // - Dialog - @@ -61,7 +61,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); public: SAL_DLLPRIVATE bool IsInClose() const { return mbInClose; } @@ -69,7 +69,7 @@ public: protected: explicit Dialog( WindowType nType ); - explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); + explicit Dialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void settingOptimalLayoutSize(VclBox *pBox) SAL_OVERRIDE; @@ -79,8 +79,8 @@ protected: void set_content_area(VclBox *pBox); public: - explicit Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); - explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit Dialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); + explicit Dialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -111,7 +111,7 @@ public: void EndDialog( long nResult = 0 ); - static void EndAllDialogs( Window* pParent=NULL ); + static void EndAllDialogs( vcl::Window* pParent=NULL ); void GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; @@ -131,15 +131,15 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog SAL_DLLPRIVATE ModelessDialog & operator= (const ModelessDialog &); public: - explicit ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit ModelessDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); }; // - ModalDialog - class VCL_DLLPUBLIC ModalDialog : public Dialog { public: - explicit ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL ); - explicit ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit ModalDialog( vcl::Window* pParent, WinBits nStyle = WB_STDMODAL ); + explicit ModalDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); protected: using Window::Show; diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index 0208557ca0e5..c0b75181159e 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -24,7 +24,7 @@ // A simple container for docked toolbars // - its main purpose is theming support -class VCL_DLLPUBLIC DockingAreaWindow : public Window +class VCL_DLLPUBLIC DockingAreaWindow : public vcl::Window { class ImplData; @@ -36,7 +36,7 @@ private: SAL_DLLPRIVATE DockingAreaWindow & operator= (const DockingAreaWindow &); public: - explicit DockingAreaWindow( Window* pParent ); + explicit DockingAreaWindow( vcl::Window* pParent ); virtual ~DockingAreaWindow(); void SetAlign( WindowAlign eNewAlign ); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index f60e895f03d8..f683cc83dda2 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -72,19 +72,19 @@ struct EndPopupModeData class ImplDockingWindowWrapper { - friend class Window; + friend class ::vcl::Window; friend class DockingManager; friend class DockingWindow; private: // the original 'Docking'window - Window *mpDockingWindow; + vcl::Window *mpDockingWindow; // the original DockingWindow members FloatingWindow* mpFloatWin; - Window* mpOldBorderWin; - Window* mpParent; + vcl::Window* mpOldBorderWin; + vcl::Window* mpParent; Point maFloatPos; Point maDockPos; Point maMouseOff; @@ -122,10 +122,10 @@ private: bool ImplStartDockingEnabled() { return mbStartDockingEnabled; } public: - ImplDockingWindowWrapper( const Window *pWindow ); + ImplDockingWindowWrapper( const vcl::Window *pWindow ); virtual ~ImplDockingWindowWrapper(); - Window* GetWindow() { return mpDockingWindow; } + vcl::Window* GetWindow() { return mpDockingWindow; } bool ImplStartDocking( const Point& rPos ); // those methods actually call the corresponding handlers @@ -191,43 +191,43 @@ public: DockingManager(); ~DockingManager(); - void AddWindow( const Window *pWin ); - void RemoveWindow( const Window *pWin ); + void AddWindow( const vcl::Window *pWin ); + void RemoveWindow( const vcl::Window *pWin ); - ImplDockingWindowWrapper* GetDockingWindowWrapper( const Window *pWin ); - bool IsDockable( const Window *pWin ); + ImplDockingWindowWrapper* GetDockingWindowWrapper( const vcl::Window *pWin ); + bool IsDockable( const vcl::Window *pWin ); - bool IsFloating( const Window *pWin ); - void SetFloatingMode( const Window *pWin, bool bFloating ); + bool IsFloating( const vcl::Window *pWin ); + void SetFloatingMode( const vcl::Window *pWin, bool bFloating ); - void Lock( const Window *pWin ); - void Unlock( const Window *pWin ); - bool IsLocked( const Window *pWin ); + void Lock( const vcl::Window *pWin ); + void Unlock( const vcl::Window *pWin ); + bool IsLocked( const vcl::Window *pWin ); - void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin ); - void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin, sal_uLong nPopupModeFlags ); + void StartPopupMode( ToolBox *pParentToolBox, const vcl::Window *pWin ); + void StartPopupMode( ToolBox *pParentToolBox, const vcl::Window *pWin, sal_uLong nPopupModeFlags ); - bool IsInPopupMode( const Window *pWin ); - void EndPopupMode( const Window *pWin ); + bool IsInPopupMode( const vcl::Window *pWin ); + void EndPopupMode( const vcl::Window *pWin ); // required because those methods are not virtual in Window (!!!) and must // be availbale from the toolkit - void SetPosSizePixel( Window *pWin, long nX, long nY, + void SetPosSizePixel( vcl::Window *pWin, long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); - Rectangle GetPosSizePixel( const Window *pWin ); + Rectangle GetPosSizePixel( const vcl::Window *pWin ); }; // - DockingWindow - -class VCL_DLLPUBLIC DockingWindow : public Window +class VCL_DLLPUBLIC DockingWindow : public vcl::Window { class ImplData; private: FloatingWindow* mpFloatWin; - Window* mpOldBorderWin; + vcl::Window* mpOldBorderWin; ImplData* mpImplData; Point maFloatPos; Point maDockPos; @@ -266,7 +266,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -277,8 +277,8 @@ protected: DockingWindow( WindowType nType ); public: - DockingWindow( Window* pParent, WinBits nStyle = WB_STDDOCKWIN ); - DockingWindow( Window* pParent, const ResId& rResId ); + DockingWindow( vcl::Window* pParent, WinBits nStyle = WB_STDDOCKWIN ); + DockingWindow( vcl::Window* pParent, const ResId& rResId ); virtual ~DockingWindow(); virtual void StartDocking(); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 966eacffd2bc..58a49db4733f 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -45,7 +45,7 @@ struct Impl_IMEInfos; #define EDIT_NOLIMIT SAL_MAX_INT32 #define EDIT_UPDATEDATA_TIMEOUT 350 -typedef OUString (*FncGetSpecialChars)( Window* pWin, const vcl::Font& rFont ); +typedef OUString (*FncGetSpecialChars)( vcl::Window* pWin, const vcl::Font& rFont ); class VCL_DLLPUBLIC TextFilter { @@ -131,14 +131,14 @@ private: protected: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection, bool bPaint = true ); SAL_DLLPRIVATE int ImplGetNativeControlType() const; SAL_DLLPRIVATE long ImplGetExtraOffset() const; - static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( Window* pWin ); + static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( vcl::Window* pWin ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener > mxDnDListener; @@ -161,8 +161,8 @@ public: // public because needed in button.cxx SAL_DLLPRIVATE bool ImplUseNativeBorder( WinBits nStyle ); - Edit( Window* pParent, WinBits nStyle = WB_BORDER ); - Edit( Window* pParent, const ResId& rResId ); + Edit( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); + Edit( vcl::Window* pParent, const ResId& rResId ); virtual ~Edit(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -177,7 +177,7 @@ public: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual void Modify(); virtual void UpdateData(); @@ -250,7 +250,7 @@ public: sal_Int32 GetCharPos( const Point& rWindowPos ) const; // shows a warning box saying "text too long, truncated" - static void ShowTruncationWarning( Window* pParent ); + static void ShowTruncationWarning( vcl::Window* pParent ); static void SetGetSpecialCharsFunction( FncGetSpecialChars fn ); static FncGetSpecialChars GetGetSpecialCharsFunction(); diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 9f7ab05f8ecf..3cd5f8ac1708 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -28,7 +28,7 @@ class AllSettings; class OutputDevice; -class Window; +namespace vcl { class Window; } struct IDataObject; namespace com { namespace sun { namespace star { namespace awt { @@ -393,7 +393,7 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt, class VCL_DLLPUBLIC NotifyEvent { private: - Window* mpWindow; + vcl::Window* mpWindow; void* mpData; sal_uInt16 mnType; long mnRetValue; @@ -401,12 +401,12 @@ private: public: NotifyEvent(); NotifyEvent( sal_uInt16 nType, - Window* pWindow, + vcl::Window* pWindow, const void* pEvent = NULL, long nRet = 0 ); sal_uInt16 GetType() const { return mnType; } - Window* GetWindow() const { return mpWindow; } + vcl::Window* GetWindow() const { return mpWindow; } void* GetData() const { return mpData; } void SetReturnValue( long nRet ) { mnRetValue = nRet; } @@ -425,7 +425,7 @@ inline NotifyEvent::NotifyEvent() mnRetValue = 0; } -inline NotifyEvent::NotifyEvent( sal_uInt16 nType, Window* pWindow, +inline NotifyEvent::NotifyEvent( sal_uInt16 nType, vcl::Window* pWindow, const void* pEvent, long nRet ) { mpWindow = pWindow; diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index ad3e31044e18..1bf15e177a36 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -483,7 +483,7 @@ public: class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter { public: - explicit PatternField( Window* pParent, WinBits nWinStyle ); + explicit PatternField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~PatternField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -502,8 +502,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit NumericField( Window* pParent, WinBits nWinStyle ); - explicit NumericField( Window* pParent, const ResId& ); + explicit NumericField( vcl::Window* pParent, WinBits nWinStyle ); + explicit NumericField( vcl::Window* pParent, const ResId& ); virtual ~NumericField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -532,8 +532,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit MetricField( Window* pParent, WinBits nWinStyle ); - explicit MetricField( Window* pParent, const ResId& ); + explicit MetricField( vcl::Window* pParent, WinBits nWinStyle ); + explicit MetricField( vcl::Window* pParent, const ResId& ); virtual ~MetricField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -600,7 +600,7 @@ public: class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter { public: - CurrencyField( Window* pParent, WinBits nWinStyle ); + CurrencyField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~CurrencyField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -631,8 +631,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit DateField( Window* pParent, WinBits nWinStyle ); - explicit DateField( Window* pParent, const ResId& ); + explicit DateField( vcl::Window* pParent, WinBits nWinStyle ); + explicit DateField( vcl::Window* pParent, const ResId& ); virtual ~DateField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -667,8 +667,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit TimeField( Window* pParent, WinBits nWinStyle ); - explicit TimeField( Window* pParent, const ResId& ); + explicit TimeField( vcl::Window* pParent, WinBits nWinStyle ); + explicit TimeField( vcl::Window* pParent, const ResId& ); virtual ~TimeField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -698,7 +698,7 @@ public: class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter { public: - PatternBox( Window* pParent, WinBits nWinStyle ); + PatternBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~PatternBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -717,7 +717,7 @@ public: class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter { public: - explicit NumericBox( Window* pParent, WinBits nWinStyle ); + explicit NumericBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~NumericBox(); virtual Size CalcMinimumSize() const SAL_OVERRIDE; @@ -741,7 +741,7 @@ public: class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter { public: - explicit MetricBox( Window* pParent, WinBits nWinStyle ); + explicit MetricBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~MetricBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -774,7 +774,7 @@ public: class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter { public: - explicit CurrencyBox( Window* pParent, WinBits nWinStyle ); + explicit CurrencyBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~CurrencyBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -795,7 +795,7 @@ public: class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter { public: - explicit DateBox( Window* pParent, WinBits nWinStyle ); + explicit DateBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~DateBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -815,7 +815,7 @@ public: class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter { public: - explicit TimeBox( Window* pParent, WinBits nWinStyle ); + explicit TimeBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~TimeBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index f875f19b7afc..4e335516d021 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -38,11 +38,11 @@ class VCL_DLLPUBLIC FixedText : public Control private: sal_Int32 m_nMaxWidthChars; sal_Int32 m_nMinWidthChars; - Window *m_pMnemonicWindow; + vcl::Window *m_pMnemonicWindow; using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -56,11 +56,11 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; - virtual Window* getAccessibleRelationLabelFor() const SAL_OVERRIDE; + virtual vcl::Window* getAccessibleRelationLabelFor() const SAL_OVERRIDE; public: - explicit FixedText( Window* pParent, WinBits nStyle = 0 ); - explicit FixedText( Window* pParent, const ResId& rResId ); + explicit FixedText( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit FixedText( vcl::Window* pParent, const ResId& rResId ); virtual ~FixedText(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -78,14 +78,14 @@ public: Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; - void set_mnemonic_widget(Window *pWindow); - Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } + void set_mnemonic_widget(vcl::Window *pWindow); + vcl::Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; class VCL_DLLPUBLIC SelectableFixedText : public Edit { public: - explicit SelectableFixedText( Window* pParent, WinBits nStyle = 0 ); + explicit SelectableFixedText( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void LoseFocus() SAL_OVERRIDE; }; @@ -99,7 +99,7 @@ class VCL_DLLPUBLIC FixedLine : public Control private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( bool bLayout = false ); @@ -112,8 +112,8 @@ protected: GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: - explicit FixedLine( Window* pParent, WinBits nStyle = WB_HORZ ); - explicit FixedLine( Window* pParent, const ResId& ); + explicit FixedLine( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); + explicit FixedLine( vcl::Window* pParent, const ResId& ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; @@ -132,14 +132,14 @@ private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ); public: - explicit FixedBitmap( Window* pParent, WinBits nStyle = 0 ); + explicit FixedBitmap( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~FixedBitmap(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -166,7 +166,7 @@ private: private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); @@ -176,8 +176,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit FixedImage( Window* pParent, WinBits nStyle = 0 ); - explicit FixedImage( Window* pParent, const ResId& ); + explicit FixedImage( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit FixedImage( vcl::Window* pParent, const ResId& ); virtual ~FixedImage(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index 8181dbc64a41..c85bd1cb6ac0 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -64,7 +64,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText With ResId or WinBits. */ - FixedHyperlink( Window* pParent, WinBits nWinStyle = 0 ); + FixedHyperlink( vcl::Window* pParent, WinBits nWinStyle = 0 ); /** dtor diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 580c6c16229a..5ad30a7282e5 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -75,7 +75,7 @@ class VCL_DLLPUBLIC FloatingWindow : public SystemWindow class ImplData; private: FloatingWindow* mpNextFloat; - Window* mpFirstPopupModeWin; + vcl::Window* mpFirstPopupModeWin; ImplData* mpImplData; Rectangle maFloatRect; ImplSVEvent * mnPostId; @@ -101,16 +101,16 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); public: - SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( Window* pReference, const Point& rPos, HitTest& rHitTest ); + SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( vcl::Window* pReference, const Point& rPos, HitTest& rHitTest ); SAL_DLLPRIVATE FloatingWindow* ImplFindLastLevelFloat(); - SAL_DLLPRIVATE bool ImplIsFloatPopupModeWindow( const Window* pWindow ); + SAL_DLLPRIVATE bool ImplIsFloatPopupModeWindow( const vcl::Window* pWindow ); SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = true; } SAL_DLLPRIVATE bool ImplIsMouseDown() const { return mbMouseDown; } - SAL_DLLPRIVATE static Point ImplCalcPos( Window* pWindow, + SAL_DLLPRIVATE static Point ImplCalcPos( vcl::Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); SAL_DLLPRIVATE void ImplEndPopupMode( sal_uInt16 nFlags = 0, sal_uLong nFocusId = 0 ); @@ -119,8 +119,8 @@ public: virtual void doDeferredInit(WinBits nBits) SAL_OVERRIDE; public: - explicit FloatingWindow(Window* pParent, WinBits nStyle = WB_STDFLOATWIN); - explicit FloatingWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + explicit FloatingWindow(vcl::Window* pParent, WinBits nStyle = WB_STDFLOATWIN); + explicit FloatingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~FloatingWindow(); @@ -136,7 +136,7 @@ public: void StartPopupMode( const Rectangle& rRect, sal_uLong nFlags = 0 ); void StartPopupMode( ToolBox* pBox, sal_uLong nFlags = 0 ); void EndPopupMode( sal_uInt16 nFlags = 0 ); - void AddPopupModeWindow( Window* pWindow ); + void AddPopupModeWindow( vcl::Window* pWindow ); sal_uLong GetPopupModeFlags() const { return mnPopupModeFlags; } void SetPopupModeFlags( sal_uLong nFlags ) { mnPopupModeFlags = nFlags; } bool IsInPopupMode() const { return mbPopupMode; } @@ -149,7 +149,7 @@ public: bool GrabsFocus() const { return mbGrabFocus; } - static Point CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); + static Point CalcFloatingPosition( vcl::Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); }; #endif // INCLUDED_VCL_FLOATWIN_HXX diff --git a/include/vcl/fltcall.hxx b/include/vcl/fltcall.hxx index ca64e68f0902..6e7ab514ea5a 100644 --- a/include/vcl/fltcall.hxx +++ b/include/vcl/fltcall.hxx @@ -28,12 +28,12 @@ class FilterConfigItem; class SvStream; class Graphic; -class Window; +namespace vcl { class Window; } struct FltCallDialogParameter { - Window* pWindow; + vcl::Window* pWindow; ResMgr* pResMgr; FieldUnit eFieldUnit; OUString aFilterExt; @@ -41,7 +41,7 @@ struct FltCallDialogParameter // In and Out PropertySequence for all filter dialogs ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData; - FltCallDialogParameter( Window* pW, ResMgr* pRsMgr, FieldUnit eFiUni ) : + FltCallDialogParameter( vcl::Window* pW, ResMgr* pRsMgr, FieldUnit eFiUni ) : pWindow ( pW ), pResMgr ( pRsMgr ), eFieldUnit ( eFiUni ) {}; diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index d600bb15041d..9e7b933fe228 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -33,7 +33,7 @@ class VCL_DLLPUBLIC GroupBox : public Control private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -46,7 +46,7 @@ private: GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: - explicit GroupBox( Window* pParent, WinBits nStyle = 0 ); + explicit GroupBox( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index b41f6adb51ad..42c9e55d540a 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -26,7 +26,7 @@ class Point; class Rectangle; -class Window; +namespace vcl { class Window; } // - Help-Types - @@ -59,9 +59,9 @@ public: Help(); virtual ~Help(); - virtual bool Start( const OUString& rHelpId, const Window* pWindow ); + virtual bool Start( const OUString& rHelpId, const vcl::Window* pWindow ); virtual bool SearchKeyword( const OUString& rKeyWord ); - virtual OUString GetHelpText( const OUString& aHelpURL, const Window* pWindow ); + virtual OUString GetHelpText( const OUString& aHelpURL, const vcl::Window* pWindow ); static void EnableContextHelp(); static void DisableContextHelp(); @@ -76,10 +76,10 @@ public: static void EnableBalloonHelp(); static void DisableBalloonHelp(); static bool IsBalloonHelpEnabled(); - static bool ShowBalloon( Window* pParent, + static bool ShowBalloon( vcl::Window* pParent, const Point& rScreenPos, const OUString& rHelpText ); - static bool ShowBalloon( Window* pParent, + static bool ShowBalloon( vcl::Window* pParent, const Point& rScreenPos, const Rectangle&, const OUString& rHelpText ); @@ -87,12 +87,12 @@ public: static void EnableQuickHelp(); static void DisableQuickHelp(); static bool IsQuickHelpEnabled(); - static bool ShowQuickHelp( Window* pParent, + static bool ShowQuickHelp( vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rHelpText, const OUString& rLongHelpText, sal_uInt16 nStyle = 0 ); - static bool ShowQuickHelp( Window* pParent, + static bool ShowQuickHelp( vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rHelpText, sal_uInt16 nStyle = 0 ) @@ -100,11 +100,11 @@ public: static void HideBalloonAndQuickHelp(); - static sal_uLong ShowTip( Window* pParent, + static sal_uLong ShowTip( vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rText, sal_uInt16 nStyle = 0 ); static void UpdateTip( sal_uLong nId, - Window* pParent, + vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rText ); static void HideTip( sal_uLong nId ); diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index bbe9cb48022e..753ad9f126d2 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -35,7 +35,7 @@ private: ::sal_Int16 mnScaleMode; public: - ImageControl( Window* pParent, WinBits nStyle = 0 ); + ImageControl( vcl::Window* pParent, WinBits nStyle = 0 ); // set/get the scale mode. This is one of the css.awt.ImageScaleMode constants void SetScaleMode( const ::sal_Int16 _nMode ); diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index b7e745c365c9..1c8a2661d557 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -26,7 +26,7 @@ #include <vcl/keycodes.hxx> #include <vcl/vclenum.hxx> -class Window; +namespace vcl { class Window; } namespace vcl { @@ -56,27 +56,27 @@ public: { return (nCode & KEY_MODTYPE); } sal_uInt16 GetAllModifier() const { return (nCode & KEY_ALLMODTYPE); } - bool IsShift() const + bool IsShift() const { return ((nCode & KEY_SHIFT) != 0); } - bool IsMod1() const + bool IsMod1() const { return ((nCode & KEY_MOD1) != 0); } - bool IsMod2() const + bool IsMod2() const { return ((nCode & KEY_MOD2) != 0); } - bool IsMod3() const + bool IsMod3() const { return ((nCode & KEY_MOD3) != 0); } sal_uInt16 GetGroup() const { return (nCode & KEYGROUP_TYPE); } - OUString GetName( Window* pWindow = NULL ) const; + OUString GetName( vcl::Window* pWindow = NULL ) const; - bool IsFunction() const + bool IsFunction() const { return (eFunc != KEYFUNC_DONTKNOW); } - KeyFuncType GetFunction() const; + KeyFuncType GetFunction() const; - KeyCode& operator = ( const KeyCode& rKeyCode ); - bool operator ==( const KeyCode& rKeyCode ) const; - bool operator !=( const KeyCode& rKeyCode ) const; + KeyCode& operator = ( const KeyCode& rKeyCode ); + bool operator ==( const KeyCode& rKeyCode ) const; + bool operator !=( const KeyCode& rKeyCode ) const; }; } // namespace vcl diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index cddac9ed8e87..374a42c6e9fe 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -20,20 +20,20 @@ #include <boost/multi_array.hpp> #include <set> -class VCL_DLLPUBLIC VclContainer : public Window +class VCL_DLLPUBLIC VclContainer : public vcl::Window { public: - VclContainer(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN); + VclContainer(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN); //These take into account the external margins of the rWindow widget //while GetOptimalSize/get_preferred_size and SetPosSizePixel are //oblivious to them - static Size getLayoutRequisition(const Window &rWindow); - static void setLayoutPosSize(Window &rWindow, const Point &rPos, const Size &rSize); + static Size getLayoutRequisition(const vcl::Window &rWindow); + static void setLayoutPosSize(vcl::Window &rWindow, const Point &rPos, const Size &rSize); //applies the allocation pos and size onto rWindow via setLayoutPosSize taking into account //the rWindows alignment desires within that allocation - static void setLayoutAllocation(Window &rWindow, const Point &rPos, const Size &rSize); + static void setLayoutAllocation(vcl::Window &rWindow, const Point &rPos, const Size &rSize); void markLayoutDirty() { @@ -66,7 +66,7 @@ protected: bool m_bVerticalContainer; int m_nSpacing; public: - VclBox(Window *pParent, bool bHomogeneous, int nSpacing) + VclBox(vcl::Window *pParent, bool bHomogeneous, int nSpacing) : VclContainer(pParent) , m_bHomogeneous(bHomogeneous) , m_bVerticalContainer(false) @@ -107,13 +107,13 @@ protected: virtual long getSecondaryCoordinate(const Point &rPos) const = 0; virtual void setSecondaryCoordinate(Point &rPos, long) const = 0; - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const = 0; + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const = 0; }; class VCL_DLLPUBLIC VclVBox : public VclBox { public: - VclVBox(Window *pParent, bool bHomogeneous = false, int nSpacing = 0) + VclVBox(vcl::Window *pParent, bool bHomogeneous = false, int nSpacing = 0) : VclBox(pParent, bHomogeneous, nSpacing) { m_bVerticalContainer = true; @@ -151,7 +151,7 @@ protected: { rPos.setX(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -160,7 +160,7 @@ protected: class VCL_DLLPUBLIC VclHBox : public VclBox { public: - VclHBox(Window *pParent, bool bHomogeneous = false, int nSpacing = 0) + VclHBox(vcl::Window *pParent, bool bHomogeneous = false, int nSpacing = 0) : VclBox(pParent, bHomogeneous, nSpacing) { m_bVerticalContainer = false; @@ -198,7 +198,7 @@ protected: { rPos.setY(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -217,7 +217,7 @@ enum VclButtonBoxStyle class VCL_DLLPUBLIC VclButtonBox : public VclBox { public: - VclButtonBox(Window *pParent, int nSpacing) + VclButtonBox(vcl::Window *pParent, int nSpacing) : VclBox(pParent, false, nSpacing) , m_eLayoutStyle(VCL_BUTTONBOX_DEFAULT_STYLE) { @@ -252,7 +252,7 @@ private: class VCL_DLLPUBLIC VclVButtonBox : public VclButtonBox { public: - VclVButtonBox(Window *pParent, int nSpacing = 0) + VclVButtonBox(vcl::Window *pParent, int nSpacing = 0) : VclButtonBox(pParent, nSpacing) { m_bVerticalContainer = true; @@ -290,7 +290,7 @@ protected: { rPos.setX(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -299,7 +299,7 @@ protected: class VCL_DLLPUBLIC VclHButtonBox : public VclButtonBox { public: - VclHButtonBox(Window *pParent, int nSpacing = 0) + VclHButtonBox(vcl::Window *pParent, int nSpacing = 0) : VclButtonBox(pParent, nSpacing) { m_bVerticalContainer = false; @@ -337,7 +337,7 @@ protected: { rPos.setY(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -353,7 +353,7 @@ private: struct GridEntry { - Window *pChild; + vcl::Window *pChild; sal_Int32 nSpanWidth; sal_Int32 nSpanHeight; GridEntry() @@ -395,7 +395,7 @@ private: virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; public: - VclGrid(Window *pParent) + VclGrid(vcl::Window *pParent) : VclContainer(pParent) , m_bRowHomogeneous(false), m_bColumnHomogeneous(false) , m_nRowSpacing(0), m_nColumnSpacing(0) @@ -436,18 +436,18 @@ public: virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; -VCL_DLLPUBLIC void setGridAttach(Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, +VCL_DLLPUBLIC void setGridAttach(vcl::Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nWidth = 1, sal_Int32 nHeight = 1); class VCL_DLLPUBLIC VclBin : public VclContainer { public: - VclBin(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) + VclBin(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) : VclContainer(pParent, nStyle) { } - virtual Window *get_child(); - virtual const Window *get_child() const; + virtual vcl::Window *get_child(); + virtual const vcl::Window *get_child() const; virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; }; @@ -455,22 +455,22 @@ public: class VCL_DLLPUBLIC VclFrame : public VclBin { private: - Window *m_pLabel; + vcl::Window *m_pLabel; private: friend class VclBuilder; - void designate_label(Window *pWindow); + void designate_label(vcl::Window *pWindow); public: - VclFrame(Window *pParent) + VclFrame(vcl::Window *pParent) : VclBin(pParent) , m_pLabel(NULL) { } void set_label(const OUString &rLabel); OUString get_label() const; - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; - Window *get_label_widget(); - const Window *get_label_widget() const; + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; + vcl::Window *get_label_widget(); + const vcl::Window *get_label_widget() const; protected: virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; @@ -480,7 +480,7 @@ protected: class VCL_DLLPUBLIC VclAlignment : public VclBin { public: - VclAlignment(Window *pParent) + VclAlignment(vcl::Window *pParent) : VclBin(pParent) , m_nBottomPadding(0) , m_nLeftPadding(0) @@ -510,7 +510,7 @@ private: class VCL_DLLPUBLIC VclExpander : public VclBin { public: - VclExpander(Window *pParent) + VclExpander(vcl::Window *pParent) : VclBin(pParent) , m_bResizeTopLevel(true) , m_aDisclosureButton(this) @@ -518,8 +518,8 @@ public: m_aDisclosureButton.SetToggleHdl(LINK(this, VclExpander, ClickHdl)); m_aDisclosureButton.Show(); } - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; bool get_expanded() const { @@ -553,9 +553,9 @@ private: class VCL_DLLPUBLIC VclScrolledWindow : public VclBin { public: - VclScrolledWindow(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL); - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; + VclScrolledWindow(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL); + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; ScrollBar& getVertScrollBar() { return m_aVScroll; } ScrollBar& getHorzScrollBar() { return m_aHScroll; } @@ -579,7 +579,7 @@ private: class VCL_DLLPUBLIC VclViewport : public VclBin { public: - VclViewport(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) + VclViewport(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) : VclBin(pParent, nStyle) { } @@ -598,10 +598,10 @@ private: //Any Commands an EventBoxHelper receives are forwarded to its parent //The VclEventBox ensures that m_aEventBoxHelper is the //first child and is transparent, but covers the rest of the children - class EventBoxHelper : public Window + class EventBoxHelper : public vcl::Window { public: - EventBoxHelper(Window* pParent) + EventBoxHelper(vcl::Window* pParent) : Window(pParent, 0) { SetSizePixel(pParent->GetSizePixel()); @@ -617,14 +617,14 @@ private: EventBoxHelper m_aEventBoxHelper; public: - VclEventBox(Window* pParent) + VclEventBox(vcl::Window* pParent) : VclBin(pParent) , m_aEventBoxHelper(this) { m_aEventBoxHelper.Show(); } - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; @@ -642,7 +642,7 @@ enum VclSizeGroupMode class VCL_DLLPUBLIC VclSizeGroup { private: - std::set<Window*> m_aWindows; + std::set<vcl::Window*> m_aWindows; bool m_bIgnoreHidden; VclSizeGroupMode m_eMode; @@ -653,19 +653,19 @@ public: , m_eMode(VCL_SIZE_GROUP_HORIZONTAL) { } - void insert(Window *pWindow) + void insert(vcl::Window *pWindow) { m_aWindows.insert(pWindow); } - void erase(Window *pWindow) + void erase(vcl::Window *pWindow) { m_aWindows.erase(pWindow); } - const std::set<Window*>& get_widgets() const + const std::set<vcl::Window*>& get_widgets() const { return m_aWindows; } - std::set<Window*>& get_widgets() + std::set<vcl::Window*>& get_widgets() { return m_aWindows; } @@ -712,24 +712,24 @@ private: VclMultiLineEdit* m_pPrimaryMessage; VclMultiLineEdit* m_pSecondaryMessage; std::vector<PushButton*> m_aOwnedButtons; - std::map<const Window*, short> m_aResponses; + std::map<const vcl::Window*, short> m_aResponses; OUString m_sPrimaryString; OUString m_sSecondaryString; DECL_DLLPRIVATE_LINK(ButtonHdl, Button *); void setButtonHandlers(VclButtonBox *pButtonBox); - short get_response(const Window *pWindow) const; + short get_response(const vcl::Window *pWindow) const; void create_owned_areas(); friend class VclBuilder; - MessageDialog(Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); + MessageDialog(vcl::Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); public: - MessageDialog(Window* pParent, + MessageDialog(vcl::Window* pParent, const OUString &rMessage, VclMessageType eMessageType = VCL_MESSAGE_ERROR, VclButtonsType eButtonsType = VCL_BUTTONS_OK, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); - MessageDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription); + MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; ///Emitted when an action widget is clicked @@ -740,7 +740,7 @@ public: void set_secondary_text(const OUString &rSecondaryString); virtual ~MessageDialog(); - static void SetMessagesWidths(Window *pParent, VclMultiLineEdit *pPrimaryMessage, + static void SetMessagesWidths(vcl::Window *pParent, VclMultiLineEdit *pPrimaryMessage, VclMultiLineEdit *pSecondaryMessage); }; @@ -751,57 +751,57 @@ VCL_DLLPUBLIC Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize); //i.e. acts like pChild = pChild->GetWindow(WINDOW_FIRSTCHILD); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC Window* firstLogicalChildOfParent(Window *pTopLevel); +VCL_DLLPUBLIC vcl::Window* firstLogicalChildOfParent(vcl::Window *pTopLevel); //Get next window after pChild of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(WINDOW_NEXT); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC Window* nextLogicalChildOfParent(Window *pTopLevel, Window *pChild); +VCL_DLLPUBLIC vcl::Window* nextLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChild); //Get previous window before pChild of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(WINDOW_PREV); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC Window* prevLogicalChildOfParent(Window *pTopLevel, Window *pChild); +VCL_DLLPUBLIC vcl::Window* prevLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChild); //Returns true is the Window has a single child which is a container -VCL_DLLPUBLIC bool isLayoutEnabled(const Window *pWindow); +VCL_DLLPUBLIC bool isLayoutEnabled(const vcl::Window *pWindow); -inline bool isContainerWindow(const Window &rWindow) +inline bool isContainerWindow(const vcl::Window &rWindow) { WindowType eType = rWindow.GetType(); return (eType == WINDOW_CONTAINER || eType == WINDOW_SCROLLWINDOW); } -inline bool isContainerWindow(const Window *pWindow) +inline bool isContainerWindow(const vcl::Window *pWindow) { return pWindow && isContainerWindow(*pWindow); } //Returns true if the containing dialog is doing its initial //layout and isn't visible yet -VCL_DLLPUBLIC bool isInitialLayout(const Window *pWindow); +VCL_DLLPUBLIC bool isInitialLayout(const vcl::Window *pWindow); // retro-fitting utilities //Get a Size which is large enough to contain all children with //an equal amount of space at top left and bottom right -Size getLegacyBestSizeForChildren(const Window &rWindow); +Size getLegacyBestSizeForChildren(const vcl::Window &rWindow); //Get first parent which is not a layout widget -VCL_DLLPUBLIC Window* getNonLayoutParent(Window *pParent); +VCL_DLLPUBLIC vcl::Window* getNonLayoutParent(vcl::Window *pParent); //Get first real parent which is not a layout widget -Window* getNonLayoutRealParent(Window *pParent); +vcl::Window* getNonLayoutRealParent(vcl::Window *pParent); //return true if this window and its stack of containers are all shown -bool isVisibleInLayout(const Window *pWindow); +bool isVisibleInLayout(const vcl::Window *pWindow); //return true if this window and its stack of containers are all enabled -bool isEnabledInLayout(const Window *pWindow); +bool isEnabledInLayout(const vcl::Window *pWindow); #endif diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 89b8364788c4..74de049e8f5a 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -89,7 +89,7 @@ private: BigInt mnLast; public: - LongCurrencyField( Window* pParent, WinBits nWinStyle ); + LongCurrencyField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~LongCurrencyField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -116,7 +116,7 @@ public: class VCL_DLLPUBLIC LongCurrencyBox : public ComboBox, public LongCurrencyFormatter { public: - LongCurrencyBox( Window* pParent, WinBits nWinStyle ); + LongCurrencyBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~LongCurrencyBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 29bf86d0b784..621b571c224a 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -69,7 +69,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); bool IsDropDownBox() const { return mpFloatWin ? true : false; } @@ -80,8 +80,8 @@ protected: virtual void FillLayoutData() const SAL_OVERRIDE; public: - explicit ListBox( Window* pParent, WinBits nStyle = WB_BORDER ); - explicit ListBox( Window* pParent, const ResId& ); + explicit ListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); + explicit ListBox( vcl::Window* pParent, const ResId& ); virtual ~ListBox(); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; @@ -95,7 +95,7 @@ public: virtual void DoubleClick(); virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE; @@ -255,7 +255,7 @@ private: bool IsValueChangedFromSaved() const; public: - explicit MultiListBox( Window* pParent, WinBits nStyle = 0 ); + explicit MultiListBox( vcl::Window* pParent, WinBits nStyle = 0 ); }; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 77313014bde8..6ca076fc1473 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -44,7 +44,7 @@ class Image; class PopupMenu; class KeyEvent; class MenuFloatingWindow; -class Window; +namespace vcl { class Window; } class SalMenu; class IMenuBarWindow; struct SystemMenuData; @@ -122,7 +122,7 @@ private: MenuItemList* pItemList; // Liste mit den MenuItems MenuLogo* pLogo; Menu* pStartedFrom; - Window* pWindow; + vcl::Window* pWindow; Link aActivateHdl; // Active-Handler Link aDeactivateHdl; // Deactivate-Handler @@ -158,14 +158,14 @@ protected: SAL_DLLPRIVATE Menu* ImplGetStartMenu(); SAL_DLLPRIVATE Menu* ImplFindSelectMenu(); SAL_DLLPRIVATE Menu* ImplFindMenu( sal_uInt16 nId ); - SAL_DLLPRIVATE Size ImplCalcSize( const Window* pWin ); + SAL_DLLPRIVATE Size ImplCalcSize( const vcl::Window* pWin ); SAL_DLLPRIVATE bool ImplIsVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE bool ImplIsSelectable( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const; SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisible() const; SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const; - SAL_DLLPRIVATE void ImplPaint( Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; + SAL_DLLPRIVATE void ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); @@ -178,11 +178,11 @@ protected: // returns native check and option menu symbol height in rCheckHeight and rRadioHeight // return value is maximum width and height of checkboxes and radiobuttons - SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( const Window*, long& rCheckHeight, long& rRadioHeight ) const; + SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( const vcl::Window*, long& rCheckHeight, long& rRadioHeight ) const; // returns native submenu arrow size and spacing from right border // return value is whether it's supported natively - SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const; + SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize( vcl::Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const; SAL_DLLPRIVATE void ImplAddDel( ImplMenuDelData &rDel ); SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel ); @@ -200,7 +200,7 @@ public: SAL_DLLPRIVATE void ImplKillLayoutData() const; SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const { return pStartedFrom; } - SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; } + SAL_DLLPRIVATE vcl::Window* ImplGetWindow() const { return pWindow; } void ImplSelectWithStart( Menu* pStartMenu = NULL ); protected: @@ -365,7 +365,7 @@ public: // gets the activation key of the specified item KeyEvent GetActivationKey( sal_uInt16 nItemId ) const; - Window* GetWindow() const { return pWindow; } + vcl::Window* GetWindow() const { return pWindow; } void SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr ); OUString GetAccessibleName( sal_uInt16 nItemId ) const; @@ -408,9 +408,9 @@ class VCL_DLLPUBLIC MenuBar : public Menu friend class MenuFloatingWindow; friend class SystemWindow; - SAL_DLLPRIVATE static Window* ImplCreate(Window* pParent, Window* pWindow, MenuBar* pMenu, const css::uno::Reference<css::frame::XFrame> &rFrame); - SAL_DLLPRIVATE static void ImplDestroy( MenuBar* pMenu, bool bDelete ); - SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu = true ); + SAL_DLLPRIVATE static vcl::Window* ImplCreate(vcl::Window* pParent, vcl::Window* pWindow, MenuBar* pMenu, const css::uno::Reference<css::frame::XFrame> &rFrame); + SAL_DLLPRIVATE static void ImplDestroy( MenuBar* pMenu, bool bDelete ); + SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu = true ); protected: @@ -507,7 +507,7 @@ private: SAL_DLLPRIVATE MenuFloatingWindow* ImplGetFloatingWindow() const { return (MenuFloatingWindow*)Menu::ImplGetWindow(); } protected: - SAL_DLLPRIVATE sal_uInt16 ImplExecute( Window* pWindow, const Rectangle& rRect, sal_uLong nPopupFlags, Menu* pStaredFrom, bool bPreSelectFirst ); + SAL_DLLPRIVATE sal_uInt16 ImplExecute( vcl::Window* pWindow, const Rectangle& rRect, sal_uLong nPopupFlags, Menu* pStaredFrom, bool bPreSelectFirst ); SAL_DLLPRIVATE long ImplCalcHeight( sal_uInt16 nEntries ) const; SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( long nMaxHeight, sal_uInt16 nStartEntry = 0, sal_uInt16* pLastVisible = NULL ) const; @@ -525,8 +525,8 @@ public: void SetText( const OUString& rTitle ) { aTitleText = rTitle; } const OUString& GetText() const { return aTitleText; } - sal_uInt16 Execute( Window* pWindow, const Point& rPopupPos ); - sal_uInt16 Execute( Window* pWindow, const Rectangle& rRect, sal_uInt16 nFlags = 0 ); + sal_uInt16 Execute( vcl::Window* pWindow, const Point& rPopupPos ); + sal_uInt16 Execute( vcl::Window* pWindow, const Rectangle& rRect, sal_uInt16 nFlags = 0 ); // Fuer das TestTool void EndExecute( sal_uInt16 nSelect = 0 ); diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 22ca3091daf8..78209c818d47 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -54,10 +54,10 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); public: - explicit MenuButton( Window* pParent, WinBits nStyle = 0 ); + explicit MenuButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~MenuButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index 12293fec20e3..f77339136ba3 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -46,10 +46,10 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); public: - explicit MoreButton( Window* pParent, WinBits nStyle = 0 ); + explicit MoreButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~MoreButton(); void Click() SAL_OVERRIDE; diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index f06704786b81..04ea155cb6d8 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -46,7 +46,7 @@ protected: SAL_DLLPRIVATE void ImplPosControls(); public: - MessBox( Window* pParent, WinBits nStyle, + MessBox( vcl::Window* pParent, WinBits nStyle, const OUString& rTitle, const OUString& rMessage ); virtual ~MessBox(); @@ -72,8 +72,8 @@ private: SAL_DLLPRIVATE void ImplInitInfoBoxData(); public: - InfoBox( Window* pParent, const OUString& rMessage ); - InfoBox( Window* pParent, WinBits nStyle, + InfoBox( vcl::Window* pParent, const OUString& rMessage ); + InfoBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); static Image GetStandardImage(); @@ -85,7 +85,7 @@ private: SAL_DLLPRIVATE void ImplInitWarningBoxData(); public: - WarningBox( Window* pParent, WinBits nStyle, + WarningBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); void SetDefaultCheckBoxText(); @@ -99,7 +99,7 @@ private: SAL_DLLPRIVATE void ImplInitErrorBoxData(); public: - ErrorBox( Window* pParent, WinBits nStyle, + ErrorBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); static Image GetStandardImage(); @@ -111,7 +111,7 @@ private: SAL_DLLPRIVATE void ImplInitQueryBoxData(); public: - QueryBox( Window* pParent, WinBits nStyle, + QueryBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); void SetDefaultCheckBoxText(); diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 4d8436d30d43..4017923c5464 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -100,8 +100,8 @@ struct GLWindow #elif defined( ANDROID ) #elif defined( UNX ) Display* dpy; - int screen; - XLIB_Window win; + int screen; + Window win; #if defined( GLX_EXT_texture_from_pixmap ) GLXFBConfig fbc; #endif @@ -155,7 +155,7 @@ public: void requestLegacyContext(); - bool init(Window* pParent = 0); + bool init(vcl::Window* pParent = 0); bool init(SystemChildWindow* pChildWindow); void makeCurrent(); @@ -180,7 +180,7 @@ public: bool supportMultiSampling() const; - static SystemWindowData generateWinData(Window* pParent, bool bRequestLegacyContext); + static SystemWindowData generateWinData(vcl::Window* pParent, bool bRequestLegacyContext); private: SAL_DLLPRIVATE bool initWindow(); @@ -191,8 +191,8 @@ private: #endif GLWindow m_aGLWin; - boost::scoped_ptr<Window> m_pWindow; - Window* mpWindow; //points to m_pWindow or the parent window, don't delete it + boost::scoped_ptr<vcl::Window> m_pWindow; + vcl::Window* mpWindow; //points to m_pWindow or the parent window, don't delete it SystemChildWindow* m_pChildWindow; boost::scoped_ptr<SystemChildWindow> m_pChildWindowGC; bool mbInitialized; diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx index 1419dda33e2f..c95b02d5261a 100644 --- a/include/vcl/openglwin.hxx +++ b/include/vcl/openglwin.hxx @@ -32,10 +32,10 @@ public: }; // pImpl Pattern to avoid linking against OpenGL libs when using the class without the context -class VCLOPENGL_DLLPUBLIC OpenGLWindow : public Window +class VCLOPENGL_DLLPUBLIC OpenGLWindow : public vcl::Window { public: - OpenGLWindow(Window* pParent); + OpenGLWindow(vcl::Window* pParent); virtual ~OpenGLWindow(); OpenGLContext& getContext(); diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 8089cc16bb5a..a0e18f2c79dc 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -94,7 +94,7 @@ class SalLayout; class ImplLayoutArgs; class ImplFontAttributes; class VirtualDevice; -class Window; +namespace vcl { class Window; } struct SalTwoRect; // Layout options @@ -258,10 +258,10 @@ class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable friend class Printer; friend class System; friend class VirtualDevice; - friend class Window; + friend class vcl::Window; friend class WorkWindow; friend class vcl::PDFWriterImpl; - friend void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ); + friend void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ); private: mutable SalGraphics* mpGraphics; ///< Graphics context to draw on diff --git a/include/vcl/popupmenuwindow.hxx b/include/vcl/popupmenuwindow.hxx index 87ef34c60c08..266738a170c3 100644 --- a/include/vcl/popupmenuwindow.hxx +++ b/include/vcl/popupmenuwindow.hxx @@ -28,7 +28,7 @@ private: struct ImplData; ImplData* mpImplData; public: - PopupMenuFloatingWindow( Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) ); + PopupMenuFloatingWindow( vcl::Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) ); virtual ~PopupMenuFloatingWindow(); sal_uInt16 GetMenuStackLevel() const; @@ -36,7 +36,7 @@ public: bool IsPopupMenu() const; //determine if a given window is an activated PopupMenuFloatingWindow - static bool isPopupMenu(const Window *pWindow); + static bool isPopupMenu(const vcl::Window *pWindow); }; #endif diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 943dd54d1b94..782b2c549a9a 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -55,7 +55,7 @@ // - ProgressBar - -class VCL_DLLPUBLIC ProgressBar : public Window +class VCL_DLLPUBLIC ProgressBar : public vcl::Window { private: Point maPos; @@ -71,7 +71,7 @@ private: SAL_DLLPRIVATE void ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ); public: - ProgressBar( Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); + ProgressBar( vcl::Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); virtual ~ProgressBar(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 01c343027d0d..8cb430d4619b 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -43,7 +43,7 @@ class SalInfoPrinter; struct SalPrinterQueueInfo; class SalPrinter; class VirtualDevice; -class Window; +namespace vcl { class Window; } namespace vcl { class PrinterController; @@ -232,7 +232,7 @@ private: SAL_DLLPRIVATE void ImplInitData(); SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); - SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow ); + SAL_DLLPRIVATE void ImplInitDisplay( const vcl::Window* pWindow ); SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const OUString& rPrinterName, const OUString* pDriver ); SAL_DLLPRIVATE void ImplUpdatePageData(); @@ -318,7 +318,7 @@ public: bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } - bool Setup( Window* pWindow = NULL ); + bool Setup( vcl::Window* pWindow = NULL ); bool SetPrinterProps( const Printer* pPrinter ); // SetPrinterOptions is used internally only now @@ -557,7 +557,7 @@ public: SAL_DLLPRIVATE void pushPropertiesToPrinter(); SAL_DLLPRIVATE void resetPaperToLastConfigured(); VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState ); - SAL_DLLPRIVATE bool setupPrinter( Window* i_pDlgParent ); + SAL_DLLPRIVATE bool setupPrinter( vcl::Window* i_pDlgParent ); SAL_DLLPRIVATE int getPageCountProtected() const; SAL_DLLPRIVATE css::uno::Sequence< css::beans::PropertyValue > getPageParametersProtected( int i_nPage ) const; diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index 7211885e03c1..6f334f7e11fe 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -30,6 +30,7 @@ class ImplRegionBand; class RegionBand; class Polygon; class PolyPolygon; +namespace vcl { class Window; } typedef boost::shared_ptr< RegionBand > RegionBandPtr; typedef boost::shared_ptr< PolyPolygon > PolyPolygonPtr; @@ -40,7 +41,7 @@ class VCL_DLLPUBLIC Region { private: friend class OutputDevice; - friend class Window; + friend class vcl::Window; friend class Bitmap; // possible contents diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index febefc08c1fe..65bbca0dc2fe 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -70,7 +70,7 @@ private: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true ); SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); @@ -89,7 +89,7 @@ private: DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, void* ); public: - explicit ScrollBar( Window* pParent, WinBits nStyle = WB_VERT ); + explicit ScrollBar( vcl::Window* pParent, WinBits nStyle = WB_VERT ); virtual ~ScrollBar(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -145,15 +145,15 @@ public: // - ScrollBarBox - -class VCL_DLLPUBLIC ScrollBarBox : public Window +class VCL_DLLPUBLIC ScrollBarBox : public vcl::Window { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); public: - explicit ScrollBarBox( Window* pParent, WinBits nStyle = 0 ); + explicit ScrollBarBox( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index bdb2e3cb4248..afe30c39a87a 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -24,7 +24,7 @@ #include <vcl/timer.hxx> #include <vcl/event.hxx> -class Window; +namespace vcl { class Window; } class CommandEvent; // Timerticks @@ -77,7 +77,7 @@ class VCL_DLLPUBLIC SelectionEngine { private: FunctionSet* pFunctionSet; - Window* pWin; + vcl::Window* pWin; Rectangle aArea; Timer aWTimer; // generate fake mouse moves MouseEvent aLastMove; @@ -91,7 +91,7 @@ private: // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging public: - SelectionEngine( Window* pWindow, + SelectionEngine( vcl::Window* pWindow, FunctionSet* pFunctions = NULL, sal_uLong nAutoRepeatInterval = SELENG_AUTOREPEAT_INTERVAL ); ~SelectionEngine(); @@ -129,8 +129,8 @@ public: { return aLastMove.GetPosPixel(); } const MouseEvent& GetMouseEvent() const { return aLastMove; } - void SetWindow( Window*); - Window* GetWindow() const { return pWin; } + void SetWindow( vcl::Window*); + vcl::Window* GetWindow() const { return pWin; } void LockModifiers( sal_uInt16 nModifiers ) { nLockedMods = nModifiers; } diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index b0ce5303110d..bc30d29d4060 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -55,7 +55,7 @@ private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true ); SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); @@ -71,7 +71,7 @@ private: SAL_DLLPRIVATE long ImplDoSlideAction( ScrollType eScrollType ); public: - Slider( Window* pParent, WinBits nStyle = WB_HORZ ); + Slider( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index 136f2fdc0ed2..14bc46b57cf9 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -22,7 +22,7 @@ #include <vcl/dllapi.h> -class Window; +namespace vcl { class Window; } // - Sound - @@ -31,7 +31,7 @@ class Window; class VCL_DLLPUBLIC Sound { public: - static void Beep( Window* pWindow = NULL ); + static void Beep( vcl::Window* pWindow = NULL ); }; #endif // INCLUDED_VCL_SOUND_HXX diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 5ba88e9cd19b..1900822b1844 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -52,11 +52,11 @@ private: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* ); public: - explicit SpinButton( Window* pParent, WinBits nStyle = 0 ); + explicit SpinButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SpinButton(); virtual void Up(); diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 2d09032d4e2e..fe5431be04b6 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -51,7 +51,7 @@ protected: mbInDropDown:1; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); private: DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* ); @@ -70,8 +70,8 @@ protected: Rectangle * ImplFindPartRect( const Point& rPt ); public: - explicit SpinField( Window* pParent, WinBits nWinStyle = 0 ); - explicit SpinField( Window* pParent, const ResId& ); + explicit SpinField( vcl::Window* pParent, WinBits nWinStyle = 0 ); + explicit SpinField( vcl::Window* pParent, const ResId& ); virtual ~SpinField(); virtual bool ShowDropDown( bool bShow ); diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index ff42f32030b3..b478317fe718 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -25,10 +25,10 @@ #define SPLITTER_DEFAULTSTEPSIZE 0xFFFF -class VCL_DLLPUBLIC Splitter : public Window +class VCL_DLLPUBLIC Splitter : public vcl::Window { private: - Window* mpRefWin; + vcl::Window* mpRefWin; long mnSplitPos; long mnLastSplitPos; long mnStartSplitPos; @@ -59,11 +59,11 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nWinStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nWinStyle ); public: - explicit Splitter( Window* pParent, WinBits nStyle = WB_VSCROLL ); - explicit Splitter( Window* pParent, const ResId& ); + explicit Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL ); + explicit Splitter( vcl::Window* pParent, const ResId& ); virtual ~Splitter(); virtual void StartSplit(); @@ -86,9 +86,9 @@ public: void StartDrag(); void SetDragRectPixel( const Rectangle& rDragRect, - Window* pRefWin = NULL ); + vcl::Window* pRefWin = NULL ); const Rectangle& GetDragRectPixel() const { return maDragRect; } - Window* GetDragWindow() const { return mpRefWin; } + vcl::Window* GetDragWindow() const { return mpRefWin; } virtual void SetSplitPosPixel( long nPos ); long GetSplitPosPixel() const { return mnSplitPos; } diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index b71b8e745b6e..83f640696814 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -88,7 +88,7 @@ private: Link maFadeOutHdl; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplCalcLayout(); SAL_DLLPRIVATE void ImplUpdate(); @@ -125,7 +125,7 @@ private: SAL_DLLPRIVATE SplitWindow (const SplitWindow &); SAL_DLLPRIVATE SplitWindow & operator= (const SplitWindow &); public: - SplitWindow( Window* pParent, WinBits nStyle = 0 ); + SplitWindow( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SplitWindow(); virtual void StartSplit(); @@ -146,7 +146,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void InsertItem( sal_uInt16 nId, Window* pWindow, long nSize, + void InsertItem( sal_uInt16 nId, vcl::Window* pWindow, long nSize, sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, SplitWindowItemBits nBits = 0 ); void InsertItem( sal_uInt16 nId, long nSize, @@ -173,7 +173,7 @@ public: */ long GetItemSize( sal_uInt16 nId, SplitWindowItemBits nBits ) const; sal_uInt16 GetSet( sal_uInt16 nId ) const; - sal_uInt16 GetItemId( Window* pWindow ) const; + sal_uInt16 GetItemId( vcl::Window* pWindow ) const; sal_uInt16 GetItemId( const Point& rPos ) const; sal_uInt16 GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId = 0 ) const; sal_uInt16 GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId = 0 ) const; diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 250d08d5fbe1..0f74411eaec2 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -32,7 +32,7 @@ typedef ::std::vector< ImplStatusItem* > ImplStatusItemList; // - Progress-Ausgabe - -void VCL_DLLPUBLIC DrawProgress( Window* pWindow, const Point& rPos, +void VCL_DLLPUBLIC DrawProgress( vcl::Window* pWindow, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, const Rectangle& rFramePosSize @@ -69,7 +69,7 @@ typedef sal_uInt16 StatusBarItemBits; // - StatusBar - -class VCL_DLLPUBLIC StatusBar : public Window +class VCL_DLLPUBLIC StatusBar : public vcl::Window { class ImplData; private: @@ -96,7 +96,7 @@ private: Link maDoubleClickHdl; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplFormat(); SAL_DLLPRIVATE bool ImplIsItemUpdate(); @@ -110,7 +110,7 @@ private: SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisiblePos() const; public: - StatusBar( Window* pParent, + StatusBar( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER | WB_RIGHT ); virtual ~StatusBar(); diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx index cfd865c748c0..205b008a8b2d 100644 --- a/include/vcl/stdtext.hxx +++ b/include/vcl/stdtext.hxx @@ -23,7 +23,7 @@ #include <rtl/ustring.hxx> #include <vcl/dllapi.h> -class Window; +namespace vcl { class Window; } #define STANDARD_TEXT_FIRST STANDARD_TEXT_SERVICE_NOT_AVAILABLE #define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((sal_uInt16)0) @@ -31,7 +31,7 @@ class Window; OUString VCL_DLLPUBLIC GetStandardText(sal_uInt16 nStdText); -void VCL_DLLPUBLIC ShowServiceNotAvailableError(Window* pParent, const OUString& rServiceName, bool bError); +void VCL_DLLPUBLIC ShowServiceNotAvailableError(vcl::Window* pParent, const OUString& rServiceName, bool bError); #endif // INCLUDED_VCL_STDTEXT_HXX diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index f4b7abc97d2c..e303bc6ec708 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -48,7 +48,7 @@ class DataChangedEvent; class Accelerator; class Help; class OutputDevice; -class Window; +namespace vcl { class Window; } class WorkWindow; class MenuBar; class UnoWrapperBase; @@ -313,7 +313,7 @@ public: class TheWindow : public WorkWindow { public: - TheWindow(Window *parent, WinBits windowStyle) : + TheWindow(vcl::Window *parent, WinBits windowStyle) : WorkWindow(parent, windowStyle) {} virtual void Paint(const Rectangle &); @@ -811,7 +811,7 @@ public: @see ImplCallEventListeners(VclSimpleEvent* pEvent) */ - static void ImplCallEventListeners( sal_uLong nEvent, Window* pWin, void* pData ); + static void ImplCallEventListeners( sal_uLong nEvent, vcl::Window* pWin, void* pData ); /** Send event to all VCL application event listeners @@ -829,7 +829,7 @@ public: @see PostKeyEvent */ - static bool HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); + static bool HandleKey( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); /** Send keypress event @@ -839,7 +839,7 @@ public: @see HandleKey */ - static ImplSVEvent * PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); + static ImplSVEvent * PostKeyEvent( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); /** Send mouse event @@ -847,7 +847,7 @@ public: @param pWin Pointer to window to which the event is sent @param pKeyEvent Mouse event to send */ - static ImplSVEvent * PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent ); + static ImplSVEvent * PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent ); /** Send zoom event @@ -858,7 +858,7 @@ public: @param pWin Pointer to window to which the event is sent @param pZoomEvent Zoom event to send */ - static ImplSVEvent * PostZoomEvent( sal_uLong nEvent, Window *pWin, ZoomEvent* pZoomEvent ); + static ImplSVEvent * PostZoomEvent( sal_uLong nEvent, vcl::Window *pWin, ZoomEvent* pZoomEvent ); /* Send scroll event @@ -869,7 +869,7 @@ public: @param pWin Pointer to window to which the event is sent @param pScrollEvent Scroll event to send */ - static ImplSVEvent * PostScrollEvent( sal_uLong nEvent, Window *pWin, ScrollEvent* pScrollEvent ); + static ImplSVEvent * PostScrollEvent( sal_uLong nEvent, vcl::Window *pWin, ScrollEvent* pScrollEvent ); /** Remove mouse and keypress events from a window... any also zoom and scroll events if the platform supports it. @@ -878,7 +878,7 @@ public: @see HandleKey, PostKeyEvent, PostMouseEvent, PostZoomEvent, PostScrollEvent */ - static void RemoveMouseAndKeyEvents( Window *pWin ); + static void RemoveMouseAndKeyEvents( vcl::Window *pWin ); /** Post a user event to the default window. @@ -962,7 +962,7 @@ public: @see GetAppWindow, GetDefaultDevice */ - static Window* GetFocusWindow(); + static vcl::Window* GetFocusWindow(); /** Get the default "device" (in this case the default window). @@ -980,7 +980,7 @@ public: @see GetNextTopLevelWindow, GetTopWindowCount, GetTopWindow, GetActiveTopWindow */ - static Window* GetFirstTopLevelWindow(); + static vcl::Window* GetFirstTopLevelWindow(); /** Get the next top level window. @@ -989,7 +989,7 @@ public: @returns Pointer to next top window. */ - static Window* GetNextTopLevelWindow( Window* pWindow ); + static vcl::Window* GetNextTopLevelWindow( vcl::Window* pWindow ); /** Return the number of top-level windows being used by the application @@ -1013,7 +1013,7 @@ public: @see GetFirstTopLevelWindow, GetNextTopLevelWindow, GetTopWindowCount, GetActiveTopWindow */ - static Window* GetTopWindow( long nIndex ); + static vcl::Window* GetTopWindow( long nIndex ); /** Get the "active" top window. @@ -1025,7 +1025,7 @@ public: @see GetFirstTopLevelWindow, GetNextTopLevelWindow, GetTopWindowCount, GetTopWindow */ - static Window* GetActiveTopWindow(); + static vcl::Window* GetActiveTopWindow(); ///@} @@ -1265,7 +1265,7 @@ public: @see GetDefDialogParent */ - static void SetDefDialogParent( Window* pWindow ); + static void SetDefDialogParent( vcl::Window* pWindow ); /** Get the default parent window for dialog boxes. @@ -1278,7 +1278,7 @@ public: @returns Pointer to the default window. */ - static Window* GetDefDialogParent(); + static vcl::Window* GetDefDialogParent(); /** Gets the dialog cancel mode for headless environments. diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx index 1fe833eda532..9a8c57d6ec5b 100644 --- a/include/vcl/syschild.hxx +++ b/include/vcl/syschild.hxx @@ -26,11 +26,11 @@ struct SystemEnvData; struct SystemWindowData; -class VCL_DLLPUBLIC SystemChildWindow : public Window +class VCL_DLLPUBLIC SystemChildWindow : public vcl::Window { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = false ); + SAL_DLLPRIVATE void ImplInitSysChild( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = false ); SAL_DLLPRIVATE void ImplTestJavaException( void* pEnv ); // Copy assignment is forbidden and not implemented. @@ -38,9 +38,9 @@ private: SAL_DLLPRIVATE SystemChildWindow & operator= (const SystemChildWindow &); public: - explicit SystemChildWindow( Window* pParent, WinBits nStyle = 0 ); + explicit SystemChildWindow( vcl::Window* pParent, WinBits nStyle = 0 ); // create a SystemChildWindow using the given SystemWindowData - explicit SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = true ); + explicit SystemChildWindow( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = true ); virtual ~SystemChildWindow(); const SystemEnvData* GetSystemData() const; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 382e9b1e2c03..11877a000cbb 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -130,7 +130,7 @@ public: // - SystemWindow - class VCL_DLLPUBLIC SystemWindow - : public Window + : public vcl::Window , public VclBuilderContainer { friend class WorkWindow; @@ -155,22 +155,22 @@ private: Timer maLayoutTimer; protected: bool mbIsDefferedInit; - Window* mpDialogParent; + vcl::Window* mpDialogParent; public: using Window::ImplIsInTaskPaneList; - SAL_DLLPRIVATE bool ImplIsInTaskPaneList( Window* pWin ); + SAL_DLLPRIVATE bool ImplIsInTaskPaneList( vcl::Window* pWin ); SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; } private: SAL_DLLPRIVATE void Init(); - SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin ); + SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin ); SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, VclContainer &rBox); DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, void* ); protected: // Single argument ctors shall be explicit. explicit SystemWindow(WindowType nType); - void loadUI(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); + void loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); void SetWindowStateData( const WindowStateData& rData ); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index f1c0f1ab4594..5351e452e924 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -72,7 +72,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); virtual void FillLayoutData() const SAL_OVERRIDE; virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; @@ -80,7 +80,7 @@ protected: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); public: - TabControl( Window* pParent, + TabControl( vcl::Window* pParent, WinBits nStyle = WB_STDTABCONTROL ); virtual ~TabControl(); diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx index 312a6a32fee0..e4f42482c23a 100644 --- a/include/vcl/tabdlg.hxx +++ b/include/vcl/tabdlg.hxx @@ -30,7 +30,7 @@ class VCL_DLLPUBLIC TabDialog : public Dialog { private: FixedLine* mpFixedLine; - Window* mpViewWindow; + vcl::Window* mpViewWindow; WindowAlign meViewAlign; bool mbPosControls; @@ -38,15 +38,15 @@ private: SAL_DLLPRIVATE void ImplPosControls(); public: - TabDialog( Window* pParent, + TabDialog( vcl::Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); - TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + TabDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~TabDialog(); virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; } - Window* GetViewWindow() const { return mpViewWindow; } + void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; } + vcl::Window* GetViewWindow() const { return mpViewWindow; } void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; } WindowAlign GetViewAlign() const { return meViewAlign; } }; diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index 86f994618d4e..c7361972ccb1 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -30,17 +30,17 @@ class VCL_DLLPUBLIC TabPage - : public Window + : public vcl::Window , public VclBuilderContainer { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); public: - explicit TabPage( Window* pParent, WinBits nStyle = 0 ); - explicit TabPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit TabPage( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit TabPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; diff --git a/include/vcl/taskpanelist.hxx b/include/vcl/taskpanelist.hxx index 8910ca2873c3..6e8888dc4eec 100644 --- a/include/vcl/taskpanelist.hxx +++ b/include/vcl/taskpanelist.hxx @@ -27,19 +27,19 @@ class VCL_DLLPUBLIC TaskPaneList { - ::std::vector<Window *> mTaskPanes; - Window *FindNextFloat( Window *pWindow, bool bForward = true ); - Window *FindNextSplitter( Window *pWindow, bool bForward = true ); + ::std::vector<vcl::Window *> mTaskPanes; + vcl::Window *FindNextFloat( vcl::Window *pWindow, bool bForward = true ); + vcl::Window *FindNextSplitter( vcl::Window *pWindow, bool bForward = true ); public: - bool IsInList( Window *pWindow ); + bool IsInList( vcl::Window *pWindow ); public: TaskPaneList(); ~TaskPaneList(); - void AddWindow( Window *pWindow ); - void RemoveWindow( Window *pWindow ); + void AddWindow( vcl::Window *pWindow ); + void RemoveWindow( vcl::Window *pWindow ); bool HandleKeyEvent( KeyEvent aKeyEvent ); }; diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index e4cd946f190f..9aa9498a6bf2 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -28,7 +28,7 @@ class TextEngine; class OutputDevice; -class Window; +namespace vcl { class Window; } class KeyEvent; class MouseEvent; class CommandEvent; @@ -100,11 +100,11 @@ protected: using DragAndDropClient::dragOver; public: - TextView( TextEngine* pEng, Window* pWindow ); + TextView( TextEngine* pEng, vcl::Window* pWindow ); virtual ~TextView(); TextEngine* GetTextEngine() const; - Window* GetWindow() const; + vcl::Window* GetWindow() const; void Invalidate(); void Scroll( long nHorzScroll, long nVertScroll ); diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index a8102bd133e7..aaf8edf5fba5 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -46,7 +46,7 @@ public: }; public: - Throbber(Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet = IMAGES_AUTO); + Throbber(vcl::Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet = IMAGES_AUTO); virtual ~Throbber(); // Properties diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index c27c1b2e2aef..13a8ddc40f9f 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -202,7 +202,7 @@ private: public: using Window::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); using DockingWindow::ImplInitSettings; SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -285,8 +285,8 @@ protected: void SetCurItemId(sal_uInt16 nSet) { mnCurItemId = nSet; } public: - ToolBox( Window* pParent, WinBits nStyle = 0 ); - ToolBox( Window* pParent, const ResId& rResId ); + ToolBox( vcl::Window* pParent, WinBits nStyle = 0 ); + ToolBox( vcl::Window* pParent, const ResId& rResId ); virtual ~ToolBox(); virtual void Click(); @@ -341,7 +341,7 @@ public: void InsertItem( sal_uInt16 nItemId, const OUString& rText, ToolBoxItemBits nBits = 0, sal_uInt16 nPos = TOOLBOX_APPEND ); - void InsertWindow( sal_uInt16 nItemId, Window* pWindow, + void InsertWindow( sal_uInt16 nItemId, vcl::Window* pWindow, ToolBoxItemBits nBits = 0, sal_uInt16 nPos = TOOLBOX_APPEND ); void InsertSpace( sal_uInt16 nPos = TOOLBOX_APPEND ); @@ -412,8 +412,8 @@ public: void SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror ); void SetItemText( sal_uInt16 nItemId, const OUString& rText ); const OUString& GetItemText( sal_uInt16 nItemId ) const; - void SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow ); - Window* GetItemWindow( sal_uInt16 nItemId ) const; + void SetItemWindow( sal_uInt16 nItemId, vcl::Window* pNewWindow ); + vcl::Window* GetItemWindow( sal_uInt16 nItemId ) const; sal_uInt16 GetHighlightItemId() const { return mnHighItemId; } void StartSelection(); diff --git a/include/vcl/unowrap.hxx b/include/vcl/unowrap.hxx index 5cd880215483..84035e90eadc 100644 --- a/include/vcl/unowrap.hxx +++ b/include/vcl/unowrap.hxx @@ -26,7 +26,7 @@ class XWindowPeer; class XToolkit; class EventList; -class Window; +namespace vcl { class Window; } class OutputDevice; class MouseEvent; class CommandEvent; @@ -67,10 +67,10 @@ public: virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) = 0; // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, bool bCreate ) = 0; - virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) = 0; + virtual void SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0; - virtual void WindowDestroyed( Window* pWindow ) = 0; + virtual void WindowDestroyed( vcl::Window* pWindow ) = 0; // Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index 25bc14709115..276321b0e5df 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -30,7 +30,7 @@ #include <list> #include <vector> -class Window; +namespace vcl { class Window; } class Menu; namespace com { namespace sun { namespace star { @@ -42,15 +42,15 @@ namespace com { namespace sun { namespace star { #define VCLEVENT_OBJECT_DYING 1 // VclWindowEvent: -#define VCLEVENT_WINDOW_CHILDCREATED 500 // pData = Window* -#define VCLEVENT_WINDOW_CHILDDESTROYED 501 // pData = Window* +#define VCLEVENT_WINDOW_CHILDCREATED 500 // pData = vcl::Window* +#define VCLEVENT_WINDOW_CHILDDESTROYED 501 // pData = vcl::Window* #define VCLEVENT_WINDOW_PAINT 1000 // pData = Rectangle* #define VCLEVENT_WINDOW_MOVE 1001 #define VCLEVENT_WINDOW_RESIZE 1002 #define VCLEVENT_WINDOW_SHOW 1003 #define VCLEVENT_WINDOW_HIDE 1004 #define VCLEVENT_WINDOW_ACTIVATE 1005 -#define VCLEVENT_WINDOW_DEACTIVATE 1006 // pData = Window* = pPrevActiveWindow +#define VCLEVENT_WINDOW_DEACTIVATE 1006 // pData = vcl::Window* = pPrevActiveWindow #define VCLEVENT_WINDOW_CLOSE 1007 #define VCLEVENT_WINDOW_GETFOCUS 1008 #define VCLEVENT_WINDOW_LOSEFOCUS 1009 @@ -217,15 +217,15 @@ public: class VCL_DLLPUBLIC VclWindowEvent : public VclSimpleEvent { private: - Window* pWindow; + vcl::Window* pWindow; void* pData; public: - VclWindowEvent( Window* pWin, sal_uLong n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } + VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } virtual ~VclWindowEvent() {} TYPEINFO_OVERRIDE(); - Window* GetWindow() const { return pWindow; } + vcl::Window* GetWindow() const { return pWindow; } void* GetData() const { return pData; } }; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 29cb6fbcccf7..fe5280d1ba2d 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -58,7 +58,7 @@ protected: ScrollBar* GetVScrollBar() const; public: - VclMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); + VclMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); virtual ~VclMultiLineEdit(); void SelectionChanged(); diff --git a/include/vcl/waitobj.hxx b/include/vcl/waitobj.hxx index 2ef2f69f0ee9..d6deecf33f29 100644 --- a/include/vcl/waitobj.hxx +++ b/include/vcl/waitobj.hxx @@ -26,9 +26,9 @@ class VCL_DLLPUBLIC WaitObject { private: - Window* mpWindow; + vcl::Window* mpWindow; public: - WaitObject( Window* pWindow ) + WaitObject( vcl::Window* pWindow ) { mpWindow = pWindow; if ( mpWindow ) diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index bf8a8294c6fe..ce75def7b31f 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -317,11 +317,33 @@ const char* ImplDbgCheckWindow( const void* pObj ); bool ImplDoTiledRendering(); +namespace vcl { class Window; } +vcl::Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); + +namespace vcl { class Cursor; } class Dialog; class WindowImpl; class PaintHelper; class VclBuilder; class VclSizeGroup; +class OutputDevice; +class Application; +class SystemWindow; +class WorkWindow; +class Dialog; +class MessBox; +class DockingWindow; +class FloatingWindow; +class GroupBox; +class PushButton; +class RadioButton; +class SystemChildWindow; +class ImplBorderWindow; +class VclBuilder; +class ImplDockingWindowWrapper; +class ImplPopupFloatWin; +class MenuFloatingWindow; +namespace svt { class PopupWindowControllerImpl; } struct WindowResHeader { @@ -330,30 +352,32 @@ struct WindowResHeader sal_uLong nRSStyle; }; +namespace vcl { + class VCL_DLLPUBLIC Window : public OutputDevice, public Resource { friend class vcl::Cursor; - friend class OutputDevice; - friend class Application; - friend class SystemWindow; - friend class WorkWindow; - friend class Dialog; - friend class MessBox; - friend class DockingWindow; - friend class FloatingWindow; - friend class GroupBox; - friend class PushButton; - friend class RadioButton; - friend class SystemChildWindow; - friend class ImplBorderWindow; - friend class VclBuilder; - friend class PaintHelper; + friend class ::OutputDevice; + friend class ::Application; + friend class ::SystemWindow; + friend class ::WorkWindow; + friend class ::Dialog; + friend class ::MessBox; + friend class ::DockingWindow; + friend class ::FloatingWindow; + friend class ::GroupBox; + friend class ::PushButton; + friend class ::RadioButton; + friend class ::SystemChildWindow; + friend class ::ImplBorderWindow; + friend class ::VclBuilder; + friend class ::PaintHelper; // TODO: improve missing functionality // only required because of SetFloatingMode() - friend class ImplDockingWindowWrapper; - friend class ImplPopupFloatWin; - friend class MenuFloatingWindow; + friend class ::ImplDockingWindowWrapper; + friend class ::ImplPopupFloatWin; + friend class ::MenuFloatingWindow; friend class svt::PopupWindowControllerImpl; @@ -374,9 +398,9 @@ private: OutputDevice* mpOutputDevice; #ifdef DBG_UTIL - friend const char* ImplDbgCheckWindow( const void* pObj ); + friend const char* ::ImplDbgCheckWindow( const void* pObj ); #endif - friend Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); + friend vcl::Window* ::ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); public: @@ -388,26 +412,26 @@ public: DECL_DLLPRIVATE_LINK( ImplHideOwnerDrawWindowsHdl, void* ); - SAL_DLLPRIVATE static void ImplInitAppFontData( Window* pWindow ); + SAL_DLLPRIVATE static void ImplInitAppFontData( vcl::Window* pWindow ); - SAL_DLLPRIVATE Window* ImplGetFrameWindow() const; + SAL_DLLPRIVATE vcl::Window* ImplGetFrameWindow() const; SalFrame* ImplGetFrame() const; SAL_DLLPRIVATE ImplFrameData* ImplGetFrameData(); - SAL_DLLPRIVATE Window* ImplGetWindow(); + SAL_DLLPRIVATE vcl::Window* ImplGetWindow(); SAL_DLLPRIVATE ImplWinData* ImplGetWinData() const; - SAL_DLLPRIVATE Window* ImplGetClientWindow() const; - SAL_DLLPRIVATE Window* ImplGetDlgWindow( sal_uInt16 n, sal_uInt16 nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0xFFFF, sal_uInt16* pIndex = NULL ); - SAL_DLLPRIVATE Window* ImplGetParent() const; - SAL_DLLPRIVATE Window* ImplFindWindow( const Point& rFramePos ); + SAL_DLLPRIVATE vcl::Window* ImplGetClientWindow() const; + SAL_DLLPRIVATE vcl::Window* ImplGetDlgWindow( sal_uInt16 n, sal_uInt16 nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0xFFFF, sal_uInt16* pIndex = NULL ); + SAL_DLLPRIVATE vcl::Window* ImplGetParent() const; + SAL_DLLPRIVATE vcl::Window* ImplFindWindow( const Point& rFramePos ); SAL_DLLPRIVATE void ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplInvalidateOverlapFrameRegion( const Region& rRegion ); SAL_DLLPRIVATE bool ImplSetClipFlag( bool bSysObjOnlySmaller = false ); - SAL_DLLPRIVATE bool ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow = false ) const; - SAL_DLLPRIVATE bool ImplIsChild( const Window* pWindow, bool bSystemWindow = false ) const; + SAL_DLLPRIVATE bool ImplIsWindowOrChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; + SAL_DLLPRIVATE bool ImplIsChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; SAL_DLLPRIVATE bool ImplIsFloatingWindow() const; SAL_DLLPRIVATE bool ImplIsPushButton() const; SAL_DLLPRIVATE bool ImplIsSplitter() const; @@ -454,7 +478,7 @@ public: protected: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ); SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos ); @@ -464,7 +488,7 @@ protected: SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); - SAL_DLLPRIVATE Window* ImplGetBorderWindow() const; + SAL_DLLPRIVATE vcl::Window* ImplGetBorderWindow() const; SAL_DLLPRIVATE void ImplInvalidate( const Region* rRegion, sal_uInt16 nFlags ); @@ -491,18 +515,18 @@ private: SAL_DLLPRIVATE void ImplInitWindowData( WindowType nType ); - SAL_DLLPRIVATE void ImplSetFrameParent( const Window* pParent ); + SAL_DLLPRIVATE void ImplSetFrameParent( const vcl::Window* pParent ); - SAL_DLLPRIVATE void ImplInsertWindow( Window* pParent ); + SAL_DLLPRIVATE void ImplInsertWindow( vcl::Window* pParent ); SAL_DLLPRIVATE void ImplRemoveWindow( bool bRemoveFrameData ); SAL_DLLPRIVATE SalGraphics* ImplGetFrameGraphics() const; - SAL_DLLPRIVATE void ImplCallFocusChangeActivate( Window* pNewOverlapWindow, Window* pOldOverlapWindow ); - SAL_DLLPRIVATE Window* ImplGetFirstOverlapWindow(); - SAL_DLLPRIVATE const Window* ImplGetFirstOverlapWindow() const; + SAL_DLLPRIVATE void ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow, vcl::Window* pOldOverlapWindow ); + SAL_DLLPRIVATE vcl::Window* ImplGetFirstOverlapWindow(); + SAL_DLLPRIVATE const vcl::Window* ImplGetFirstOverlapWindow() const; - SAL_DLLPRIVATE bool ImplIsRealParentPath( const Window* pWindow ) const; + SAL_DLLPRIVATE bool ImplIsRealParentPath( const vcl::Window* pWindow ) const; SAL_DLLPRIVATE bool ImplTestMousePointerSet(); @@ -546,7 +570,7 @@ private: SAL_DLLPRIVATE void ImplCallOverlapPaint(); SAL_DLLPRIVATE void ImplPostPaint(); - SAL_DLLPRIVATE void ImplUpdateWindowPtr( Window* pWindow ); + SAL_DLLPRIVATE void ImplUpdateWindowPtr( vcl::Window* pWindow ); SAL_DLLPRIVATE void ImplUpdateWindowPtr(); SAL_DLLPRIVATE void ImplUpdateOverlapWindowPtr( bool bNewFrame ); @@ -584,18 +608,18 @@ private: SAL_DLLPRIVATE bool ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ); SAL_DLLPRIVATE bool ImplHasDlgCtrl(); SAL_DLLPRIVATE void ImplDlgCtrlNextWindow(); - SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ); - SAL_DLLPRIVATE Window* ImplFindDlgCtrlWindow( Window* pWindow ); + SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( vcl::Window* pWindow, bool bGetFocus ); + SAL_DLLPRIVATE vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pWindow ); SAL_DLLPRIVATE long ImplLogicUnitToPixelX( long nX, MapUnit eUnit ); SAL_DLLPRIVATE long ImplLogicUnitToPixelY( long nY, MapUnit eUnit ); - SAL_DLLPRIVATE bool ImplIsWindowInFront( const Window* pTestWindow ) const; + SAL_DLLPRIVATE bool ImplIsWindowInFront( const vcl::Window* pTestWindow ) const; SAL_DLLPRIVATE static void ImplNewInputContext(); - SAL_DLLPRIVATE void ImplCallActivateListeners(Window*); - SAL_DLLPRIVATE void ImplCallDeactivateListeners(Window*); + SAL_DLLPRIVATE void ImplCallActivateListeners(vcl::Window*); + SAL_DLLPRIVATE void ImplCallDeactivateListeners(vcl::Window*); SAL_DLLPRIVATE void ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY ); @@ -603,11 +627,11 @@ private: SAL_DLLPRIVATE long ImplGetUnmirroredOutOffX(); // retrieves the list of owner draw decorated windows for this window hiearchy - SAL_DLLPRIVATE ::std::vector<Window *>& ImplGetOwnerDrawList(); + SAL_DLLPRIVATE ::std::vector<vcl::Window *>& ImplGetOwnerDrawList(); - SAL_DLLPRIVATE Window* ImplGetTopmostFrameWindow(); + SAL_DLLPRIVATE vcl::Window* ImplGetTopmostFrameWindow(); - SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bClientOnly ) const; + SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( vcl::Window *pRelativeWindow, bool bClientOnly ) const; SAL_DLLPRIVATE bool ImplStopDnd(); SAL_DLLPRIVATE void ImplStartDnd(); @@ -649,9 +673,9 @@ public: public: // Single argument ctors shall be explicit. - explicit Window( Window* pParent, WinBits nStyle = 0 ); + explicit Window( vcl::Window* pParent, WinBits nStyle = 0 ); - Window( Window* pParent, const ResId& rResId ); + Window( vcl::Window* pParent, const ResId& rResId ); virtual ~Window(); OutputDevice const* GetOutDev() const { return mpOutputDevice; }; @@ -683,7 +707,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); - virtual Window* GetPreferredKeyInputWindow(); + virtual vcl::Window* GetPreferredKeyInputWindow(); /*virtual*/ void AddEventListener( const Link& rEventListener ); /*virtual*/ void RemoveEventListener( const Link& rEventListener ); @@ -798,8 +822,8 @@ public: // paint additional parts of your window if necessary void ExpandPaintClipRegion( const Region& rRegion ); - void SetParent( Window* pNewParent ); - Window* GetParent() const; + void SetParent( vcl::Window* pNewParent ); + vcl::Window* GetParent() const; // return the dialog we are contained in or NULL if un-contained Dialog* GetParentDialog() const; @@ -816,7 +840,7 @@ public: void EnableInput( bool bEnable = true, bool bChild = true ); void EnableInput( bool bEnable, bool bChild, bool bSysWin, - const Window* pExcludeWindow = NULL ); + const vcl::Window* pExcludeWindow = NULL ); bool IsInputEnabled() const; /** Override <code>EnableInput</code>. This can be necessary due to other people @@ -891,7 +915,7 @@ public: sal_uInt16 GetActivateMode() const; void ToTop( sal_uInt16 nFlags = 0 ); - void SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ); + void SetZOrder( vcl::Window* pRefWindow, sal_uInt16 nFlags ); void EnableAlwaysOnTop( bool bEnable = true ); bool IsAlwaysOnTopEnabled() const; @@ -918,9 +942,9 @@ public: Point AbsoluteScreenToOutputPixel( const Point& rPos ) const; Rectangle GetDesktopRectPixel() const; // window extents including border and decoratrion - Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; + Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; // window extents of the client window, coordinates to be used in SetPosPixel - Rectangle GetClientWindowExtentsRelative( Window *pRelativeWindow ) const; + Rectangle GetClientWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; virtual bool IsScrollable() const; virtual void Scroll( long nHorzScroll, long nVertScroll, @@ -1013,19 +1037,19 @@ public: void SetUniqueId( const OString& ); const OString& GetUniqueId() const; - Window* FindWindow( const Point& rPos ) const; + vcl::Window* FindWindow( const Point& rPos ) const; sal_uInt16 GetChildCount() const; - Window* GetChild( sal_uInt16 nChild ) const; - Window* GetWindow( sal_uInt16 nType ) const; - bool IsChild( const Window* pWindow, bool bSystemWindow = false ) const; - bool IsWindowOrChild( const Window* pWindow, bool bSystemWindow = false ) const; + vcl::Window* GetChild( sal_uInt16 nChild ) const; + vcl::Window* GetWindow( sal_uInt16 nType ) const; + bool IsChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; + bool IsWindowOrChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; void SetData( void* pNewData ); void* GetData() const; /// Add all children to @rAllChildren recursively. - SAL_DLLPRIVATE void CollectChildren(::std::vector<Window *>& rAllChildren ); + SAL_DLLPRIVATE void CollectChildren(::std::vector<vcl::Window *>& rAllChildren ); void ShowFocus( const Rectangle& rRect ); void HideFocus(); @@ -1083,9 +1107,9 @@ public: void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); - Window* GetAccessibleParentWindow() const; + vcl::Window* GetAccessibleParentWindow() const; sal_uInt16 GetAccessibleChildWindowCount(); - Window* GetAccessibleChildWindow( sal_uInt16 n ); + vcl::Window* GetAccessibleChildWindow( sal_uInt16 n ); void SetAccessibleRole( sal_uInt16 nRole ); sal_uInt16 GetAccessibleRole() const; @@ -1096,14 +1120,14 @@ public: void SetAccessibleDescription( const OUString& rDescr ); OUString GetAccessibleDescription() const; - void SetAccessibleRelationLabeledBy( Window* pLabeledBy ); - Window* GetAccessibleRelationLabeledBy() const; + void SetAccessibleRelationLabeledBy( vcl::Window* pLabeledBy ); + vcl::Window* GetAccessibleRelationLabeledBy() const; - void SetAccessibleRelationLabelFor( Window* pLabelFor ); - Window* GetAccessibleRelationLabelFor() const; + void SetAccessibleRelationLabelFor( vcl::Window* pLabelFor ); + vcl::Window* GetAccessibleRelationLabelFor() const; - void SetAccessibleRelationMemberOf( Window* pMemberOf ); - Window* GetAccessibleRelationMemberOf() const; + void SetAccessibleRelationMemberOf( vcl::Window* pMemberOf ); + vcl::Window* GetAccessibleRelationMemberOf() const; // to avoid sending accessibility events in cases like closing dialogs @@ -1112,19 +1136,19 @@ public: void SetAccessibilityEventsSuppressed(bool bSuppressed); // Deprecated - can use SetAccessibleRelationLabelFor/By nowadys - virtual Window* GetParentLabelFor( const Window* pLabel ) const; - virtual Window* GetParentLabeledBy( const Window* pLabeled ) const; + virtual vcl::Window* GetParentLabelFor( const vcl::Window* pLabel ) const; + virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabeled ) const; KeyEvent GetActivationKey() const; protected: // These eventually are supposed to go when everything is converted to .ui - SAL_DLLPRIVATE Window* getLegacyNonLayoutAccessibleRelationMemberOf() const; - SAL_DLLPRIVATE Window* getLegacyNonLayoutAccessibleRelationLabeledBy() const; - SAL_DLLPRIVATE Window* getLegacyNonLayoutAccessibleRelationLabelFor() const; + SAL_DLLPRIVATE vcl::Window* getLegacyNonLayoutAccessibleRelationMemberOf() const; + SAL_DLLPRIVATE vcl::Window* getLegacyNonLayoutAccessibleRelationLabeledBy() const; + SAL_DLLPRIVATE vcl::Window* getLegacyNonLayoutAccessibleRelationLabelFor() const; // Let Label override the code part of GetAccessibleRelationLabelFor - virtual Window* getAccessibleRelationLabelFor() const; + virtual vcl::Window* getAccessibleRelationLabelFor() const; virtual sal_uInt16 getDefaultAccessibleRole() const; virtual OUString getDefaultAccessibleName() const; @@ -1146,7 +1170,7 @@ private: SAL_DLLPRIVATE bool ImplIsAccessibleCandidate() const; SAL_DLLPRIVATE bool ImplIsAccessibleNativeFrame() const; SAL_DLLPRIVATE sal_uInt16 ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const; - SAL_DLLPRIVATE Window* ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel = true ) const; + SAL_DLLPRIVATE vcl::Window* ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel = true ) const; SAL_DLLPRIVATE bool ImplRegisterAccessibleNativeFrame(); SAL_DLLPRIVATE void ImplRevokeAccessibleNativeFrame(); ///@} @@ -1410,6 +1434,7 @@ public: virtual Selection GetSurroundingTextSelection() const; }; +} #endif // INCLUDED_VCL_WINDOW_HXX diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 1c06d52d83bc..5b3a266790f2 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -50,7 +50,7 @@ private: mbFullScreenMode:1; SAL_DLLPRIVATE void ImplInitWorkWindowData(); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); private: SAL_DLLPRIVATE WorkWindow( const WorkWindow& rWin ); @@ -58,12 +58,12 @@ private: protected: explicit WorkWindow( WindowType nType ); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); SAL_DLLPRIVATE void ImplSetFrameState( sal_uLong aFrameState ); public: - explicit WorkWindow( Window* pParent, WinBits nStyle = WB_STDWORK ); - explicit WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( vcl::Window* pParent, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version virtual ~WorkWindow(); diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx index fa29f7c5f18c..c5dd3770851f 100644 --- a/include/vcl/xtextedt.hxx +++ b/include/vcl/xtextedt.hxx @@ -52,7 +52,7 @@ protected: bool ImpIndentBlock( bool bRight ); public: - ExtTextView( ExtTextEngine* pEng, Window* pWindow ); + ExtTextView( ExtTextEngine* pEng, vcl::Window* pWindow ); virtual ~ExtTextView(); bool MatchGroup(); |