osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix themeing for GTK+ 2.8. This hasn't been tested under 2.6 or 2.4. 

svn path=/trunk/; revision=16810
This commit is contained in:
Gerald Combs 2005-12-15 19:12:51 +00:00
parent 0616a4bedb
commit 7463a0e9fb
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.nmake
View File

@ -95,6 +95,7 @@ PANGO_INST_VERSION=1.10
# defined.
#
GTK_WIMP_DIR=$(ETHEREAL_LIBS)\gtk-wimp
GTK_THEME_DIR=$(GTK_WIMP_DIR)\Theme
#
# If you have Zlib, set this to the pathname of the directory in
@ -300,6 +301,8 @@ GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
GTK2_LIB_DIR=2.4.0
NEED_LIBPNG_DLL=USE
NEED_CAIRO_DLL=USE
GTK_WIMP_DIR=$(GTK2_DIR)\lib\gtk-2.0\$(GTK2_LIB_DIR)\engines
GTK_THEME_DIR=$(GTK2_DIR)\share\themes\MS-Windows\gtk-2.0
!ELSEIF "$(GTK2_INST_VERSION)" == "2.6"
GTK2_LIB_DIR=2.4.0
!ELSEIF "$(GTK2_INST_VERSION)" == "2.4"

1
packaging/nsis/Makefile.nmake
View File

@ -127,6 +127,7 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake
!ENDIF
!IFDEF GTK_WIMP_DIR
/DGTK_WIMP_DIR=$(GTK_WIMP_DIR) \
/DGTK_THEME_DIR=$(GTK_THEME_DIR) \
!ENDIF
/DGLIB_DIR=$(GLIB_DIR) \
/DICONV_DIR=$(ICONV_DIR) \

6
packaging/nsis/ethereal.nsi
View File

@ -644,8 +644,12 @@ Section "GTK-Wimp" SecGTKWimp
SectionIn 1
SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\engines
File "${GTK_WIMP_DIR}\libwimp.dll"
; GTK+ 2.8 looks for themes in "etc". We should really pick one
; directory and install there.
SetOutPath $INSTDIR\share\themes\Default\gtk-2.0
File "${GTK_WIMP_DIR}\Theme\gtk-2.0\gtkrc"
File "${GTK_THEME_DIR}\gtkrc"
SetOutPath $INSTDIR\etc\gtk-2.0
File "${GTK_THEME_DIR}\gtkrc"
SectionEnd
!endif
!endif