[openoffice.org/f14/master] adjust patch
Caolan McNamara
caolanm at fedoraproject.org
Fri Sep 17 12:43:56 UTC 2010
commit 357d6d9c73bc023e17c46dcb2c2c0a7e2cba3658
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 17 13:43:45 2010 +0100
adjust patch
workspace.gtk3.patch | 243 ++++++++++++++------------------------------------
1 files changed, 68 insertions(+), 175 deletions(-)
---
diff --git a/workspace.gtk3.patch b/workspace.gtk3.patch
index 381217d..2373e6e 100644
--- a/workspace.gtk3.patch
+++ b/workspace.gtk3.patch
@@ -1556,22 +1556,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
aValue, rCaption );
rNativeContentRegion = rNativeBoundingRegion;
-@@ -1102,8 +1107,12 @@
- GtkRequisition aReq;
- gtk_widget_size_request( widget, &aReq );
- Rectangle aEditRect = rControlRegion;
-- aEditRect = Rectangle( aEditRect.TopLeft(),
-- Size( aEditRect.GetWidth(), aReq.height+1 ) );
-+ //Don't grow past space available
-+ if ((aReq.height+1) < aEditRect.GetHeight())
-+ {
-+ aEditRect = Rectangle( aEditRect.TopLeft(),
-+ Size( aEditRect.GetWidth(), aReq.height+1 ) );
-+ }
- rNativeBoundingRegion = aEditRect;
- rNativeContentRegion = rNativeBoundingRegion;
- returnVal = TRUE;
-@@ -1133,7 +1142,7 @@
+@@ -1134,7 +1139,7 @@
returnVal = TRUE;
}
@@ -1580,7 +1565,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
-@@ -1143,67 +1152,67 @@
+@@ -1144,67 +1149,67 @@
BOOL GtkSalGraphics::NWPaintGTKButton(
GdkDrawable* gdkDrawable,
ControlType, ControlPart,
@@ -1695,7 +1680,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it)
{
-@@ -1224,88 +1233,88 @@
+@@ -1225,88 +1230,88 @@
if ( (GTK_BUTTON(gWidgetData[m_nScreen].gBtnWidget)->relief != GTK_RELIEF_NONE)
|| (nState & CTRL_STATE_PRESSED)
@@ -1848,7 +1833,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
//-------------------------------------
-@@ -1318,15 +1327,15 @@
+@@ -1319,15 +1324,15 @@
const ImplControlValue& aValue,
const OUString& )
{
@@ -1871,7 +1856,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
gint indicator_size;
gtk_widget_style_get( gWidgetData[m_nScreen].gRadioWidget, "indicator_size", &indicator_size, (char *)NULL);
-@@ -1334,22 +1343,22 @@
+@@ -1335,22 +1340,22 @@
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1903,7 +1888,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
-@@ -1363,7 +1372,7 @@
+@@ -1364,7 +1369,7 @@
x, y, indicator_size, indicator_size );
}
@@ -1912,7 +1897,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
//-------------------------------------
-@@ -1376,15 +1385,15 @@
+@@ -1377,15 +1382,15 @@
const ImplControlValue& aValue,
const OUString& )
{
@@ -1936,7 +1921,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
gint indicator_size;
gtk_widget_style_get( gWidgetData[m_nScreen].gCheckWidget, "indicator_size", &indicator_size, (char *)NULL);
-@@ -1392,10 +1401,10 @@
+@@ -1393,10 +1398,10 @@
x = rControlRectangle.Left() + (rControlRectangle.GetWidth()-indicator_size)/2;
y = rControlRectangle.Top() + (rControlRectangle.GetHeight()-indicator_size)/2;
@@ -1951,7 +1936,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
-@@ -1409,17 +1418,17 @@
+@@ -1410,17 +1415,17 @@
x, y, indicator_size, indicator_size );
}
@@ -1972,7 +1957,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
rButton.Left() + ( rButton.GetWidth() - rArrow.GetWidth() ) / 2,
rButton.Top() + ( rButton.GetHeight() - rArrow.GetHeight() ) / 2
) );
-@@ -1469,54 +1478,54 @@
+@@ -1470,54 +1475,54 @@
button12BoundRect.Move( -rControlRectangle.Left(), -rControlRectangle.Top() );
button21BoundRect.Move( -rControlRectangle.Left(), -rControlRectangle.Top() );
@@ -2057,7 +2042,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
if ( has_backward )
{
-@@ -1541,33 +1550,33 @@
+@@ -1542,33 +1547,33 @@
button21BoundRect.SetSize( Size( stepper_size, slider_width ) );
button22BoundRect.SetSize( Size( stepper_size, slider_width ) );
@@ -2112,7 +2097,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
if ( has_backward )
{
-@@ -1576,7 +1585,7 @@
+@@ -1577,7 +1582,7 @@
}
button11BoundRect.Move( (scrollbarRect.GetWidth() - slider_width) / 2, trough_border );
button11BoundRect.SetSize( Size( slider_width, stepper_size ) );
@@ -2121,7 +2106,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
if ( has_backward2 )
{
-@@ -1591,41 +1600,41 @@
+@@ -1592,41 +1597,41 @@
button21BoundRect.SetSize( Size( slider_width, stepper_size ) );
button22BoundRect.SetSize( Size( slider_width, stepper_size ) );
@@ -2191,7 +2176,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
// as multiple paints are required for the scrollbar
// painting them directly to the window flickers
-@@ -1640,81 +1649,81 @@
+@@ -1641,81 +1646,81 @@
GdkDrawable* const &gdkDrawable = GDK_DRAWABLE( pixmap );
GdkRectangle* gdkRect = NULL;
@@ -2303,7 +2288,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, TRUE,
x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
-@@ -1723,13 +1732,13 @@
+@@ -1724,13 +1729,13 @@
if ( has_forward )
{
NWConvertVCLStateToGTKState( pScrollbarVal->mnButton2State, &stateType, &shadowType );
@@ -2320,7 +2305,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, TRUE,
x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
-@@ -1743,12 +1752,12 @@
+@@ -1744,12 +1749,12 @@
}
g_object_unref( pixmap );
@@ -2335,7 +2320,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
{
gint slider_width;
gint stepper_size;
-@@ -1757,26 +1766,26 @@
+@@ -1758,26 +1763,26 @@
NWEnsureGTKScrollbars( nScreen );
@@ -2374,7 +2359,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
gint nFirst = 0;
gint nSecond = 0;
-@@ -1826,7 +1835,7 @@
+@@ -1827,7 +1832,7 @@
buttonRect.SetSize( Size( buttonWidth, buttonHeight ) );
@@ -2383,7 +2368,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
//-------------------------------------
-@@ -1839,7 +1848,7 @@
+@@ -1840,7 +1845,7 @@
const ImplControlValue& aValue,
const OUString& rCaption )
{
@@ -2392,7 +2377,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
GdkRectangle clipRect;
// Find the overall bounding rect of the buttons's drawing area,
-@@ -1856,7 +1865,7 @@
+@@ -1857,7 +1862,7 @@
NWPaintOneEditBox( m_nScreen, gdkDrawable, &clipRect, nType, nPart, pixmapRect, nState, aValue, rCaption );
}
@@ -2401,7 +2386,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
-@@ -1866,31 +1875,31 @@
+@@ -1867,31 +1872,31 @@
*/
static Rectangle NWGetEditBoxPixmapRect(int nScreen,
ControlType,
@@ -2449,7 +2434,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
-@@ -1898,67 +1907,66 @@
+@@ -1899,67 +1904,66 @@
* All coordinates should be local to the Pixmap, NOT
* screen/window coordinates.
*/
@@ -2552,7 +2537,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
gdkRect, widget, "entry",
aEditBoxRect.Left(), aEditBoxRect.Top(),
aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() );
-@@ -2067,33 +2075,33 @@
+@@ -2068,33 +2072,33 @@
static Rectangle NWGetSpinButtonRect( int nScreen,
ControlType,
@@ -2606,7 +2591,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
else
{
buttonRect.Right() = buttonRect.Left()-1;
-@@ -2102,7 +2110,7 @@
+@@ -2103,7 +2107,7 @@
buttonRect.Bottom() = aAreaRect.Bottom();
}
@@ -2615,7 +2600,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
//---
-@@ -2136,22 +2144,24 @@
+@@ -2137,22 +2141,24 @@
arrowSize = (buttonRect.GetWidth() - (2 * gWidgetData[nScreen].gSpinButtonWidget->style->xthickness)) - 4;
arrowSize -= arrowSize % 2 - 1; /* force odd */
arrowRect.SetSize( Size( arrowSize, arrowSize ) );
@@ -2650,7 +2635,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
-@@ -2159,40 +2169,37 @@
+@@ -2160,40 +2166,37 @@
const ImplControlValue& aValue,
const OUString& rCaption )
{
@@ -2713,7 +2698,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
buttonRect.Top() + (gint)((buttonRect.GetHeight() - arrowRect.GetHeight()) / 2) ) );
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
-@@ -2212,48 +2219,163 @@
+@@ -2213,48 +2216,163 @@
x+(buttonRect.Left() - pixmapRect.Left()),
y+(buttonRect.Top() - pixmapRect.Top()),
buttonRect.GetWidth(), buttonRect.GetHeight() );
@@ -2897,7 +2882,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
if( nPart == PART_BUTTON_DOWN )
{
aButtonRect.SetSize( Size( nButtonWidth, aAreaRect.GetHeight() ) );
-@@ -2262,13 +2384,11 @@
+@@ -2263,13 +2381,11 @@
}
else if( nPart == PART_SUB_EDIT )
{
@@ -2914,12 +2899,8 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
aButtonRect.SetSize( Size( aAreaRect.GetWidth() - nButtonWidth - 2 * adjust_x,
aAreaRect.GetHeight() - 2 * adjust_y ) );
Point aEditPos = aAreaRect.TopLeft();
-@@ -2277,27 +2397,92 @@
- aButtonRect.SetPos( aEditPos );
- }
-
-- return( aButtonRect );
-+ return( aButtonRect );
+@@ -2281,22 +2397,86 @@
+ return( aButtonRect );
}
-//-------------------------------------
@@ -2938,6 +2919,10 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
+ gint nFocusPad;
+ NWEnsureGTKComboBox ( nScreen );
++ // Grab some button style attributes
++ gtk_widget_style_get( gWidgetData[nScreen].gComboBox_ButtonWidget,
++ "focus-line-width", &nFocusWidth,
++ "focus-padding", &nFocusPad, (char *)NULL );
-
-BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
@@ -2947,18 +2932,11 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
- const ImplControlValue& aValue,
- const OUString& )
-{
-- OSL_ASSERT( aValue.getType() == CTRL_TAB_ITEM );
+- OSL_ASSERT( nType != CTRL_TAB_ITEM || aValue.getType() == CTRL_TAB_ITEM );
- GdkPixmap * pixmap;
- Rectangle pixmapRect;
- Rectangle tabRect;
-- const TabitemValue * pTabitemValue = static_cast<const TabitemValue *>(&aValue);
- GtkStateType stateType;
-- GtkShadowType shadowType;
-+ // Grab some button style attributes
-+ gtk_widget_style_get( gWidgetData[nScreen].gComboBox_ButtonWidget,
-+ "focus-line-width", &nFocusWidth,
-+ "focus-padding", &nFocusPad, (char *)NULL );
-+
+ nArrowWidth = MIN_ARROW_SIZE + (GTK_MISC(gWidgetData[nScreen].gComboBox_ArrowWidget)->xpad * 2);
+
+ gint nSeparatorWidth = 0;
@@ -3014,100 +2992,15 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
+ const ImplControlValue& aValue,
+ const OUString& )
+{
-+ OSL_ASSERT( aValue.getType() == CTRL_TAB_ITEM );
++ OSL_ASSERT( nType != CTRL_TAB_ITEM || aValue.getType() == CTRL_TAB_ITEM );
+ GdkPixmap * pixmap;
+ Rectangle pixmapRect;
+ Rectangle tabRect;
-+ const TabitemValue * pTabitemValue = static_cast<const TabitemValue *>(&aValue);
+ GtkStateType stateType;
-+ GtkShadowType shadowType;
+ GtkShadowType shadowType;
if( ! gWidgetData[ m_nScreen ].gCacheTabItems )
{
- gWidgetData[ m_nScreen ].gCacheTabItems = new NWPixmapCache( m_nScreen );
-@@ -2311,48 +2496,48 @@
- if( !aCachePage.GetSize() )
- aCachePage.SetSize( 1 );
-
-- if ( !pTabitemValue && (nType==CTRL_TAB_ITEM) )
-- {
-+ if ( !pTabitemValue && (nType==CTRL_TAB_ITEM) )
-+ {
- std::fprintf( stderr, "NWPaintGTKTabItem() received a NULL TabitemValue. Cannot draw native tab\n" );
-- return( false );
-- }
-+ return( false );
-+ }
-
-- NWEnsureGTKButton( m_nScreen );
-- NWEnsureGTKNotebook( m_nScreen );
-- NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
-+ NWEnsureGTKButton( m_nScreen );
-+ NWEnsureGTKNotebook( m_nScreen );
-+ NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
-
-- // Find the overall bounding rect of the buttons's drawing area,
-- // plus its actual draw rect excluding adornment
-- pixmapRect = rControlRectangle;
-- if ( nType == CTRL_TAB_ITEM )
-- {
-- if ( !pTabitemValue->isFirst() )
-- {
-- // GTK+ tabs overlap on the right edge (the top tab obscures the
-- // left edge of the tab right "below" it, so adjust the rectangle
-- // to draw tabs slightly large so the overlap happens
-- pixmapRect.Move( -2, 0 );
-- pixmapRect.SetSize( Size( pixmapRect.GetWidth() + 2, pixmapRect.GetHeight() ) );
-- }
-- if ( nState & CTRL_STATE_SELECTED )
-- {
-- // In GTK+, the selected tab is 2px taller than all other tabs
-- pixmapRect.Move( 0, -2 );
-- pixmapRect.Bottom() += 2;
-- tabRect = pixmapRect;
-- // Only draw over 1 pixel of the tab pane that this tab is drawn on top of.
-- tabRect.Bottom() -= 1;
-- }
-- else
-- tabRect = pixmapRect;
-+ // Find the overall bounding rect of the buttons's drawing area,
-+ // plus its actual draw rect excluding adornment
-+ pixmapRect = rControlRectangle;
-+ if ( nType == CTRL_TAB_ITEM )
-+ {
-+ if ( !pTabitemValue->isFirst() )
-+ {
-+ // GTK+ tabs overlap on the right edge (the top tab obscures the
-+ // left edge of the tab right "below" it, so adjust the rectangle
-+ // to draw tabs slightly large so the overlap happens
-+ pixmapRect.Move( -2, 0 );
-+ pixmapRect.SetSize( Size( pixmapRect.GetWidth() + 2, pixmapRect.GetHeight() ) );
-+ }
-+ if ( nState & CTRL_STATE_SELECTED )
-+ {
-+ // In GTK+, the selected tab is 2px taller than all other tabs
-+ pixmapRect.Move( 0, -2 );
-+ pixmapRect.Bottom() += 2;
-+ tabRect = pixmapRect;
-+ // Only draw over 1 pixel of the tab pane that this tab is drawn on top of.
-+ tabRect.Bottom() -= 1;
-+ }
-+ else
-+ tabRect = pixmapRect;
-
-- // Allow the tab to draw a right border if needed
-- tabRect.Right() -= 1;
-+ // Allow the tab to draw a right border if needed
-+ tabRect.Right() -= 1;
-
- // #129732# avoid degenerate cases which might lead to crashes
- if( tabRect.GetWidth() <= 1 || tabRect.GetHeight() <= 1 )
- return false;
-- }
-+ }
-
- if( nType == CTRL_TAB_ITEM )
- {
-@@ -2366,7 +2551,7 @@
+@@ -2366,7 +2546,7 @@
}
@@ -3116,7 +3009,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
pixmap = gdk_pixmap_new( NULL, pixmapRect.GetWidth(), pixmapRect.GetHeight(),
GetX11SalData()->GetDisplay()->GetVisual( m_nScreen ).GetDepth() );
-@@ -2376,42 +2561,42 @@
+@@ -2376,42 +2556,42 @@
paintRect.height = pixmapRect.GetHeight();
gtk_paint_flat_box( m_pWindow->style, pixmap, GTK_STATE_NORMAL,
@@ -3165,10 +3058,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
- }
+ case CTRL_TAB_ITEM:
+ stateType = ( nState & CTRL_STATE_SELECTED ) ? GTK_STATE_NORMAL : GTK_STATE_ACTIVE;
-
-- // Crux seems to think it can make the pane without a left edge
-- if ( nType == CTRL_FIXEDBORDER )
-- pixmapRect.Move( 1, 0 );
++
+ gtk_paint_extension( gWidgetData[m_nScreen].gNotebookWidget->style, pixmap, stateType, GTK_SHADOW_OUT, NULL, gWidgetData[m_nScreen].gNotebookWidget,
+ (char *)"tab", (tabRect.Left() - pixmapRect.Left()), (tabRect.Top() - pixmapRect.Top()),
+ tabRect.GetWidth(), tabRect.GetHeight(), GTK_POS_BOTTOM );
@@ -3183,14 +3073,17 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
+ default:
+ break;
+ }
-+
+
+- // Crux seems to think it can make the pane without a left edge
+- if ( nType == CTRL_FIXEDBORDER )
+- pixmapRect.Move( 1, 0 );
+ // 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 )
-@@ -2419,152 +2604,65 @@
+@@ -2419,152 +2599,65 @@
else
aCachePage.Fill( nType, nState, pixmapRect, pixmap );
@@ -3366,7 +3259,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
GTK_WIDGET_UNSET_FLAGS( gWidgetData[m_nScreen].gHandleBoxWidget, GTK_SENSITIVE );
if ( nState & CTRL_STATE_ENABLED )
-@@ -2588,7 +2686,7 @@
+@@ -2588,7 +2681,7 @@
bPaintButton =
(GTK_BUTTON(pButtonWidget)->relief != GTK_RELIEF_NONE)
|| (nState & CTRL_STATE_PRESSED)
@@ -3375,7 +3268,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
if( aValue.getTristateVal() == BUTTONVALUE_ON )
{
pButtonWidget = gWidgetData[m_nScreen].gToolbarToggleWidget;
-@@ -2662,7 +2760,7 @@
+@@ -2662,7 +2755,7 @@
}
}
@@ -3384,7 +3277,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
//----
-@@ -2670,24 +2768,24 @@
+@@ -2670,24 +2763,24 @@
BOOL GtkSalGraphics::NWPaintGTKMenubar(
GdkDrawable* gdkDrawable,
ControlType, ControlPart nPart,
@@ -3419,7 +3312,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
if( nPart == PART_MENU_ITEM )
{
-@@ -2749,13 +2847,13 @@
+@@ -2749,13 +2842,13 @@
}
}
@@ -3435,7 +3328,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
const clipList& rClipList,
ControlState nState, const ImplControlValue&,
const OUString& )
-@@ -2765,19 +2863,19 @@
+@@ -2765,19 +2858,19 @@
if( nPart == PART_MENU_ITEM && ! (nState & CTRL_STATE_ENABLED) )
return FALSE;
@@ -3464,7 +3357,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
if( nPart == PART_MENU_ITEM &&
( nState & (CTRL_STATE_SELECTED|CTRL_STATE_ROLLOVER) ) )
-@@ -2879,26 +2977,26 @@
+@@ -2879,26 +2972,26 @@
}
}
@@ -3498,7 +3391,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
-@@ -2917,13 +3015,13 @@
+@@ -2917,13 +3010,13 @@
x, y, w, h );
}
@@ -3514,7 +3407,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
const clipList&,
ControlState nState, const ImplControlValue& rValue,
const OUString& )
-@@ -2935,13 +3033,13 @@
+@@ -2935,13 +3028,13 @@
aRect.Right() += 2;
aRect.Top() -= 2;
aRect.Bottom() += 2;
@@ -3535,7 +3428,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
ButtonValue aButtonValue = rValue.getTristateVal();
GtkExpanderStyle eStyle = GTK_EXPANDER_EXPANDED;
-@@ -2968,25 +3066,25 @@
+@@ -2968,25 +3061,25 @@
w/2, h/2,
eStyle );
@@ -3567,7 +3460,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
long nProgressWidth = rValue.getNumericVal();
-@@ -3158,120 +3256,10 @@
+@@ -3158,120 +3251,10 @@
}
#endif
@@ -3690,7 +3583,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
static Rectangle NWGetToolbarRect( int nScreen,
-@@ -3477,7 +3465,7 @@
+@@ -3477,7 +3460,7 @@
// make the "light" color lighter than the menu color and the "shadow"
// color darker than it.
if ( aStyleSet.GetMenuColor().GetLuminance() >= 32 &&
@@ -3699,7 +3592,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
{
Color temp = aStyleSet.GetMenuColor();
temp.IncreaseLuminance( 8 );
-@@ -3495,10 +3483,10 @@
+@@ -3495,10 +3478,10 @@
aStyleSet.SetMenuHighlightTextColor( aHighlightTextColor );
// UI font
@@ -3714,7 +3607,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
PangoStretch eStretch = pango_font_description_get_stretch( pStyle->font_desc );
psp::FastPrintFontInfo aInfo;
-@@ -3507,9 +3495,9 @@
+@@ -3507,9 +3490,9 @@
// set italic
switch( eStyle )
{
@@ -3727,7 +3620,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
// set weight
if( eWeight <= PANGO_WEIGHT_ULTRALIGHT )
-@@ -3525,15 +3513,15 @@
+@@ -3525,15 +3508,15 @@
// set width
switch( eStretch )
{
@@ -3752,7 +3645,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
#if OSL_DEBUG_LEVEL > 1
-@@ -3627,18 +3615,18 @@
+@@ -3627,18 +3610,18 @@
g_free( pIconThemeName );
// FIXME: need some way of fetching toolbar icon size.
@@ -3775,7 +3668,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
aStyleSet.SetCairoFontOptions( pNewOptions );
-@@ -3698,8 +3686,8 @@
+@@ -3698,8 +3681,8 @@
GdkPixmap* GtkSalGraphics::NWGetPixmapFromScreen( Rectangle srcRect )
{
// Create a new pixmap to hold the composite of the window background and the control
@@ -3786,7 +3679,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
if( !pPixmap || !pPixmapGC )
{
-@@ -3760,29 +3748,29 @@
+@@ -3760,29 +3743,29 @@
* State conversion
************************************************************************/
static void NWConvertVCLStateToGTKState( ControlState nVCLState,
@@ -3837,7 +3730,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
/************************************************************************
-@@ -3790,19 +3778,19 @@
+@@ -3790,19 +3773,19 @@
************************************************************************/
static void NWSetWidgetState( GtkWidget* widget, ControlState nState, GtkStateType nGtkState )
{
@@ -3870,7 +3763,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
/************************************************************************
-@@ -3814,179 +3802,279 @@
+@@ -3814,179 +3797,279 @@
static void NWAddWidgetToCacheWindow( GtkWidget* widget, int nScreen )
{
NWFWidgetData& rData = gWidgetData[nScreen];
@@ -4247,7 +4140,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
//-------------------------------------
-@@ -4003,7 +4091,7 @@
+@@ -4003,7 +4086,7 @@
GtkReliefStyle aRelief = GTK_RELIEF_NORMAL;
gtk_widget_ensure_style( gWidgetData[nScreen].gToolbarWidget );
gtk_widget_style_get( gWidgetData[nScreen].gToolbarWidget,
@@ -4256,7 +4149,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
(char *)NULL);
gtk_button_set_relief( GTK_BUTTON(gWidgetData[nScreen].gToolbarButtonWidget), aRelief );
-@@ -4102,7 +4190,7 @@
+@@ -4102,7 +4185,7 @@
if( !gWidgetData[nScreen].gProgressBar )
{
gWidgetData[nScreen].gProgressBar = gtk_progress_bar_new ();
@@ -4265,7 +4158,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
}
-@@ -4111,7 +4199,7 @@
+@@ -4111,7 +4194,7 @@
if( !gWidgetData[nScreen].gTreeView )
{
gWidgetData[nScreen].gTreeView = gtk_tree_view_new ();
@@ -4274,7 +4167,7 @@ diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.hxx fpicker/source/unx/g
}
}
-@@ -4120,11 +4208,13 @@
+@@ -4120,11 +4203,13 @@
if( !gWidgetData[nScreen].gHScale )
{
gWidgetData[nScreen].gHScale = gtk_hscale_new_with_range(0, 10, 1);
More information about the scm-commits
mailing list