diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-16 13:52:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-16 13:54:13 +0000 |
| commit | 65fca19cd5268eb8c162d5c8bd2328912a4aaea3 (patch) | |
| tree | d841caac0daf18ef2ad1b323f3156fa352799fe2 /vcl/unx | |
| parent | 9fdecc7ede30f2c0c356d97cca2c5bfe98d9ad92 (diff) | |
fix tinderbox build, ends up using gen backend and icons are missing
put the icons back, and replace the bare 1 etc which hid the usage
Change-Id: Id90de7b29a29141b448107adb4028407ed203e2a
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 6 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index f4dee74f99a3..ea6271946b1f 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -538,8 +538,8 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen try { bOk = lcl_SelectAppIconPixmap( pDisplay_, m_nXScreen, - mnIconID != 1 ? mnIconID : - (mpParent ? mpParent->mnIconID : 1), 32, + mnIconID != SV_ICON_ID_OFFICE ? mnIconID : + (mpParent ? mpParent->mnIconID : SV_ICON_ID_OFFICE), 32, Hints.icon_pixmap, Hints.icon_mask, netwm_icon ); } catch( css::uno::Exception& ) @@ -818,7 +818,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle, mbShaded = false; mbFullScreen = false; - mnIconID = 1; // ICON_LO_DEFAULT + mnIconID = SV_ICON_ID_OFFICE; m_pClipRectangles = nullptr; m_nCurClipRect = 0; diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 24544f4ef29e..c03764ff3158 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -1046,7 +1046,7 @@ void GtkSalFrame::InitCommon() } updateScreenNumber(); - SetIcon(1); + SetIcon(SV_ICON_ID_OFFICE); m_nWorkArea = pDisp->getWMAdaptor()->getCurrentWorkArea(); /* #i64117# gtk sets a nice background pixmap diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 9bfe6027405c..9ecef8367aa0 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1158,7 +1158,7 @@ void GtkSalFrame::InitCommon() } updateScreenNumber(); - SetIcon(1); + SetIcon(SV_ICON_ID_OFFICE); } GtkSalFrame *GtkSalFrame::getFromWindow( GtkWindow *pWindow ) |