Import GTK# 2.12 for Windows. We can now build a Win32 The Pimp package

on Linux.

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@2940 92316355-f0b4-4df1-b90c-862c8a59935f

ThePimp/MainWindow.cs

@@ -98,5 +98,9 @@ namespace ThePimp
         {
             new AboutWindow();
         }
+
+        protected virtual void OnSaveActionActivated (object sender, System.EventArgs e)
+        {
+        }
     }
 }

ThePimp/Makefile.am

@@ -41,7 +41,8 @@ pimp_flags = \
 	-r:$(top_srcdir)/win32/assembly/atk-sharp.dll \
 	-r:$(top_srcdir)/win32/assembly/gdk-sharp.dll \
 	-r:$(top_srcdir)/win32/assembly/gtk-sharp.dll \
-	-r:$(top_srcdir)/win32/assembly/glib-sharp.dll
+	-r:$(top_srcdir)/win32/assembly/glib-sharp.dll \
+	-r:Mono.Posix
 endif
 
 EXTRA_DIST = $(pimp_sources) $(pimp_resources) $(image_sources)
@@ -50,11 +51,11 @@ ThePimp.exe: ../pipi-sharp/pipi-sharp.dll $(pimp_sources) $(pimp_resources)
 	cp ../pipi-sharp/pipi-sharp.dll .
 	cp ../pipi-sharp/pipi-sharp.dll.config .
 	cp ../pipi-sharp/pipi-sharp.dll.mdb .
-	$(GMCS) -debug -codepage:utf8 -out:$@ $(pimp_flags) -lib:./ \
+	$(GMCS) -debug -codepage:utf8 -target:winexe -out:$@ $(pimp_flags) \
+	-lib:./ -r:pipi-sharp.dll \
 	  $(addprefix $(srcdir)/, $(pimp_sources)) \
 	  $(foreach x, $(pimp_resources), \
-	               -resource:$(srcdir)/$x,ThePimp.$(subst /,.,$x)) \
-	  -r:pipi-sharp.dll
+	               -resource:$(srcdir)/$x,ThePimp.$(subst /,.,$x))
 
 clean-local:
 	rm -f pipi-sharp.dll.config

ThePimp/ThePimp.mdp

@@ -8,7 +8,7 @@
         <Command type="AfterClean" command="rm -f ${TargetDir}/pipi-sharp.dll.mdb" />
       </CustomCommands>
       <Output directory="." assemblyKeyFile="." assembly="ThePimp" />
-      <Build debugmode="True" target="Exe" />
+      <Build debugmode="True" target="WinExe" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" definesymbols="DEBUG" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
     </Configuration>
@@ -20,7 +20,7 @@
         <Command type="AfterClean" command="rm -f ${TargetDir}/pipi-sharp.dll.mdb" />
       </CustomCommands>
       <Output directory="." assemblyKeyFile="." assembly="ThePimp" />
-      <Build debugmode="False" target="Exe" />
+      <Build debugmode="False" target="WinExe" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
     </Configuration>
@@ -60,7 +60,7 @@
     <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.10.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </References>
-  <Deployment.LinuxDeployData />
+  <Deployment.LinuxDeployData scriptName="pimp" />
   <GtkDesignInfo isWidgetLibrary="True" gtkVersion="2.10.3">
     <ExportedWidgets>
       <Widget>ThePimp.PictureView</Widget>

ThePimp/gtk-gui/ThePimp.MainWindow.cs

@@ -269,7 +269,11 @@ namespace ThePimp {
             this.DeleteEvent += new Gtk.DeleteEventHandler(this.OnDeleteEvent);
             this.newAction.Activated += new System.EventHandler(this.OnNewActionActivated);
             this.openAction.Activated += new System.EventHandler(this.OnOpenActionActivated);
+            this.saveAction.Activated += new System.EventHandler(this.OnSaveActionActivated);
+            this.NewAction.Activated += new System.EventHandler(this.OnNewActionActivated);
             this.OpenAction.Activated += new System.EventHandler(this.OnOpenActionActivated);
+            this.SaveAction.Activated += new System.EventHandler(this.OnSaveActionActivated);
+            this.SaveAsAction.Activated += new System.EventHandler(this.OnSaveAsActionActivated);
             this.QuitAction.Activated += new System.EventHandler(this.OnQuitActionActivated);
             this.AboutAction.Activated += new System.EventHandler(this.OnAboutActionActivated);
             this.saveAsAction.Activated += new System.EventHandler(this.OnSaveAsActionActivated);

ThePimp/gtk-gui/gui.stetic

@@ -26,6 +26,7 @@
         <property name="Label" translatable="yes" />
         <property name="Sensitive">False</property>
         <property name="StockId">gtk-save</property>
+        <signal name="Activated" handler="OnSaveActionActivated" />
       </action>
       <action id="FileAction">
         <property name="Type">Action</property>
@@ -52,6 +53,7 @@
         <property name="Label" translatable="yes">_New</property>
         <property name="ShortLabel" translatable="yes">_New</property>
         <property name="StockId">gtk-new</property>
+        <signal name="Activated" handler="OnNewActionActivated" />
       </action>
       <action id="OpenAction">
         <property name="Type">Action</property>
@@ -66,12 +68,14 @@
         <property name="Sensitive">False</property>
         <property name="ShortLabel" translatable="yes">_Save</property>
         <property name="StockId">gtk-save</property>
+        <signal name="Activated" handler="OnSaveActionActivated" />
       </action>
       <action id="SaveAsAction">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">Save _As</property>
         <property name="ShortLabel" translatable="yes">Save _As</property>
         <property name="StockId">gtk-save-as</property>
+        <signal name="Activated" handler="OnSaveAsActionActivated" />
       </action>
       <action id="QuitAction">
         <property name="Type">Action</property>

build-win32

@@ -7,8 +7,9 @@ set -x
 set -e
 
 # Clean up our working directory
+PROJECT="ThePimp"
 SRCDIR="`pwd`"
-DIRNAME="libpipi-win32-`sed -ne 's/^AC_INIT(.*, \(.*\)).*/\1/p' configure.ac`"
+DIRNAME="${PROJECT}-win32-`sed -ne 's/^AC_INIT(.*, \(.*\)).*/\1/p' configure.ac`"
 INSTALLDIR="`pwd`/${DIRNAME}"
 BUILDDIR="${INSTALLDIR}/build"
 rm -Rf "${INSTALLDIR}"
@@ -24,11 +25,16 @@ cd "${BUILDDIR}"
 make pkglibdir=/lib pkgdatadir=/data bindir=/bin
 # Install into our private directory
 make install DESTDIR="${INSTALLDIR}" pkglibdir=/lib/ pkgdatadir=/ bindir=/bin/
+# Create a launcher
+echo 'int main(int argc, char *argv[], char *envp[]) { argv[0] = ".\\bin\\ThePimp.exe"; execve(argv[0], argv, envp); return 0; }' > run.c
+i586-mingw32msvc-gcc run.c -mwindows -o "${INSTALLDIR}/ThePimp.exe"
+i586-mingw32msvc-strip "${INSTALLDIR}/ThePimp.exe"
+# Clean up
 cd "${SRCDIR}"
 rm -Rf "${BUILDDIR}"
 
-i586-mingw32msvc-strip "${INSTALLDIR}/bin/"*.exe || true
-i586-mingw32msvc-strip "${INSTALLDIR}/lib/"*.dll || true
+#i586-mingw32msvc-strip "${INSTALLDIR}/bin/"*.exe || true
+#i586-mingw32msvc-strip "${INSTALLDIR}/lib/"*.dll || true
 
 # Install gtk-sharp
 cp -r "win32/dist/"* "${INSTALLDIR}/"

win32/dist/etc/gtk-2.0/gdk-pixbuf.loaders

@@ -1,104 +1,114 @@
-# GdkPixbuf Image Loader Modules file
-#
-#
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
-"ani" 4 "gtk20" "The ANI image format"
-"application/x-navi-animation" ""
-"ani" ""
-"RIFF    ACON" "    xxxx    " 100
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
-"bmp" 5 "gtk20" "The BMP image format"
-"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
-"bmp" ""
-"BM" "" 100
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
-"gif" 4 "gtk20" "The GIF image format"
-"image/gif" ""
-"gif" ""
-"GIF8" "" 100
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
-"ico" 5 "gtk20" "The ICO image format"
-"image/x-icon" ""
-"ico" "cur" ""
-"  \001   " "zz znz" 100
-"  \002   " "zz znz" 100
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
-"jpeg" 5 "gtk20" "The JPEG image format"
-"image/jpeg" ""
-"jpeg" "jpe" "jpg" ""
-"\377\330" "" 100
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
-"pcx" 4 "gtk20" "The PCX image format"
-"image/x-pcx" ""
-"pcx" ""
-"\n \001" "" 100
-"\n\002\001" "" 100
-"\n\003\001" "" 100
-"\n\004\001" "" 100
-"\n\005\001" "" 100
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
-"png" 5 "gtk20" "The PNG image format"
-"image/png" ""
-"png" ""
-"\211PNG\r\n\032\n" "" 100
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
-"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family"
-"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
-"pnm" "pbm" "pgm" "ppm" ""
-"P1" "" 100
-"P2" "" 100
-"P3" "" 100
-"P4" "" 100
-"P5" "" 100
-"P6" "" 100
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
-"ras" 4 "gtk20" "The Sun raster image format"
-"image/x-cmu-raster" "image/x-sun-raster" ""
-"ras" ""
-"Y\246j\225" "" 100
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
-"tga" 4 "gtk20" "The Targa image format"
-"image/x-tga" ""
-"tga" "targa" ""
-" \001\001" "x  " 100
-" \001\t" "x  " 100
-"  \002" "xz " 99
-"  \003" "xz " 100
-"  \n" "xz " 100
-"  \013" "xz " 100
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
-"tiff" 1 "gtk20" "The TIFF image format"
-"image/tiff" ""
-"tiff" "tif" ""
-"MM *" "  z " 100
-"II* " "   z" 100
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
-"wbmp" 4 "gtk20" "The WBMP image format"
-"image/vnd.wap.wbmp" ""
-"wbmp" ""
-" " "z" 1
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
-"xbm" 4 "gtk20" "The XBM image format"
-"image/x-xbitmap" ""
-"xbm" ""
-"#define " "" 100
-"/*" "" 50
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
-"xpm" 4 "gtk20" "The XPM image format"
-"image/x-xpixmap" ""
-"xpm" ""
-"/* XPM */" "" 100
-
+# GdkPixbuf Image Loader Modules file
+# Automatically generated file, do not edit
+# Created by gdk-pixbuf-query-loaders.exe from gtk+-2.10.6
+#
+# LoaderDir = /target/lib/gtk-2.0/2.10.0/loaders
+#
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
+"ani" 4 "gtk20" "The ANI image format"
+"application/x-navi-animation" ""
+"ani" ""
+"RIFF    ACON" "    xxxx    " 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
+"bmp" 5 "gtk20" "The BMP image format"
+"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
+"bmp" ""
+"BM" "" 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
+"gif" 4 "gtk20" "The GIF image format"
+"image/gif" ""
+"gif" ""
+"GIF8" "" 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
+"ico" 5 "gtk20" "The ICO image format"
+"image/x-icon" ""
+"ico" "cur" ""
+"  \001   " "zz znz" 100
+"  \002   " "zz znz" 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
+"jpeg" 5 "gtk20" "The JPEG image format"
+"image/jpeg" ""
+"jpeg" "jpe" "jpg" ""
+"\377\330" "" 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
+"pcx" 4 "gtk20" "The PCX image format"
+"image/x-pcx" ""
+"pcx" ""
+"\n \001" "" 100
+"\n\002\001" "" 100
+"\n\003\001" "" 100
+"\n\004\001" "" 100
+"\n\005\001" "" 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
+"png" 5 "gtk20" "The PNG image format"
+"image/png" ""
+"png" ""
+"\211PNG\r\n\032\n" "" 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
+"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family"
+"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
+"pnm" "pbm" "pgm" "ppm" ""
+"P1" "" 100
+"P2" "" 100
+"P3" "" 100
+"P4" "" 100
+"P5" "" 100
+"P6" "" 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
+"ras" 4 "gtk20" "The Sun raster image format"
+"image/x-cmu-raster" "image/x-sun-raster" ""
+"ras" ""
+"Y\246j\225" "" 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
+"tga" 4 "gtk20" "The Targa image format"
+"image/x-tga" ""
+"tga" "targa" ""
+" \001\001" "x  " 100
+" \001\t" "x  " 100
+"  \002" "xz " 99
+"  \003" "xz " 100
+"  \n" "xz " 100
+"  \013" "xz " 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
+"tiff" 1 "gtk20" "The TIFF image format"
+"image/tiff" ""
+"tiff" "tif" ""
+"MM *" "  z " 100
+"II* " "   z" 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
+"wbmp" 4 "gtk20" "The WBMP image format"
+"image/vnd.wap.wbmp" ""
+"wbmp" ""
+" " "z" 1
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
+"xbm" 4 "gtk20" "The XBM image format"
+"image/x-xbitmap" ""
+"xbm" ""
+"#define " "" 100
+"/*" "" 50
+
+"/target/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
+"xpm" 4 "gtk20" "The XPM image format"
+"image/x-xpixmap" ""
+"xpm" ""
+"/* XPM */" "" 100
+
+"/target/lib/gtk-2.0/2.10.0/loaders/svg_loader.dll"
+"svg" 2 "gtk20" "Scalable Vector Graphics"
+"image/svg+xml" "image/svg" "image/svg-xml" "image/vnd.adobe.svg+xml" "text/xml-svg" ""
+"svg" "svgz" "svg.gz" ""
+" <svg" "*    " 100
+" <!DOCTYPE svg" "*             " 100
+

win32/dist/etc/gtk-2.0/gtk.immodules

@@ -1,30 +1,36 @@
-# GTK+ Input Method Modules file
-#
-#
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll" 
-"am_et" "Amharic (EZ+)" "gtk20" "c:/devel/target/gtk+-2.10.6/lib/locale" "am" 
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll" 
-"cedilla" "Cedilla" "gtk+" "c:/devel/target/gtk+-2.10.6/lib/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa" 
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll" 
-"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "c:/devel/target/gtk+-2.10.6/lib/locale" "" 
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/immodules/im-ime.dll" 
-"ime" "Windows IME" "gtk+" "" "ja:ko:zh" 
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll" 
-"inuktitut" "Inuktitut (Transliterated)" "gtk20" "c:/devel/target/gtk+-2.10.6/lib/locale" "iu" 
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll" 
-"ipa" "IPA" "gtk20" "c:/devel/target/gtk+-2.10.6/lib/locale" "" 
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll" 
-"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "c:/devel/target/gtk+-2.10.6/lib/locale" "ti" 
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll" 
-"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "c:/devel/target/gtk+-2.10.6/lib/locale" "ti" 
-
-"c:/devel/target/gtk+-2.10.6/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll" 
-"viqr" "Vietnamese (VIQR)" "gtk20" "c:/devel/target/gtk+-2.10.6/lib/locale" "vi" 
-
+# GTK+ Input Method Modules file
+# Automatically generated file, do not edit
+# Created by gtk-query-immodules-2.0.exe from gtk+-2.10.6
+#
+# ModulesPath = /target/lib/gtk-2.0/2.4.0/immodules
+#
+"/target/lib/gtk-2.0/2.10.0/immodules/im-am-et.dll" 
+"am_et" "Amharic (EZ+)" "gtk20" "${prefix}/share/locale" "am" 
+
+"/target/lib/gtk-2.0/2.10.0/immodules/im-cedilla.dll" 
+"cedilla" "Cedilla" "gtk+" "${prefix}/share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa" 
+
+"/target/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.dll" 
+"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "${prefix}/share/locale" "" 
+
+"/target/lib/gtk-2.0/2.10.0/immodules/im-ime.dll" 
+"ime" "Windows IME" "gtk+" "" "ja:ko:zh" 
+
+"/target/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.dll" 
+"inuktitut" "Inuktitut (Transliterated)" "gtk20" "${prefix}/share/locale" "iu" 
+
+"/target/lib/gtk-2.0/2.10.0/immodules/im-ipa.dll" 
+"ipa" "IPA" "gtk20" "${prefix}/share/locale" "" 
+
+"/target/lib/gtk-2.0/2.10.0/immodules/im-thai-broken.dll" 
+"thai_broken" "Thai (Broken)" "gtk20" "${prefix}/share/locale" "" 
+
+"/target/lib/gtk-2.0/2.10.0/immodules/im-ti-er.dll" 
+"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "${prefix}/share/locale" "ti" 
+
+"/target/lib/gtk-2.0/2.10.0/immodules/im-ti-et.dll" 
+"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "${prefix}/share/locale" "ti" 
+
+"/target/lib/gtk-2.0/2.10.0/immodules/im-viqr.dll" 
+"viqr" "Vietnamese (VIQR)" "gtk20" "${prefix}/share/locale" "vi" 
+

win32/dist/etc/gtk-2.0/gtkrc

@@ -1,43 +1,8 @@
-gtk-icon-sizes = "gtk-menu=13,13:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32"
-gtk-toolbar-icon-size = small-toolbar
+gtk-theme-name = "MS-Windows"
 
-# disable images in buttons. i've only seen ugly delphi apps use this feature.
-gtk-button-images = 0
-
-# enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly.
-# the office apps use them heavily, though.
-gtk-menu-images = 1
-
-# use the win32 button ordering instead of the GNOME HIG one, where applicable
-gtk-alternative-button-order = 1
-
-style "msw-default"
+style "rules-hint"
 {
-  GtkWidget::interior-focus = 1
-  GtkOptionMenu::indicator-size = { 9, 5 }
-  GtkOptionMenu::indicator-spacing = { 7, 5, 2, 2 }
-  GtkSpinButton::shadow-type = in
-
-  # Owen and I disagree that these should be themable
-  #GtkUIManager::add-tearoffs = 0
-  #GtkComboBox::add-tearoffs = 0
-  
-  GtkComboBox::appears-as-list = 1
-  GtkComboBox::focus-on-click = 0
-  
-  GOComboBox::add_tearoffs = 0
-
-  GtkTreeView::allow-rules = 0
-  GtkTreeView::expander-size = 12
-
-  GtkExpander::expander-size = 12
-
-  GtkScrolledWindow::scrollbar_spacing = 1
-
-  GtkSeparatorMenuItem::horizontal-padding = 2
-
-  engine "wimp" 
-  {
-  }
+	GtkTreeView::allow-rules = 1
 }
-class "*" style "msw-default"
+
+class "*" style "rules-hint"

win32/dist/lib/gtk-2.0/include/gdkconfig.h

@@ -15,7 +15,6 @@ extern "C" {
 
 #define GDK_HAVE_WCHAR_H 1
 #define GDK_HAVE_WCTYPE_H 1
-#define GDK_HAVE_BROKEN_WCTYPE 1
 
 #ifdef __cplusplus
 }

win32/dist/share/themes/Emacs/gtk-2.0-key/gtkrc

@@ -1,113 +0,0 @@
-# GTK - The GIMP Toolkit
-# Copyright (C) 2002 Owen Taylor
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-
-# Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
-# file for a list of people on the GTK+ Team.  See the ChangeLog
-# files for a list of changes.  These files are distributed with
-# GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
-
-
-#
-# A keybinding set implementing emacs-like keybindings
-#
-
-#
-# Bindings for GtkTextView and GtkEntry
-#
-binding "gtk-emacs-text-entry"
-{
-  bind "<ctrl>b" { "move-cursor" (logical-positions, -1, 0) }
-  bind "<shift><ctrl>b" { "move-cursor" (logical-positions, -1, 1) }
-  bind "<ctrl>f" { "move-cursor" (logical-positions, 1, 0) }
-  bind "<shift><ctrl>f" { "move-cursor" (logical-positions, 1, 1) }
-
-  bind "<alt>b" { "move-cursor" (words, -1, 0) }
-  bind "<shift><alt>b" { "move-cursor" (words, -1, 1) }
-  bind "<alt>f" { "move-cursor" (words, 1, 0) }
-  bind "<shift><alt>f" { "move-cursor" (words, 1, 1) }
-
-  bind "<ctrl>a" { "move-cursor" (paragraph-ends, -1, 0) }
-  bind "<shift><ctrl>a" { "move-cursor" (paragraph-ends, -1, 1) }
-  bind "<ctrl>e" { "move-cursor" (paragraph-ends, 1, 0) }
-  bind "<shift><ctrl>e" { "move-cursor" (paragraph-ends, 1, 1) }
-
-  bind "<ctrl>w" { "cut-clipboard" () }
-  bind "<ctrl>y" { "paste-clipboard" () }
-
-  bind "<ctrl>d" { "delete-from-cursor" (chars, 1) }
-  bind "<alt>d" { "delete-from-cursor" (word-ends, 1) }
-  bind "<ctrl>k" { "delete-from-cursor" (paragraph-ends, 1) }
-  bind "<alt>backslash" { "delete-from-cursor" (whitespace, 1) }
-
-  bind "<alt>space" { "delete-from-cursor" (whitespace, 1)
-                      "insert-at-cursor" (" ") }
-  bind "<alt>KP_Space" { "delete-from-cursor" (whitespace, 1)
-                         "insert-at-cursor" (" ")  }
-
-  #
-  # Some non-Emacs keybindings people are attached to
-  #
-  bind "<ctrl>u" {
-     "move-cursor" (paragraph-ends, -1, 0)
-     "delete-from-cursor" (paragraph-ends, 1)
-  }
-  bind "<ctrl>h" { "delete-from-cursor" (chars, -1) }
-  bind "<ctrl>w" { "delete-from-cursor" (word-ends, -1) }
-}
-
-#
-# Bindings for GtkTextView
-#
-binding "gtk-emacs-text-view"
-{
-  bind "<ctrl>p" { "move-cursor" (display-lines, -1, 0) }
-  bind "<shift><ctrl>p" { "move-cursor" (display-lines, -1, 1) }
-  bind "<ctrl>n" { "move-cursor" (display-lines, 1, 0) }
-  bind "<shift><ctrl>n" { "move-cursor" (display-lines, 1, 1) }
-
-  bind "<ctrl>space" { "set-anchor" () }
-  bind "<ctrl>KP_Space" { "set-anchor" () }
-}
-
-#
-# Bindings for GtkTreeView
-#
-binding "gtk-emacs-tree-view"
-{
-  bind "<ctrl>s" { "start-interactive-search" () }
-  bind "<ctrl>f" { "move-cursor" (logical-positions, 1) }
-  bind "<ctrl>b" { "move-cursor" (logical-positions, -1) }
-}
-
-#
-# Bindings for menus
-#
-binding "gtk-emacs-menu"
-{
-  bind "<ctrl>n" { "move-current" (next) }
-  bind "<ctrl>p" { "move-current" (prev) }
-  bind "<ctrl>f" { "move-current" (child) }
-  bind "<ctrl>b" { "move-current" (parent) }
-}
-
-class "GtkEntry" binding "gtk-emacs-text-entry"
-class "GtkTextView" binding "gtk-emacs-text-entry"
-class "GtkTextView" binding "gtk-emacs-text-view"
-class "GtkTreeView" binding "gtk-emacs-tree-view"
-class "GtkMenuShell" binding "gtk-emacs-menu"

win32/dist/share/themes/MS-Windows/gtk-2.0/gtkrc

@@ -1,4 +1,4 @@
-gtk-icon-sizes = "gtk-menu=13,13:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32"
+gtk-icon-sizes = "gtk-menu=16,16:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32"
 gtk-toolbar-icon-size = small-toolbar
 
 # disable images in buttons. i've only seen ugly delphi apps use this feature.
@@ -40,4 +40,4 @@ style "msw-default"
   {
   }
 }
-class "*" style "msw-default"
+class "*" style "msw-default"

win32/dist/share/themes/Raleigh/gtk-2.0/gtkrc

@@ -1,3 +0,0 @@
-#
-# This theme is the default theme if no other theme is selected.
-#