diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/salmenu.hxx | 8 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 6 | ||||
| -rw-r--r-- | vcl/inc/wall2.hxx | 6 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index 6829e3a623d1..c696503549e6 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -29,12 +29,12 @@ class SalFrame; struct SalItemParams { - sal_uInt16 nId; // item Id - MenuItemType eType; // MenuItem-Type - MenuItemBits nBits; // MenuItem-Bits + Image aImage; // Image VclPtr<Menu> pMenu; // Pointer to Menu OUString aText; // Menu-Text - Image aImage; // Image + MenuItemType eType; // MenuItem-Type + sal_uInt16 nId; // item Id + MenuItemBits nBits; // MenuItem-Bits }; struct SalMenuButtonItem diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index b973684b21f1..858584398974 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -158,11 +158,11 @@ public: GtkSalMenuItem( const SalItemParams* ); virtual ~GtkSalMenuItem() override; - sal_uInt16 const mnId; // Item ID - MenuItemType const mnType; // Item type - bool mbVisible; // Item visibility. GtkSalMenu* mpParentMenu; // The menu into which this menu item is inserted GtkSalMenu* mpSubMenu; // Submenu of this item (if defined) + MenuItemType const mnType; // Item type + sal_uInt16 const mnId; // Item ID + bool mbVisible; // Item visibility. }; #endif // INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX diff --git a/vcl/inc/wall2.hxx b/vcl/inc/wall2.hxx index cad63ee4332d..37cd4fa66812 100644 --- a/vcl/inc/wall2.hxx +++ b/vcl/inc/wall2.hxx @@ -27,12 +27,12 @@ class ImplWallpaper friend class Wallpaper; private: - Color maColor; + boost::optional<tools::Rectangle> mpRect; std::unique_ptr<BitmapEx> mpBitmap; std::unique_ptr<Gradient> mpGradient; - boost::optional<tools::Rectangle> mpRect; - WallpaperStyle meStyle; std::unique_ptr<BitmapEx> mpCache; + Color maColor; + WallpaperStyle meStyle; public: ImplWallpaper(); diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 70edf5f91f9c..150475912a43 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -1427,11 +1427,11 @@ int GtkSalMenu::GetMenuBarHeight() const */ GtkSalMenuItem::GtkSalMenuItem( const SalItemParams* pItemData ) : - mnId( pItemData->nId ), - mnType( pItemData->eType ), - mbVisible( true ), mpParentMenu( nullptr ), - mpSubMenu( nullptr ) + mpSubMenu( nullptr ), + mnType( pItemData->eType ), + mnId( pItemData->nId ), + mbVisible( true ) { } |