diff options
Diffstat (limited to 'vcl/inc/unx')
-rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 22 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 26 | ||||
-rw-r--r-- | vcl/inc/unx/saldisp.hxx | 14 | ||||
-rw-r--r-- | vcl/inc/unx/salgdi.h | 2 |
4 files changed, 32 insertions, 32 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index af530f867e0b..a11f1fa8b144 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -360,7 +360,7 @@ public: virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE; virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE; virtual void SetMenu( SalMenu *pSalMenu ) SAL_OVERRIDE; - SalMenu* GetMenu( void ); + SalMenu* GetMenu( void ); virtual void DrawMenuBar() SAL_OVERRIDE; void EnsureAppMenuWatch(); @@ -377,7 +377,7 @@ public: virtual void GetWorkArea( Rectangle& rRect ) SAL_OVERRIDE; virtual SalFrame* GetParent() const SAL_OVERRIDE; virtual void SetWindowState( const SalFrameState* pState ) SAL_OVERRIDE; - virtual bool GetWindowState( SalFrameState* pState ) SAL_OVERRIDE; + virtual bool GetWindowState( SalFrameState* pState ) SAL_OVERRIDE; virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) SAL_OVERRIDE; // Enable/Disable ScreenSaver, SystemAgents, ... virtual void StartPresentation( bool bStart ) SAL_OVERRIDE; @@ -402,8 +402,8 @@ public: virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE; virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE; - virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE; + virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, vcl::KeyCode& rKeyCode ) SAL_OVERRIDE; // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS @@ -435,19 +435,19 @@ public: // shaped system windows // set clip region to none (-> rectangular windows, normal state) - virtual void ResetClipRegion() SAL_OVERRIDE; + virtual void ResetClipRegion() SAL_OVERRIDE; // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; + virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE; // add a rectangle to the clip region - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; + virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE; // done setting up the clipregion - virtual void EndSetClipRegion() SAL_OVERRIDE; + virtual void EndSetClipRegion() SAL_OVERRIDE; - static GtkSalFrame *getFromWindow( GtkWindow *pWindow ); + static GtkSalFrame *getFromWindow( GtkWindow *pWindow ); - void damaged (const basegfx::B2IBox& rDamageRect); + void damaged (const basegfx::B2IBox& rDamageRect); - virtual Window GetX11Window() SAL_OVERRIDE; + virtual Window GetX11Window() SAL_OVERRIDE; }; #define OOO_TYPE_FIXED ooo_fixed_get_type() diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 7659321f38b3..3a3d79e80702 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -58,14 +58,14 @@ public: GtkSalMenu( bool bMenuBar ); virtual ~GtkSalMenu(); - virtual bool VisibleMenuBar() SAL_OVERRIDE; // must return TRUE to actually DISPLAY native menu bars + virtual bool VisibleMenuBar() SAL_OVERRIDE; // must return TRUE to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) SAL_OVERRIDE; virtual void RemoveItem( unsigned nPos ) SAL_OVERRIDE; virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE; virtual void SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE; - const GtkSalFrame* GetFrame() const; + const GtkSalFrame* GetFrame() const; virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE; virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE; virtual void ShowItem( unsigned nPos, bool bShow ) SAL_OVERRIDE; @@ -74,16 +74,16 @@ public: virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE; - void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } - Menu* GetMenu() { return mpVCLMenu; } - GtkSalMenu* GetParentSalMenu() { return mpParentSalMenu; } - void SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; } - GMenuModel* GetMenuModel() { return mpMenuModel; } - unsigned GetItemCount() { return maItems.size(); } - GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } - void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; } - GActionGroup* GetActionGroup() { return mpActionGroup; } - bool IsItemVisible( unsigned nPos ); + void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } + Menu* GetMenu() { return mpVCLMenu; } + GtkSalMenu* GetParentSalMenu() { return mpParentSalMenu; } + void SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; } + GMenuModel* GetMenuModel() { return mpMenuModel; } + unsigned GetItemCount() { return maItems.size(); } + GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } + void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; } + GActionGroup* GetActionGroup() { return mpActionGroup; } + bool IsItemVisible( unsigned nPos ); void NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText ); void NativeSetItemCommand( unsigned nSection, @@ -114,7 +114,7 @@ public: sal_uInt16 mnId; // Item ID MenuItemType mnType; // Item type - bool mbVisible; // Item visibility. + bool mbVisible; // Item visibility. Menu* mpVCLMenu; // VCL Menu into which this menu item is inserted GtkSalMenu* mpParentMenu; // The menu into which this menu item is inserted GtkSalMenu* mpSubMenu; // Submenu of this item (if defined) diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 26bb5e9ec63e..4eac942d686b 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -259,7 +259,7 @@ protected: Cursor aPointerCache_[POINTER_COUNT]; // Keyboard - bool bNumLockFromXS_; // Num Lock handled by X Server + bool bNumLockFromXS_; // Num Lock handled by X Server int nNumLockIndex_; // modifier index in modmap int nNumLockMask_; // keyevent state mask for KeySym nShiftKeySym_; // first shift modifier @@ -306,9 +306,9 @@ public: void ModifierMapping(); void SimulateKeyPress( sal_uInt16 nKeyCode ); KeyIndicatorState GetIndicatorState() const; - OUString GetKeyNameFromKeySym( KeySym keysym ) const; - OUString GetKeyName( sal_uInt16 nKeyCode ) const; - sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const; + OUString GetKeyNameFromKeySym( KeySym keysym ) const; + OUString GetKeyName( sal_uInt16 nKeyCode ) const; + sal_uInt16 GetKeyCode( KeySym keysym, char*pcPrintable ) const; KeySym GetKeySym( XKeyEvent *pEvent, unsigned char *pPrintable, int *pLen, @@ -336,7 +336,7 @@ public: const Size& GetScreenSize( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aSize; } srv_vendor_t GetServerVendor() const { return meServerVendor; } void SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); } - bool IsDisplay() const { return !!pXLib_; } + bool IsDisplay() const { return !!pXLib_; } GC GetMonoGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aMonoGC; } GC GetCopyGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aCopyGC; } GC GetAndInvertedGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aAndInvertedGC; } @@ -395,10 +395,10 @@ public: virtual ~SalX11Display(); virtual bool Dispatch( XEvent *pEvent ) SAL_OVERRIDE; - void Yield(); + void Yield(); virtual void PostUserEvent() SAL_OVERRIDE; - bool IsEvent(); + bool IsEvent(); void SetupInput( SalI18N_InputMethod *pInputMethod ); }; diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index af894caef2c4..2ca876e82614 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -250,7 +250,7 @@ public: const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE; - bool drawAlphaBitmap( + bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rBitmap ); |