rpms/openoffice.org/devel openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch, 1.1, 1.2 workspace.gtk3.patch, 1.9, 1.10
Caolan McNamara
caolanm at fedoraproject.org
Fri Jul 16 13:37:42 UTC 2010
- Previous message: File id3v2-0.1.12-fedora.tar.gz uploaded to lookaside cache by ndim
- Next message: rpms/id3v2/devel id3v2-fix-release-tarball.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 id3v2.spec, 1.15, 1.16 sources, 1.3, 1.4 id3v2-0.1.11-track-bad-free.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23197
Modified Files:
openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch
workspace.gtk3.patch
Log Message:
fix up configure cockup
openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch:
configure.in | 44 ++++++++++++++++++++++++++-----------------
lingucomponent/prj/build.lst | 2 -
psprint_config/prj/build.lst | 2 -
solenv/config/sooo330.ini | 2 -
4 files changed, 30 insertions(+), 20 deletions(-)
Index: openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch 13 Jul 2010 10:16:52 -0000 1.1
+++ openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch 16 Jul 2010 13:37:39 -0000 1.2
@@ -1,10 +1,10 @@
diff -ru solenv.orig/config/sooo330.ini solenv/config/sooo330.ini
--- solenv.orig/config/sooo330.ini 2010-07-07 12:31:13.000000000 +0100
+++ solenv/config/sooo330.ini 2010-07-07 12:32:23.000000000 +0100
-@@ -8,7 +8,7 @@
- BIG_SVX TRUE
+@@ -9,7 +9,7 @@
BMP_WRITES_FLAG TRUE
BUILD_SPECIAL TRUE
+ BUILD_STAX YES
- BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
+ BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT AFMS LIBTEXTCAT
common_build TRUE
@@ -31,7 +31,43 @@ diff -ru psprint_config.orig/prj/build.l
AC_ARG_WITH(system-cppunit,
[ --with-system-cppunit Use cppunit already on system
],,)
-@@ -5143,6 +5146,24 @@
+@@ -3853,7 +3856,11 @@
+ [
+ AC_CHECK_FILE(/usr/share/java/lucene-core.jar,
+ [ LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar ],
+- [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
++ [ AC_CHECK_FILE(/usr/share/java/lucene.jar,
++ [ LUCENE_CORE_JAR=/usr/share/java/lucene.jar ],
++ [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
++ )
++ ]
+ )
+ ]
+ )
+@@ -3876,22 +3883,6 @@
+ AC_CHECK_FILE($LUCENE_CORE_JAR, [],
+ [ AC_MSG_ERROR(lucene-analyzers.jar not found.)], [])
+ fi
+- AC_MSG_CHECKING([whether lucene is version 2.x])
+- export LUCENE_CORE_JAR
+- if $PERL -e 'use Archive::Zip;
+- my $file = "$ENV{'LUCENE_CORE_JAR'}";
+- my $zip = Archive::Zip->new( $file );
+- my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
+- if ( $mf =~ m/Specification-Version: 2.*/ ) {
+- exit 0;
+- } else {
+- exit 1;
+- }'; then
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_ERROR([no, you need lucene 2])
+- fi
+-
+ else
+ AC_MSG_RESULT([internal])
+ SYSTEM_LUCENE=NO
+@@ -5195,6 +5186,24 @@
fi
AC_SUBST(SYSTEM_LPSOLVE)
@@ -56,7 +92,7 @@ diff -ru psprint_config.orig/prj/build.l
dnl ***************************************
dnl testing libc version for Linux...
dnl ***************************************
-@@ -6525,6 +6546,7 @@
+@@ -6575,6 +6584,7 @@
AC_MSG_CHECKING([whether to include AFMs])
if test "$with_afms" != "no"; then
AC_MSG_RESULT([yes])
workspace.gtk3.patch:
configure.in | 6
fpicker/source/office/iodlg.src | 5
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 95 -
fpicker/source/unx/gnome/SalGtkFilePicker.hxx | 6
fpicker/source/unx/gnome/resourceprovider.cxx | 3
fpicker/source/unx/gnome/resourceprovider.hxx | 1
source/appl/makefile.mk | 2
source/appl/shutdowniconunx.cxx | 22
source/eggtrayicon-impl.h | 2
source/eggtrayicon.c | 57
source/makefile.mk | 2
source/nsplugin/source/makefile.mk | 2
source/ooo/makefile.mk | 4
source/plugin/unx/npnapi.cxx | 5
source/plugin/util/makefile.pmk | 2
source/unx/gnome/SalGtkFilePicker.cxx | 6
source/unx/gnome/SalGtkPicker.cxx | 4
source/unx/gnome/makefile.mk | 6
svtools/inc/svtools/svtools.hrc | 1
unx/gtk/a11y/makefile.mk | 2
unx/gtk/app/gtkdata.cxx | 32
unx/gtk/app/makefile.mk | 2
unx/gtk/gdi/makefile.mk | 4
unx/gtk/gdi/salnativewidgets-gtk.cxx | 2190 +++++++++++++-------------
unx/gtk/window/gtkframe.cxx | 109 -
unx/gtk/window/gtkobject.cxx | 17
unx/gtk/window/makefile.mk | 2
unx/inc/plugins/gtk/gtkdata.hxx | 35
unx/inc/plugins/gtk/gtkframe.hxx | 2
unx/inc/plugins/gtk/gtkgdi.hxx | 16
unx/inc/plugins/gtk/gtkobject.hxx | 2
unx/inc/saldisp.hxx | 4
unx/source/app/saldisp.cxx | 15
unx/source/app/salsys.cxx | 2
util/makefile.mk | 4
35 files changed, 1489 insertions(+), 1180 deletions(-)
Index: workspace.gtk3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.gtk3.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- workspace.gtk3.patch 14 Jul 2010 13:06:51 -0000 1.9
+++ workspace.gtk3.patch 16 Jul 2010 13:37:40 -0000 1.10
@@ -1189,17 +1189,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
void SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); }
--- vcl.orig/unx/source/app/saldisp.cxx 2010-06-14 19:51:39.516798973 +0100
+++ vcl/unx/source/app/saldisp.cxx 2010-06-15 10:12:39.627798619 +0100
-@@ -62,9 +62,7 @@
-
- #ifdef USE_XINERAMA
- #ifdef USE_XINERAMA_XORG
--#if defined(X86) || defined(X86_64)
- #include <X11/extensions/Xinerama.h>
--#endif
- #elif defined USE_XINERAMA_XSUN
- #if defined(SOLARIS) && defined(INTEL) // missing extension header in standard installation
- #define MAXFRAMEBUFFERS 16
-@@ -2597,7 +2595,7 @@
+@@ -2592,7 +2592,7 @@
sal::static_int_cast< unsigned int >(GetVisual(m_nDefaultScreen).GetVisualId()) );
}
@@ -1208,7 +1198,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
{
// see if any frame buffers are at the same coordinates
// this can happen with weird configuration e.g. on
-@@ -2612,10 +2610,12 @@
+@@ -2607,10 +2607,12 @@
m_aXineramaScreens[n].GetHeight() < i_nHeight )
{
m_aXineramaScreens[n].SetSize( Size( i_nWidth, i_nHeight ) );
@@ -1221,12 +1211,10 @@ diff -ru fpicker.orig/source/unx/gnome/S
m_aXineramaScreens.push_back( Rectangle( Point( i_nX, i_nY ), Size( i_nWidth, i_nHeight ) ) );
}
-@@ -2641,16 +2641,16 @@
- if( result > 0 && nFramebuffers > 1 )
+@@ -2637,8 +2639,9 @@
{
m_bXinerama = true;
-- m_aXineramaScreens = std::vector<Rectangle>( nFramebuffers );
-+ m_aXineramaScreens = std::vector<Rectangle>();
+ m_aXineramaScreens = std::vector<Rectangle>();
+ m_aXineramaScreenIndexMap = std::vector<int>(nFramebuffers);
for( int i = 0; i < nFramebuffers; i++ )
- addXineramaScreenUnique( pFramebuffers[i].x,
@@ -1234,14 +1222,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
pFramebuffers[i].y,
pFramebuffers[i].width,
pFramebuffers[i].height );
- }
- }
- #elif defined(USE_XINERAMA_XORG)
--#if defined( X86 ) || defined( X86_64 )
- if( XineramaIsActive( pDisp_ ) )
- {
- int nFramebuffers = 1;
-@@ -2660,9 +2660,10 @@
+@@ -2654,9 +2657,10 @@
if( nFramebuffers > 1 )
{
m_aXineramaScreens = std::vector<Rectangle>();
@@ -1253,15 +1234,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
pScreens[i].y_org,
pScreens[i].width,
pScreens[i].height );
-@@ -2673,7 +2674,6 @@
- }
- }
- #endif
--#endif
- #if OSL_DEBUG_LEVEL > 1
- if( m_bXinerama )
- {
-@@ -2684,6 +2684,11 @@
+@@ -2677,6 +2681,11 @@
#endif // USE_XINERAMA
}
@@ -1735,30 +1708,6 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
else if ( (nType== CTRL_TOOLBAR) )
{
-@@ -892,11 +897,11 @@
- g_object_unref( pixmap );
- }
-
-- return( returnVal );
-+ return( returnVal );
- }
-
--BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
-- ControlPart nPart,
-+BOOL GtkSalGraphics::drawNativeMixedStateCheck( ControlType nType,
-+ ControlPart nPart,
- const Region& rControlRegion,
- ControlState nState,
- const ImplControlValue& aValue,
-@@ -909,7 +914,7 @@
- bNeedPixmapPaint = true;
-
- Rectangle aCtrlRect = rControlRegion.GetBoundRect();
-- BOOL returnVal = FALSE;
-+ BOOL returnVal = FALSE;
- SelectFont();
-
- // draw upper half in off state
@@ -961,7 +966,7 @@
const ImplControlValue&,
const OUString& )
@@ -1768,62 +1717,28 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
-@@ -987,7 +992,7 @@
- Region &rNativeBoundingRegion,
- Region &rNativeContentRegion )
- {
-- BOOL returnVal = FALSE;
-+ BOOL returnVal = FALSE;
-
- if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL)
- && (rControlRegion.GetBoundRect().GetWidth() > 16)
-@@ -1001,33 +1006,33 @@
+@@ -1001,7 +1006,7 @@
}
if ( (nType==CTRL_COMBOBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
{
-- rNativeBoundingRegion = NWGetComboBoxButtonRect( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(), nState,
-+ rNativeBoundingRegion = NWGetComboBoxEntryButtonRect( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(), nState,
+- rNativeBoundingRegion = NWGetComboBoxButtonRect( m_nScreen, nType, nPart, rControlRegion, nState,
++ rNativeBoundingRegion = NWGetComboBoxEntryButtonRect( m_nScreen, nType, nPart, rControlRegion, nState,
aValue, rCaption );
rNativeContentRegion = rNativeBoundingRegion;
- returnVal = TRUE;
+@@ -1018,7 +1023,7 @@
}
-- if ( (nType==CTRL_SPINBOX) && ((nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
-+ if ( (nType==CTRL_LISTBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
+ if ( (nType==CTRL_LISTBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
{
--
-- rNativeBoundingRegion = NWGetSpinButtonRect( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(), nState,
-+ rNativeBoundingRegion = NWGetComboBoxButtonRect( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(), nState,
+- rNativeBoundingRegion = NWGetListBoxButtonRect( m_nScreen, nType, nPart, rControlRegion, nState,
++ rNativeBoundingRegion = NWGetComboBoxButtonRect( m_nScreen, nType, nPart, rControlRegion, nState,
aValue, rCaption );
rNativeContentRegion = rNativeBoundingRegion;
- returnVal = TRUE;
- }
-- if ( (nType==CTRL_LISTBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
-+ if ( (nType==CTRL_SPINBOX) && ((nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) )
- {
-- rNativeBoundingRegion = NWGetListBoxButtonRect( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(), nState,
-+
-+ rNativeBoundingRegion = NWGetSpinButtonRect( m_nScreen, nType, nPart, rControlRegion.GetBoundRect(), nState,
- aValue, rCaption );
- rNativeContentRegion = rNativeBoundingRegion;
-
- returnVal = TRUE;
- }
- if ( (nType==CTRL_TOOLBAR) &&
-- ((nPart==PART_DRAW_BACKGROUND_HORZ) ||
-- (nPart==PART_DRAW_BACKGROUND_VERT) ||
-- (nPart==PART_THUMB_HORZ) ||
-+ ((nPart==PART_DRAW_BACKGROUND_HORZ) ||
-+ (nPart==PART_DRAW_BACKGROUND_VERT) ||
-+ (nPart==PART_THUMB_HORZ) ||
- (nPart==PART_THUMB_VERT) ||
- (nPart==PART_BUTTON)
- ))
@@ -1102,8 +1107,12 @@
GtkRequisition aReq;
gtk_widget_size_request( widget, &aReq );
- Rectangle aEditRect = rControlRegion.GetBoundRect();
+ Rectangle aEditRect = rControlRegion;
- aEditRect = Rectangle( aEditRect.TopLeft(),
- Size( aEditRect.GetWidth(), aReq.height+1 ) );
+ //Don't grow past space available
@@ -1832,7 +1747,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
+ aEditRect = Rectangle( aEditRect.TopLeft(),
+ Size( aEditRect.GetWidth(), aReq.height+1 ) );
+ }
- rNativeBoundingRegion = Region( aEditRect );
+ rNativeBoundingRegion = aEditRect;
rNativeContentRegion = rNativeBoundingRegion;
returnVal = TRUE;
@@ -1133,7 +1142,7 @@
@@ -2236,69 +2151,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
rButton.Left() + ( rButton.GetWidth() - rArrow.GetWidth() ) / 2,
rButton.Top() + ( rButton.GetHeight() - rArrow.GetHeight() ) / 2
) );
-@@ -1432,34 +1441,34 @@
- const ImplControlValue& aValue,
- const OUString& )
- {
-- ScrollbarValue* pScrollbarVal = (ScrollbarValue *)(aValue.getOptionalVal());
-+ ScrollbarValue* pScrollbarVal = (ScrollbarValue *)(aValue.getOptionalVal());
- GdkPixmap* pixmap = NULL;
-- Rectangle pixmapRect, scrollbarRect;
-- GtkStateType stateType;
-- GtkShadowType shadowType;
-- GtkScrollbar * scrollbarWidget;
-- GtkStyle * style;
-- GtkAdjustment* scrollbarValues = NULL;
-- GtkOrientation scrollbarOrientation;
-- Rectangle thumbRect = pScrollbarVal->maThumbRect;
-- Rectangle button11BoundRect = pScrollbarVal->maButton1Rect; // backward
-- Rectangle button22BoundRect = pScrollbarVal->maButton2Rect; // forward
-- Rectangle button12BoundRect = pScrollbarVal->maButton1Rect; // secondary forward
-- Rectangle button21BoundRect = pScrollbarVal->maButton2Rect; // secondary backward
-- GtkArrowType button1Type; // backward
-- GtkArrowType button2Type; // forward
-- gchar * scrollbarTagH = (gchar *) "hscrollbar";
-- gchar * scrollbarTagV = (gchar *) "vscrollbar";
-- gchar * scrollbarTag = NULL;
-- Rectangle arrowRect;
-- gint slider_width = 0;
-- gint stepper_size = 0;
-- gint stepper_spacing = 0;
-- gint trough_border = 0;
-- gint min_slider_length = 0;
-- gint vShim = 0;
-- gint hShim = 0;
-- gint x,y,w,h;
-+ Rectangle pixmapRect, scrollbarRect;
-+ GtkStateType stateType;
-+ GtkShadowType shadowType;
-+ GtkScrollbar * scrollbarWidget;
-+ GtkStyle * style;
-+ GtkAdjustment* scrollbarValues = NULL;
-+ GtkOrientation scrollbarOrientation;
-+ Rectangle thumbRect = pScrollbarVal->maThumbRect;
-+ Rectangle button11BoundRect = pScrollbarVal->maButton1Rect; // backward
-+ Rectangle button22BoundRect = pScrollbarVal->maButton2Rect; // forward
-+ Rectangle button12BoundRect = pScrollbarVal->maButton1Rect; // secondary forward
-+ Rectangle button21BoundRect = pScrollbarVal->maButton2Rect; // secondary backward
-+ GtkArrowType button1Type; // backward
-+ GtkArrowType button2Type; // forward
-+ gchar * scrollbarTagH = (gchar *) "hscrollbar";
-+ gchar * scrollbarTagV = (gchar *) "vscrollbar";
-+ gchar * scrollbarTag = NULL;
-+ Rectangle arrowRect;
-+ gint slider_width = 0;
-+ gint stepper_size = 0;
-+ gint stepper_spacing = 0;
-+ gint trough_border = 0;
-+ gint min_slider_length = 0;
-+ gint vShim = 0;
-+ gint hShim = 0;
-+ gint x,y,w,h;
-
- // make controlvalue rectangles relative to area
- thumbRect.Move( -rControlRectangle.Left(), -rControlRectangle.Top() );
-@@ -1468,54 +1477,54 @@
+@@ -1469,54 +1478,54 @@
button12BoundRect.Move( -rControlRectangle.Left(), -rControlRectangle.Top() );
button21BoundRect.Move( -rControlRectangle.Left(), -rControlRectangle.Top() );
@@ -2383,7 +2236,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
if ( has_backward )
{
-@@ -1540,33 +1549,33 @@
+@@ -1541,33 +1550,33 @@
button21BoundRect.SetSize( Size( stepper_size, slider_width ) );
button22BoundRect.SetSize( Size( stepper_size, slider_width ) );
@@ -2438,7 +2291,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
if ( has_backward )
{
-@@ -1575,7 +1584,7 @@
+@@ -1576,7 +1585,7 @@
}
button11BoundRect.Move( (scrollbarRect.GetWidth() - slider_width) / 2, trough_border );
button11BoundRect.SetSize( Size( slider_width, stepper_size ) );
@@ -2447,7 +2300,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
if ( has_backward2 )
{
-@@ -1590,41 +1599,41 @@
+@@ -1591,41 +1600,41 @@
button21BoundRect.SetSize( Size( slider_width, stepper_size ) );
button22BoundRect.SetSize( Size( slider_width, stepper_size ) );
@@ -2517,7 +2370,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
// as multiple paints are required for the scrollbar
// painting them directly to the window flickers
-@@ -1639,81 +1648,81 @@
+@@ -1640,81 +1649,81 @@
GdkDrawable* const &gdkDrawable = GDK_DRAWABLE( pixmap );
GdkRectangle* gdkRect = NULL;
@@ -2629,7 +2482,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, TRUE,
x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
-@@ -1722,13 +1731,13 @@
+@@ -1723,13 +1732,13 @@
if ( has_forward )
{
NWConvertVCLStateToGTKState( pScrollbarVal->mnButton2State, &stateType, &shadowType );
@@ -2646,7 +2499,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
gtk_paint_arrow( style, gdkDrawable, stateType, shadowType,
gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, TRUE,
x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(),
-@@ -1742,12 +1751,12 @@
+@@ -1743,12 +1752,12 @@
}
g_object_unref( pixmap );
@@ -2661,7 +2514,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
{
gint slider_width;
gint stepper_size;
-@@ -1756,26 +1765,26 @@
+@@ -1757,26 +1766,26 @@
NWEnsureGTKScrollbars( nScreen );
@@ -2700,7 +2553,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
gint nFirst = 0;
gint nSecond = 0;
-@@ -1825,7 +1834,7 @@
+@@ -1826,7 +1835,7 @@
buttonRect.SetSize( Size( buttonWidth, buttonHeight ) );
@@ -2709,7 +2562,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
//-------------------------------------
-@@ -1838,7 +1847,7 @@
+@@ -1839,7 +1848,7 @@
const ImplControlValue& aValue,
const OUString& rCaption )
{
@@ -2718,7 +2571,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
GdkRectangle clipRect;
// Find the overall bounding rect of the buttons's drawing area,
-@@ -1855,7 +1864,7 @@
+@@ -1856,7 +1865,7 @@
NWPaintOneEditBox( m_nScreen, gdkDrawable, &clipRect, nType, nPart, pixmapRect, nState, aValue, rCaption );
}
@@ -2727,7 +2580,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
-@@ -1865,31 +1874,31 @@
+@@ -1866,31 +1875,31 @@
*/
static Rectangle NWGetEditBoxPixmapRect(int nScreen,
ControlType,
@@ -2775,7 +2628,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
-@@ -1897,67 +1906,66 @@
+@@ -1898,67 +1907,66 @@
* All coordinates should be local to the Pixmap, NOT
* screen/window coordinates.
*/
@@ -2878,74 +2731,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
gdkRect, widget, "entry",
aEditBoxRect.Left(), aEditBoxRect.Top(),
aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() );
-@@ -1975,38 +1983,38 @@
- const ImplControlValue& aValue,
- const OUString& rCaption )
- {
-- GdkPixmap * pixmap;
-- Rectangle pixmapRect;
-- GtkStateType stateType;
-- GtkShadowType shadowType;
-- SpinbuttonValue * pSpinVal = (SpinbuttonValue *)(aValue.getOptionalVal());
-- Rectangle upBtnRect;
-- ControlPart upBtnPart = PART_BUTTON_UP;
-- ControlState upBtnState = CTRL_STATE_ENABLED;
-- Rectangle downBtnRect;
-- ControlPart downBtnPart = PART_BUTTON_DOWN;
-- ControlState downBtnState = CTRL_STATE_ENABLED;
--
-- NWEnsureGTKButton( m_nScreen );
-- NWEnsureGTKSpinButton( m_nScreen );
-- NWEnsureGTKArrow( m_nScreen );
-+ GdkPixmap * pixmap;
-+ Rectangle pixmapRect;
-+ GtkStateType stateType;
-+ GtkShadowType shadowType;
-+ SpinbuttonValue * pSpinVal = (SpinbuttonValue *)(aValue.getOptionalVal());
-+ Rectangle upBtnRect;
-+ ControlPart upBtnPart = PART_BUTTON_UP;
-+ ControlState upBtnState = CTRL_STATE_ENABLED;
-+ Rectangle downBtnRect;
-+ ControlPart downBtnPart = PART_BUTTON_DOWN;
-+ ControlState downBtnState = CTRL_STATE_ENABLED;
-
-- NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
-+ NWEnsureGTKButton( m_nScreen );
-+ NWEnsureGTKSpinButton( m_nScreen );
-+ NWEnsureGTKArrow( m_nScreen );
-
-- if ( pSpinVal )
-- {
-- upBtnPart = pSpinVal->mnUpperPart;
-- upBtnState = pSpinVal->mnUpperState;
-+ NWConvertVCLStateToGTKState( nState, &stateType, &shadowType );
-
-- downBtnPart = pSpinVal->mnLowerPart;
-- downBtnState = pSpinVal->mnLowerState;
-- }
-+ if ( pSpinVal )
-+ {
-+ upBtnPart = pSpinVal->mnUpperPart;
-+ upBtnState = pSpinVal->mnUpperState;
-
-- // CTRL_SPINBUTTONS pass their area in pSpinVal, not in rControlRectangle
-- if ( nType == CTRL_SPINBUTTONS )
-- {
-- if ( !pSpinVal )
-- {
-+ downBtnPart = pSpinVal->mnLowerPart;
-+ downBtnState = pSpinVal->mnLowerState;
-+ }
-+
-+ // CTRL_SPINBUTTONS pass their area in pSpinVal, not in rControlRectangle
-+ if ( nType == CTRL_SPINBUTTONS )
-+ {
-+ if ( !pSpinVal )
-+ {
- std::fprintf( stderr, "Tried to draw CTRL_SPINBUTTONS, but the SpinButtons data structure didn't exist!\n" );
- return( false );
- }
-@@ -2066,33 +2074,33 @@
+@@ -2067,33 +2075,33 @@
static Rectangle NWGetSpinButtonRect( int nScreen,
ControlType,
@@ -2999,7 +2785,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
else
{
buttonRect.Right() = buttonRect.Left()-1;
-@@ -2101,7 +2109,7 @@
+@@ -2102,7 +2110,7 @@
buttonRect.Bottom() = aAreaRect.Bottom();
}
@@ -3008,7 +2794,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
//---
-@@ -2135,22 +2143,24 @@
+@@ -2136,22 +2144,24 @@
arrowSize = (buttonRect.GetWidth() - (2 * gWidgetData[nScreen].gSpinButtonWidget->style->xthickness)) - 4;
arrowSize -= arrowSize % 2 - 1; /* force odd */
arrowRect.SetSize( Size( arrowSize, arrowSize ) );
@@ -3043,7 +2829,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
-@@ -2158,40 +2168,37 @@
+@@ -2159,40 +2169,37 @@
const ImplControlValue& aValue,
const OUString& rCaption )
{
@@ -3106,7 +2892,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
buttonRect.Top() + (gint)((buttonRect.GetHeight() - arrowRect.GetHeight()) / 2) ) );
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
-@@ -2211,48 +2218,163 @@
+@@ -2212,48 +2219,163 @@
x+(buttonRect.Left() - pixmapRect.Left()),
y+(buttonRect.Top() - pixmapRect.Top()),
buttonRect.GetWidth(), buttonRect.GetHeight() );
@@ -3290,7 +3076,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
if( nPart == PART_BUTTON_DOWN )
{
aButtonRect.SetSize( Size( nButtonWidth, aAreaRect.GetHeight() ) );
-@@ -2261,13 +2383,75 @@
+@@ -2262,13 +2384,11 @@
}
else if( nPart == PART_SUB_EDIT )
{
@@ -3298,21 +3084,24 @@ diff -ru fpicker.orig/source/unx/gnome/S
-
- gint adjust_x = GTK_CONTAINER(gWidgetData[nScreen].gComboWidget)->border_width +
+ gint adjust_x = GTK_CONTAINER(gWidgetData[nScreen].gComboBoxEntryWidget)->border_width +
-+ nFocusWidth +
-+ nFocusPad;
+ nFocusWidth +
+ nFocusPad;
+- gint adjust_y = adjust_x + gWidgetData[nScreen].gComboWidget->style->ythickness;
+- adjust_x += gWidgetData[nScreen].gComboWidget->style->xthickness;
+ gint adjust_y = adjust_x + gWidgetData[nScreen].gComboBoxEntryWidget->style->ythickness;
+ adjust_x += gWidgetData[nScreen].gComboBoxEntryWidget->style->xthickness;
-+ aButtonRect.SetSize( Size( aAreaRect.GetWidth() - nButtonWidth - 2 * adjust_x,
-+ aAreaRect.GetHeight() - 2 * adjust_y ) );
-+ Point aEditPos = aAreaRect.TopLeft();
-+ aEditPos.X() += adjust_x;
-+ aEditPos.Y() += adjust_y;
-+ aButtonRect.SetPos( aEditPos );
-+ }
-+
+ 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 );
-+}
-+
+ }
+
+-//-------------------------------------
+static Rectangle NWGetComboBoxButtonRect( int nScreen,
+ ControlType,
+ ControlPart nPart,
@@ -3326,9 +3115,24 @@ diff -ru fpicker.orig/source/unx/gnome/S
+ gint nButtonWidth;
+ gint nFocusWidth;
+ gint nFocusPad;
-+
+
+ NWEnsureGTKComboBox ( nScreen );
-+
+
+-
+-BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
+- const Rectangle& rControlRectangle,
+- const clipList&,
+- ControlState nState,
+- const ImplControlValue& aValue,
+- const OUString& )
+-{
+- OSL_ASSERT( 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,
@@ -3362,47 +3166,44 @@ diff -ru fpicker.orig/source/unx/gnome/S
+ else if( nPart == PART_SUB_EDIT )
+ {
+ gint adjust_x = GTK_CONTAINER(gWidgetData[nScreen].gComboBoxWidget)->border_width +
- nFocusWidth +
- nFocusPad;
-- gint adjust_y = adjust_x + gWidgetData[nScreen].gComboWidget->style->ythickness;
-- adjust_x += gWidgetData[nScreen].gComboWidget->style->xthickness;
++ nFocusWidth +
++ nFocusPad;
+ gint adjust_y = adjust_x + gWidgetData[nScreen].gComboBoxWidget->style->ythickness;
+ adjust_x += gWidgetData[nScreen].gComboBoxWidget->style->xthickness;
- aButtonRect.SetSize( Size( aAreaRect.GetWidth() - nButtonWidth - 2 * adjust_x,
- aAreaRect.GetHeight() - 2 * adjust_y ) );
- Point aEditPos = aAreaRect.TopLeft();
-@@ -2276,9 +2460,10 @@
- aButtonRect.SetPos( aEditPos );
- }
-
-- return( aButtonRect );
++ aButtonRect.SetSize( Size( aAreaRect.GetWidth() - nButtonWidth - 2 * adjust_x,
++ aAreaRect.GetHeight() - 2 * adjust_y ) );
++ Point aEditPos = aAreaRect.TopLeft();
++ aEditPos.X() += adjust_x;
++ aEditPos.Y() += adjust_y;
++ aButtonRect.SetPos( aEditPos );
++ }
++
+ return( aButtonRect );
- }
-
++}
+
- //-------------------------------------
-
-
-@@ -2290,12 +2475,12 @@
- const ImplControlValue& aValue,
- const OUString& )
- {
-- GdkPixmap * pixmap;
-- Rectangle pixmapRect;
-- Rectangle tabRect;
-- TabitemValue * pTabitemValue = (TabitemValue *)(aValue.getOptionalVal());
-- GtkStateType stateType;
-- GtkShadowType shadowType;
-+ GdkPixmap * pixmap;
-+ Rectangle pixmapRect;
-+ Rectangle tabRect;
-+ TabitemValue * pTabitemValue = (TabitemValue *)(aValue.getOptionalVal());
-+ GtkStateType stateType;
-+ GtkShadowType shadowType;
++
++//-------------------------------------
++
++
++
++BOOL GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
++ const Rectangle& rControlRectangle,
++ const clipList&,
++ ControlState nState,
++ const ImplControlValue& aValue,
++ const OUString& )
++{
++ OSL_ASSERT( aValue.getType() == CTRL_TAB_ITEM );
++ GdkPixmap * pixmap;
++ Rectangle pixmapRect;
++ Rectangle tabRect;
++ const TabitemValue * pTabitemValue = static_cast<const TabitemValue *>(&aValue);
++ GtkStateType stateType;
++ GtkShadowType shadowType;
if( ! gWidgetData[ m_nScreen ].gCacheTabItems )
{
gWidgetData[ m_nScreen ].gCacheTabItems = new NWPixmapCache( m_nScreen );
-@@ -2309,48 +2494,48 @@
+@@ -2311,48 +2496,48 @@
if( !aCachePage.GetSize() )
aCachePage.SetSize( 1 );
@@ -3485,7 +3286,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
if( nType == CTRL_TAB_ITEM )
{
-@@ -2364,7 +2549,7 @@
+@@ -2366,7 +2551,7 @@
}
@@ -3494,7 +3295,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
pixmap = gdk_pixmap_new( NULL, pixmapRect.GetWidth(), pixmapRect.GetHeight(),
GetX11SalData()->GetDisplay()->GetVisual( m_nScreen ).GetDepth() );
-@@ -2374,42 +2559,42 @@
+@@ -2376,42 +2561,42 @@
paintRect.height = pixmapRect.GetHeight();
gtk_paint_flat_box( m_pWindow->style, pixmap, GTK_STATE_NORMAL,
@@ -3568,7 +3369,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
// cache data
if( nType == CTRL_TAB_ITEM )
-@@ -2417,152 +2602,65 @@
+@@ -2419,152 +2604,65 @@
else
aCachePage.Fill( nType, nState, pixmapRect, pixmap );
@@ -3744,7 +3545,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
GTK_WIDGET_UNSET_FLAGS( gWidgetData[m_nScreen].gHandleBoxWidget, GTK_SENSITIVE );
if ( nState & CTRL_STATE_ENABLED )
-@@ -2586,7 +2684,7 @@
+@@ -2588,7 +2686,7 @@
bPaintButton =
(GTK_BUTTON(pButtonWidget)->relief != GTK_RELIEF_NONE)
|| (nState & CTRL_STATE_PRESSED)
@@ -3753,7 +3554,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
if( aValue.getTristateVal() == BUTTONVALUE_ON )
{
pButtonWidget = gWidgetData[m_nScreen].gToolbarToggleWidget;
-@@ -2660,7 +2758,7 @@
+@@ -2662,7 +2760,7 @@
}
}
@@ -3762,7 +3563,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
//----
-@@ -2668,24 +2766,24 @@
+@@ -2670,24 +2768,24 @@
BOOL GtkSalGraphics::NWPaintGTKMenubar(
GdkDrawable* gdkDrawable,
ControlType, ControlPart nPart,
@@ -3797,7 +3598,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
if( nPart == PART_MENU_ITEM )
{
-@@ -2747,13 +2845,13 @@
+@@ -2749,13 +2847,13 @@
}
}
@@ -3813,7 +3614,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
const clipList& rClipList,
ControlState nState, const ImplControlValue&,
const OUString& )
-@@ -2763,19 +2861,19 @@
+@@ -2765,19 +2863,19 @@
if( nPart == PART_MENU_ITEM && ! (nState & CTRL_STATE_ENABLED) )
return FALSE;
@@ -3842,7 +3643,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
if( nPart == PART_MENU_ITEM &&
( nState & (CTRL_STATE_SELECTED|CTRL_STATE_ROLLOVER) ) )
-@@ -2877,26 +2975,26 @@
+@@ -2879,26 +2977,26 @@
}
}
@@ -3876,7 +3677,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it )
{
-@@ -2915,13 +3013,13 @@
+@@ -2917,13 +3015,13 @@
x, y, w, h );
}
@@ -3892,7 +3693,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
const clipList&,
ControlState nState, const ImplControlValue& rValue,
const OUString& )
-@@ -2933,13 +3031,13 @@
+@@ -2935,13 +3033,13 @@
aRect.Right() += 2;
aRect.Top() -= 2;
aRect.Bottom() += 2;
@@ -3913,7 +3714,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
ButtonValue aButtonValue = rValue.getTristateVal();
GtkExpanderStyle eStyle = GTK_EXPANDER_EXPANDED;
-@@ -2966,25 +3064,25 @@
+@@ -2968,25 +3066,25 @@
w/2, h/2,
eStyle );
@@ -3945,39 +3746,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
long nProgressWidth = rValue.getNumericVal();
-@@ -3030,25 +3128,25 @@
- }
- }
-
-- BOOL bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle );
-+ BOOL bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle );
- g_object_unref( pixmap );
-
-- return bRet;
-+ return bRet;
- }
-
- BOOL GtkSalGraphics::NWPaintGTKSlider(
- GdkDrawable*,
- ControlType, ControlPart nPart,
-- const Rectangle& rControlRectangle,
-+ const Rectangle& rControlRectangle,
- const clipList&,
- ControlState nState, const ImplControlValue& rValue,
- const OUString& )
- {
- NWEnsureGTKSlider( m_nScreen );
-
-- gint w, h;
-- w = rControlRectangle.GetWidth();
-- h = rControlRectangle.GetHeight();
-+ gint w, h;
-+ w = rControlRectangle.GetWidth();
-+ h = rControlRectangle.GetHeight();
-
- SliderValue* pVal = (SliderValue*)rValue.getOptionalVal();
-
-@@ -3157,120 +3255,10 @@
+@@ -3158,120 +3256,10 @@
}
#endif
@@ -4100,7 +3869,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
static Rectangle NWGetToolbarRect( int nScreen,
-@@ -3476,7 +3464,7 @@
+@@ -3477,7 +3465,7 @@
// make the "light" color lighter than the menu color and the "shadow"
// color darker than it.
if ( aStyleSet.GetMenuColor().GetLuminance() >= 32 &&
@@ -4109,7 +3878,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
{
Color temp = aStyleSet.GetMenuColor();
temp.IncreaseLuminance( 8 );
-@@ -3494,10 +3482,10 @@
+@@ -3495,10 +3483,10 @@
aStyleSet.SetMenuHighlightTextColor( aHighlightTextColor );
// UI font
@@ -4124,7 +3893,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
PangoStretch eStretch = pango_font_description_get_stretch( pStyle->font_desc );
psp::FastPrintFontInfo aInfo;
-@@ -3506,9 +3494,9 @@
+@@ -3507,9 +3495,9 @@
// set italic
switch( eStyle )
{
@@ -4137,7 +3906,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
// set weight
if( eWeight <= PANGO_WEIGHT_ULTRALIGHT )
-@@ -3524,15 +3512,15 @@
+@@ -3525,15 +3513,15 @@
// set width
switch( eStretch )
{
@@ -4162,7 +3931,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
#if OSL_DEBUG_LEVEL > 1
-@@ -3626,18 +3614,18 @@
+@@ -3627,18 +3615,18 @@
g_free( pIconThemeName );
// FIXME: need some way of fetching toolbar icon size.
@@ -4185,7 +3954,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
aStyleSet.SetCairoFontOptions( pNewOptions );
-@@ -3697,8 +3685,8 @@
+@@ -3698,8 +3686,8 @@
GdkPixmap* GtkSalGraphics::NWGetPixmapFromScreen( Rectangle srcRect )
{
// Create a new pixmap to hold the composite of the window background and the control
@@ -4196,7 +3965,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
if( !pPixmap || !pPixmapGC )
{
-@@ -3759,29 +3747,29 @@
+@@ -3760,29 +3748,29 @@
* State conversion
************************************************************************/
static void NWConvertVCLStateToGTKState( ControlState nVCLState,
@@ -4247,7 +4016,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
/************************************************************************
-@@ -3789,19 +3777,19 @@
+@@ -3790,19 +3778,19 @@
************************************************************************/
static void NWSetWidgetState( GtkWidget* widget, ControlState nState, GtkStateType nGtkState )
{
@@ -4280,7 +4049,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
/************************************************************************
-@@ -3813,179 +3801,279 @@
+@@ -3814,179 +3802,279 @@
static void NWAddWidgetToCacheWindow( GtkWidget* widget, int nScreen )
{
NWFWidgetData& rData = gWidgetData[nScreen];
@@ -4536,8 +4305,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
+
+ gtk_container_forall(GTK_CONTAINER(gWidgetData[nScreen].gComboBoxEntryWidget),
+ get_combo_box_entry_inner_widgets, GINT_TO_POINTER(nScreen) );
-
--static void NWEnsureGTKCombo( int nScreen )
++
+ //If for some reason or other we couldn't find the expected children,
+ //alias them to some we know will definitely exist
+ if (!gWidgetData[nScreen].gComboBoxEntry_EntryWidget)
@@ -4569,7 +4337,8 @@ diff -ru fpicker.orig/source/unx/gnome/S
+ }
+ }
+}
-+
+
+-static void NWEnsureGTKCombo( int nScreen )
+static void get_combo_box_inner_widgets(GtkWidget *widget, gpointer client_data)
{
- if ( !gWidgetData[nScreen].gComboWidget )
@@ -4657,7 +4426,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
//-------------------------------------
-@@ -4002,7 +4090,7 @@
+@@ -4003,7 +4091,7 @@
GtkReliefStyle aRelief = GTK_RELIEF_NORMAL;
gtk_widget_ensure_style( gWidgetData[nScreen].gToolbarWidget );
gtk_widget_style_get( gWidgetData[nScreen].gToolbarWidget,
@@ -4666,7 +4435,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
(char *)NULL);
gtk_button_set_relief( GTK_BUTTON(gWidgetData[nScreen].gToolbarButtonWidget), aRelief );
-@@ -4101,7 +4189,7 @@
+@@ -4102,7 +4190,7 @@
if( !gWidgetData[nScreen].gProgressBar )
{
gWidgetData[nScreen].gProgressBar = gtk_progress_bar_new ();
@@ -4675,7 +4444,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
}
-@@ -4110,7 +4198,7 @@
+@@ -4111,7 +4199,7 @@
if( !gWidgetData[nScreen].gTreeView )
{
gWidgetData[nScreen].gTreeView = gtk_tree_view_new ();
@@ -4684,7 +4453,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
}
-@@ -4119,11 +4207,13 @@
+@@ -4120,11 +4208,13 @@
if( !gWidgetData[nScreen].gHScale )
{
gWidgetData[nScreen].gHScale = gtk_hscale_new_with_range(0, 10, 1);
- Previous message: File id3v2-0.1.12-fedora.tar.gz uploaded to lookaside cache by ndim
- Next message: rpms/id3v2/devel id3v2-fix-release-tarball.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 id3v2.spec, 1.15, 1.16 sources, 1.3, 1.4 id3v2-0.1.11-track-bad-free.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list