Corrected wxGTK.spec as per 2.1.14 (hadn't commited),

Removed include "gtk.h" from the public pen.h header and
     added check for this to configure etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -1531,6 +1531,7 @@ GUI_TK_LIBRARY=
 GUI_TK_LINK=
 
 WXGTK12=
+WXGTK127=
 WXGTK13=
 
 WXWINE=
@@ -1591,6 +1592,7 @@ fi
 if test "$wxUSE_GTK" = 1; then
     dnl avoid calling AM_PATH_GTK twice, so check first for the newer version
     dnl and only then, if it wasn't found, for an older one
+    AM_PATH_GTK(1.2.7, WXGTK127=1)
     AM_PATH_GTK(1.2.3, WXGTK12=1)
 
     if test "$WXGTK12" != 1; then
@@ -2551,6 +2553,10 @@ if test "$WXGTK12" = 1 ; then
   AC_DEFINE_UNQUOTED(__WXGTK12__,$WXGTK12)
 fi
 
+if test "$WXGTK127" = 1 ; then
+  AC_DEFINE_UNQUOTED(__WXGTK127__,$WXGTK127)
+fi
+
 if test "$WXWINE" = 1 ; then
   TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
 fi

include/wx/defs.h

@@ -1862,6 +1862,8 @@ typedef unsigned long   Atom;  /* this might fail on a few architectures */
 
 #ifdef __WXGTK__
 /* Stand-ins for GLIB types */
+typedef char           gchar;
+typedef signed char    gint8;
 typedef int            gint;
 typedef unsigned       guint;
 typedef unsigned long  gulong;

include/wx/gtk/pen.h

@@ -21,15 +21,13 @@
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
-#include <gtk/gtk.h>  // only needed for wxGTKDash, should it go elsewhere..
-
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxPen;
 
-#if GTK_CHECK_VERSION(1,2,7)
+#ifdef __WXGTK127__
 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;

include/wx/gtk1/pen.h

@@ -21,15 +21,13 @@
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
-#include <gtk/gtk.h>  // only needed for wxGTKDash, should it go elsewhere..
-
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxPen;
 
-#if GTK_CHECK_VERSION(1,2,7)
+#ifdef __WXGTK127__
 typedef    gint8 wxGTKDash;
 #else
 typedef    gchar wxGTKDash;

setup.h.in

@@ -61,6 +61,9 @@
 /* Define this if your version of GTK+ is greater than 1.2 */
 #undef __WXGTK12__
 
+/* Define this if your version of GTK+ is greater than 1.2.7 */
+#undef __WXGTK127__
+
 /* Define this if your version of GTK+ is greater than 1.3 */
 #undef __WXGTK13__
 

src/gtk/settings.cpp

@@ -245,7 +245,6 @@ wxFont wxSystemSettings::GetSystemFont( int index )
                     if (def)
                         gdk_font =  def->font;
                 }
-#endif
                 if (gdk_font)
                 {
                     GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;
@@ -255,6 +254,7 @@ wxFont wxSystemSettings::GetSystemFont( int index )
                     g_systemFont = new wxFont( font_string, font_data );
                 }
                 else
+#endif
                 {
                     g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
                 }

src/gtk1/settings.cpp

@@ -245,7 +245,6 @@ wxFont wxSystemSettings::GetSystemFont( int index )
                     if (def)
                         gdk_font =  def->font;
                 }
-#endif
                 if (gdk_font)
                 {
                     GSList *font_list = ((GdkFontPrivate*)gdk_font)->names;
@@ -255,6 +254,7 @@ wxFont wxSystemSettings::GetSystemFont( int index )
                     g_systemFont = new wxFont( font_string, font_data );
                 }
                 else
+#endif
                 {
                     g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
                 }

wxGTK.spec

@@ -70,7 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt
 %dir %{pref}/share/wx
 %{pref}/share/wx/*
-%attr(755, -, -) %{pref}/lib/libwx_gtk*
+%attr(755, -, -) %{pref}/lib/libwx_gtk.*
+%attr(755, -, -) %{pref}/lib/libwx_gtk-2.1.*
 
 %files devel
 %defattr (644, root, root, 755)