[Libreoffice-commits] .: vcl/aqua vcl/inc vcl/ios vcl/unx vcl/win
Ivan Timofeev
ivantimofeev at kemper.freedesktop.org
Sun Jul 1 04:24:26 PDT 2012
vcl/aqua/source/gdi/salnativewidgets.cxx | 2 --
vcl/inc/vcl/salnativewidgets.hxx | 5 -----
vcl/ios/source/gdi/salnativewidgets.cxx | 1 -
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 8 +-------
vcl/unx/kde/salnativewidgets-kde.cxx | 1 -
vcl/unx/kde4/KDESalGraphics.cxx | 7 -------
vcl/win/source/gdi/salnativewidgets-luna.cxx | 17 -----------------
7 files changed, 1 insertion(+), 40 deletions(-)
New commits:
commit 914c8163e3a5014d9d2885444b6383f6fdcea529
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Sun Jul 1 15:18:59 2012 +0400
vcl: CTRL_FIXEDBORDER is dead since ef877aab7e
Change-Id: I568b55c3b0b799bdc91ba081e7375debce9618aa
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index df6c6fa..bb7392e 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -314,7 +314,6 @@ sal_Bool AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPa
case CTRL_TAB_ITEM:
case CTRL_TAB_PANE:
case CTRL_TAB_BODY: // see vcl/source/window/tabpage.cxx
- case CTRL_FIXEDBORDER:
if( nPart == PART_ENTIRE_CONTROL ||
nPart == PART_TABS_DRAW_RTL ||
nPart == HAS_BACKGROUND_TEXTURE )
@@ -517,7 +516,6 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
}
break;
- case CTRL_FIXEDBORDER:
case CTRL_TOOLBAR:
{
HIThemeMenuItemDrawInfo aMenuItemDrawInfo;
diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx
index c082b38..a3c9bab 100644
--- a/vcl/inc/vcl/salnativewidgets.hxx
+++ b/vcl/inc/vcl/salnativewidgets.hxx
@@ -109,11 +109,6 @@ typedef sal_uInt32 ControlType;
// A separator line
#define CTRL_FIXEDLINE 80
-// A rectangular border, like a
-// Tab Pane, but without the
-// possible gap for a tab
-#define CTRL_FIXEDBORDER 90
-
// A toolbar control with buttons and a grip
#define CTRL_TOOLBAR 100
diff --git a/vcl/ios/source/gdi/salnativewidgets.cxx b/vcl/ios/source/gdi/salnativewidgets.cxx
index c2d5068..71dda98 100644
--- a/vcl/ios/source/gdi/salnativewidgets.cxx
+++ b/vcl/ios/source/gdi/salnativewidgets.cxx
@@ -121,7 +121,6 @@ sal_Bool IosSalGraphics::IsNativeControlSupported( ControlType nType, ControlPar
case CTRL_TAB_ITEM:
case CTRL_TAB_PANE:
case CTRL_TAB_BODY: // see vcl/source/window/tabpage.cxx
- case CTRL_FIXEDBORDER:
if( nPart == PART_ENTIRE_CONTROL ||
nPart == PART_TABS_DRAW_RTL ||
nPart == HAS_BACKGROUND_TEXTURE )
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 2b5d3c8..7735a74 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 e9e4d65..6e9871b 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 c7980a1..c51d49d 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());
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index ca63b70..065e450 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -302,7 +302,6 @@ sal_Bool WinSalGraphics::IsNativeControlSupported( ControlType nType, ControlPar
case CTRL_TAB_PANE:
case CTRL_TAB_BODY:
case CTRL_TAB_ITEM:
- case CTRL_FIXEDBORDER:
if( nPart == PART_ENTIRE_CONTROL )
hTheme = getThemeHandle( mhWnd, L"Tab");
break;
@@ -827,21 +826,6 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption);
}
- if( nType == CTRL_FIXEDBORDER )
- {
- /*
- iPart = BP_GROUPBOX;
- if( !(nState & CTRL_STATE_ENABLED) )
- iState = GBS_DISABLED;
- else
- iState = GBS_NORMAL;
- */
- // The fixed border is only used around the tools->options tabpage where
- // TABP_PANE fits best
- iPart = TABP_PANE;
- return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption);
- }
-
if( nType == CTRL_TAB_BODY )
{
iPart = TABP_BODY;
@@ -1184,7 +1168,6 @@ sal_Bool WinSalGraphics::drawNativeControl( ControlType nType,
case CTRL_TAB_PANE:
case CTRL_TAB_BODY:
case CTRL_TAB_ITEM:
- case CTRL_FIXEDBORDER:
hTheme = getThemeHandle( mhWnd, L"Tab");
break;
case CTRL_TOOLBAR:
More information about the Libreoffice-commits
mailing list