summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorIvan Timofeev <timofeev.i.s@gmail.com>2012-07-01 15:18:59 +0400
committerIvan Timofeev <timofeev.i.s@gmail.com>2012-07-01 15:21:41 +0400
commit914c8163e3a5014d9d2885444b6383f6fdcea529 (patch)
tree6be784e56a5c14e53ee245387bdb83322103084a /vcl/unx
parent10a7bcdf97c7634922626a2d858539a2f8bb0f7b (diff)
vcl: CTRL_FIXEDBORDER is dead since ef877aab7e
Change-Id: I568b55c3b0b799bdc91ba081e7375debce9618aa
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx8
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx1
-rw-r--r--vcl/unx/kde4/KDESalGraphics.cxx7
3 files changed, 1 insertions, 15 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 2b5d3c8f8e33..7735a7442865 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -592,7 +592,6 @@ sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPar
case CTRL_TAB_ITEM:
case CTRL_TAB_PANE:
case CTRL_TAB_BODY:
- case CTRL_FIXEDBORDER:
if(nPart==PART_ENTIRE_CONTROL || nPart==PART_TABS_DRAW_RTL)
return true;
break;
@@ -870,7 +869,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType,
{
returnVal = NWPaintGTKComboBox( gdkDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption );
}
- else if ( (nType==CTRL_TAB_ITEM) || (nType==CTRL_TAB_PANE) || (nType==CTRL_TAB_BODY) || (nType==CTRL_FIXEDBORDER) )
+ else if ( (nType==CTRL_TAB_ITEM) || (nType==CTRL_TAB_PANE) || (nType==CTRL_TAB_BODY) )
{
if ( nType == CTRL_TAB_BODY )
returnVal = sal_True;
@@ -2593,7 +2592,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
case CTRL_TAB_BODY:
break;
- case CTRL_FIXEDBORDER:
case CTRL_TAB_PANE:
gtk_paint_box_gap( gWidgetData[m_nXScreen].gNotebookWidget->style, pixmap, GTK_STATE_NORMAL, GTK_SHADOW_OUT, NULL, gWidgetData[m_nXScreen].gNotebookWidget,
(char *)"notebook", 0, 0, pixmapRect.GetWidth(), pixmapRect.GetHeight(), GTK_POS_TOP, 0, 0 );
@@ -2633,10 +2631,6 @@ sal_Bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
break;
}
- // Crux seems to think it can make the pane without a left edge
- if ( nType == CTRL_FIXEDBORDER )
- pixmapRect.Move( 1, 0 );
-
// cache data
if( nType == CTRL_TAB_ITEM )
aCacheItems.Fill( nType, nState, pixmapRect, pixmap );
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index e9e4d65a7a1f..6e9871b4b4fa 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1215,7 +1215,6 @@ sal_Bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPar
( (nType == CTRL_SCROLLBAR) && (nPart == HAS_THREE_BUTTONS) ) || // TODO small optimization is possible here: return this only if the style really has 3 buttons
// CTRL_GROUPBOX not supported
// CTRL_FIXEDLINE not supported
- // CTRL_FIXEDBORDER not supported
( (nType == CTRL_TOOLBAR) && (nPart == PART_ENTIRE_CONTROL ||
nPart == PART_DRAW_BACKGROUND_HORZ || nPart == PART_DRAW_BACKGROUND_VERT ||
nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT ||
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index c7980a11a9b5..c51d49d64047 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -132,8 +132,6 @@ sal_Bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart
if (type == CTRL_FIXEDLINE) return true;
- if (type == CTRL_FIXEDBORDER) return true;
-
if (type == CTRL_TOOLTIP) return true;
if (type == CTRL_RADIOBUTTON) return true;
@@ -558,11 +556,6 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
int fw = getFrameWidth();
clipRegion = new QRegion( QRegion( widgetRect ).subtracted( widgetRect.adjusted( fw, fw, -fw, -fw )));
}
- else if (type == CTRL_FIXEDBORDER)
- {
- lcl_drawFrame( QStyle::PE_FrameWindow, m_image,
- vclStateValue2StateFlag(nControlState, value) );
- }
else if (type == CTRL_WINDOW_BACKGROUND)
{
m_image->fill(KApplication::palette().color(QPalette::Window).rgb());